平台登录-优化

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -526,7 +526,10 @@ public class CommonEnumUtil {
 //        EXPIRE(5, "服务到期", "服务到期_EXPIRE"),
         LOCKING(3, "fa cell-fa fa-lock", "锁定"),
         ENABLE(1, "fa fa-success cell-fa fa-check", "启用"),
-        DISABLE(2, "fa fa-disabled cell-fa fa-times-circle", "禁用");
+        DISABLE(2, "fa fa-disabled cell-fa fa-times-circle", "禁用"),
+        //冗余枚举字段，只作为记录日志状态，不用于用户状态
+        ESTABLISH(4, "fa fa-establish cell-fa", "创建"),
+        DELETE(5, "fa fa-delete cell-fa", "删除");
 
         private int value;
         private String code;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleOperate.java

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author :
+ * @CreateDate : 2022-12-09 15:01
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_LOG_ROLE_OPERATE")
+@ApiModel(value="角色变更操作记录",description = "角色变更操作记录")
+public class SysLogRoleOperate extends BaseBean {
+
+    private static final long serialVersionUID = 4665598896654312569L;
+    @Column(name="ROLE_ID")
+    @ApiModelProperty(value ="角色ID" , access ="角色ID")
+    @AnnoOutputColumn(hidden = true)
+    private Long roleId;
+
+    @Column(name = "OPERATE")
+    @ApiParam(value = "操作", access = "操作")
+    private String operate;
+
+    @Column(name = "OPERATE_CONTEXT")
+    @ApiParam(value = "操作内容", access = "操作内容")
+    private String operateContext;
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserStatus.java

@@ -0,0 +1,73 @@
+package cn.estsh.i3plus.pojo.platform.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author :
+ * @CreateDate : 2022-12-07 20:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SYS_LOG_USER_STATUS")
+@ApiModel(value="用户状态变更记录",description = "用户状态变更记录")
+public class SysLogUserStatus extends BaseBean {
+
+    private static final long serialVersionUID = 4665598896654312569L;
+    @Column(name="USER_ID")
+    @ApiModelProperty(value ="用户ID" , access ="用户ID")
+    @AnnoOutputColumn(hidden = true)
+    private Long userId;
+
+    @Column(name = "USER_NAME")
+    @ApiParam(value = "用户名称", access = "账号名称")
+    private String userName;
+
+    @Column(name="LOG_LOGIN_NAME")
+    @ApiModelProperty(value ="登录名称" , access ="登录名称")
+    private String logLoginName;
+
+    @Column(name = "DEPARTMENT_NAME_RDD")
+    @ApiParam(value = "部门名称", access = "部门名称")
+    private String departmentNameRdd;
+
+    @Column(name = "DEPARTMENT_ID")
+    @ApiParam(value = "部门ID", access = "部门ID")
+    private Long departmentId;
+
+    @Column(name = "ROLE_ID")
+    @ApiParam(value = "用户角色ID逗号分割")
+    private String roleId;
+
+    @Column(name = "ROLE_NAME")
+    @ApiParam(value = "用户角色名称逗号分割")
+    private String roleName;
+
+    @Column(name="USER_STATUS")
+    @ApiModelProperty(value ="账号状态" , example ="1")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.USER_LOGIN_STATUS.class)
+    private Integer userStatus;
+
+    @Column(name="USER_STATUS_RDD")
+    @ApiModelProperty(value ="账号状态描述")
+    private String userStatusRdd;
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java

@@ -208,6 +208,14 @@ public class SysUser extends BaseBean {
     @ApiParam(value = "账号所有操作权限信息")
     private List<SysMenu> menuList;
 
+    @Transient
+    @ApiParam(value = "用户角色逗号分割")
+    private String roleMessage;
+
+    @Transient
+    @ApiParam(value = "用户状态描述")
+    private String userStatusRdd;
+
     /*** test ***/
 //    @Lob
 //    @Basic(fetch=FetchType.LAZY)

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLogRoleOperateRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.platform.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.platform.bean.SysLogRoleOperate;
+
+/**
+ * @Description : 用户角色操作变更日志
+ * @Reference :
+ * @Author : yujia
+ * @CreateDate : 2022-12-10 15:07
+ * @Modify:
+ **/
+public interface SysLogRoleOperateRepository extends BaseRepository<SysLogRoleOperate, Long> {
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLogUserStatusRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.platform.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.platform.bean.SysLogUserStatus;
+
+/**
+ * @Description : 账号状态变更日志
+ * @Reference :
+ * @Author : yujia
+ * @CreateDate : 2022-12-09 15:34
+ * @Modify:
+ **/
+public interface SysLogUserStatusRepository extends BaseRepository<SysLogUserStatus, Long> {
+}