Merge remote-tracking branch 'origin/master'

common/common-model/pom.xml

@@ -40,6 +40,12 @@
             <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-annotation</artifactId>
+            <version>3.5.5</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

common/common-model/src/main/java/com/tacit/common/entity/Base.java

@@ -0,0 +1,17 @@
+package com.tacit.common.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class Base  {
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    private LocalDateTime createTime;
+    private LocalDateTime updateTime;
+    private Integer delFlag;
+}

tacit-admin/src/main/java/com/tacit/admin/entity/Role.java

@@ -0,0 +1,26 @@
+package com.tacit.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.tacit.common.entity.Base;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@TableName("t_role")
+public class Role extends Base implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    //角色名称
+    @TableField("role_name")
+    private String roleName;
+    private LocalDateTime createTime;
+    private LocalDateTime updateTime;
+    private Integer delFlag;
+}

tacit-admin/src/main/java/com/tacit/admin/entity/User.java

@@ -3,6 +3,7 @@ package com.tacit.admin.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.tacit.common.entity.Base;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -10,11 +11,10 @@ import java.time.LocalDateTime;
 
 @Data
 @TableName("t_user")
-public class User implements Serializable {
+public class User extends Base implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @TableId(type = IdType.AUTO)
+
-    private Long id;
     private String username;
     private String password;
     private String nickname;
@@ -22,7 +22,5 @@ public class User implements Serializable {
     private String phone;
     private Integer status;
     private String role;
-    private LocalDateTime createTime;
+
-    private LocalDateTime updateTime;
-    private Integer delFlag;
 }

tacit-admin/src/main/java/com/tacit/admin/entity/UserRole.java

@@ -0,0 +1,26 @@
+package com.tacit.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@TableName("t_user_role")
+public class UserRole implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    // 用户ID
+    @TableField("user_id")
+    private Long userId;
+    // 角色ID
+    @TableField("role_id")
+    private Long roleId;
+
+}

tacit-admin/src/main/java/com/tacit/admin/mapper/RoleMapper.java

@@ -0,0 +1,9 @@
+package com.tacit.admin.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tacit.admin.entity.Role;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface RoleMapper extends BaseMapper<Role> {
+}

tacit-admin/src/main/java/com/tacit/admin/mapper/UserRoleMapper.java

@@ -0,0 +1,10 @@
+package com.tacit.admin.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tacit.admin.entity.User;
+import com.tacit.admin.entity.UserRole;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface UserRoleMapper extends BaseMapper<UserRole> {
+}

tacit-app-api/src/main/java/com/tacit/app/entity/Role.java

@@ -0,0 +1,24 @@
+package com.tacit.app.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.tacit.common.entity.Base;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@TableName("t_role")
+public class Role extends Base implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    //角色名称
+    @TableField("role_name")
+    private String roleName;
+    private LocalDateTime createTime;
+    private LocalDateTime updateTime;
+    private Integer delFlag;
+}

tacit-app-api/src/main/java/com/tacit/app/entity/UserRole.java

@@ -0,0 +1,25 @@
+package com.tacit.app.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@TableName("t_user_role")
+public class UserRole implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    // 用户ID
+    @TableField("user_id")
+    private Long userId;
+    // 角色ID
+    @TableField("role_id")
+    private Long roleId;
+
+}

tacit-app-api/src/main/java/com/tacit/app/mapper/RoleMapper.java

@@ -0,0 +1,10 @@
+package com.tacit.app.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import com.tacit.app.entity.Role;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface RoleMapper extends BaseMapper<Role> {
+}

tacit-app-api/src/main/java/com/tacit/app/mapper/UserRoleMapper.java

@@ -0,0 +1,10 @@
+package com.tacit.app.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import com.tacit.app.entity.UserRole;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface UserRoleMapper extends BaseMapper<UserRole> {
+}