1、修改登录相关

src/main/java/com/dk/common/infrastructure/aspect/ServiceAspect.java

@@ -74,11 +74,11 @@ public class ServiceAspect implements HandlerInterceptor {
             ) {
                 String[] tokens = authorization.split(" ");
                 String decrypt = AESSecurityUtil.decrypt(AESKey, tokens[1]);
-                Long userId = Long.valueOf(JwtUtil.getUserId(decrypt));
+                String staffId = JwtUtil.getStaffId(decrypt);
 
                 String appCode = JwtUtil.getAppCode(decrypt);
 
-                opInfoMapper.setOpInfo(appCode, userId.toString(), JwtUtil.getLang(decrypt));
+                opInfoMapper.setOpInfo(appCode, staffId.toString(), JwtUtil.getLang(decrypt));
 
                 //记录修改前数据
                 if (!skipMethod.contains(joinPoint.getSignature().getDeclaringTypeName() + "." + joinPoint.getSignature().getName())) {

src/main/java/com/dk/common/infrastructure/constant/Constant.java

@@ -324,19 +324,19 @@ public class Constant {
      */
     public enum LogicalOperator {
         //总单
-        LEFT_BRACKETS("(",""),
+        LEFT_BRACKETS("(", ""),
         //明细
-        RIGHT_BRACKETS(")",""),
+        RIGHT_BRACKETS(")", ""),
         //并且
-        AND("&&","且"),
+        AND("&&", "且"),
         //或者
-        OR("||","或"),
+        OR("||", "或"),
         //无
-        NONE("",""),
+        NONE("", ""),
         //属于
-        IN("in","属于"),
+        IN("in", "属于"),
         //不属于
-        NOT_IN("notIn","不属于"),
+        NOT_IN("notIn", "不属于"),
         ;
         private String value;
         private String name;
@@ -344,17 +344,20 @@ public class Constant {
         public String getValue() {
             return value;
         }
+
         public void setValue(String value) {
             this.value = value;
         }
+
         public String getName() {
             return name;
         }
+
         public void setName(String name) {
             this.name = name;
         }
 
-        LogicalOperator(String value,String name) {
+        LogicalOperator(String value, String name) {
             this.value = value;
             this.name = name;
         }
@@ -428,7 +431,7 @@ public class Constant {
         //获取指定的枚举
         public static SystemDocCode getByValue(String value) {
             for (SystemDocCode doc : values()) {
-                if (doc.getValue().equals(value) ) {
+                if (doc.getValue().equals(value)) {
                     return doc;
                 }
             }
@@ -493,7 +496,6 @@ public class Constant {
         SYS_PDM_006("PDM_006"),
 
 
-
         /**
          * 【系统字典】未出库、出库中、出库完成
          */
@@ -647,7 +649,7 @@ public class Constant {
          * redis key 前缀
          */
         REDIS_LOGIN("Login-"),
-        REDIS_USER("USER-"),
+        REDIS_STAFF("STAFF-"),
         REDIS_REQUEST("Request-"),
         REDIS_HG_HAP_TOKEN("HG-HAP-TOKEN"),
 
@@ -746,7 +748,7 @@ public class Constant {
         public static FunUuidConstant get(String name) {
             return (FunUuidConstant) ENUM_MAP.get(name.toLowerCase());
         }
-        }
+    }
 
     /**
      * @author : 周兴
@@ -1077,10 +1079,10 @@ public class Constant {
 
 
     /**
-     * @desc   : 打印类型
-     * @date   : 2023/7/17 15:20
-     * 0：编码打印，1：工序外箱码打印，2：外箱码重打，3：外箱码补打
      * @author : 寇珊珊
+     * @desc : 打印类型
+     * @date : 2023/7/17 15:20
+     * 0：编码打印，1：工序外箱码打印，2：外箱码重打，3：外箱码补打
      */
     public enum printWay {
         CODE_PRINT(0),
@@ -1147,15 +1149,15 @@ public class Constant {
     public static final String NODE_SCRAP = "00000000-0000-0000-0000-000000000001";
 
     /**
-     * @desc   : 单据类型
      * @author : 常皓宁
-     * @date   : 2024/2/28 13:11
+     * @desc : 单据类型
+     * @date : 2024/2/28 13:11
      */
     public enum DocumentType {
         //采购订单
         PUR_CHASE("订单类型-采购订单"),
         //销售订单
-        ORDER_CHASE("订单类型-采购订单") ;
+        ORDER_CHASE("订单类型-采购订单");
 
         private String name;
 
@@ -1175,14 +1177,14 @@ public class Constant {
     }
 
     /**
-     * @desc   : 入库状态
      * @author : 付斌
-     * @date   : 2024-03-01 15:44
+     * @desc : 入库状态
+     * @date : 2024-03-01 15:44
      */
     public enum IntoStatus {
         DAIRUKU("入库状态-待入库"),
-        RUKUZHONG("入库状态-入库中") ,
-        YIRUKU("入库状态-已入库") ;
+        RUKUZHONG("入库状态-入库中"),
+        YIRUKU("入库状态-已入库");
 
         private String name;
 
@@ -1202,14 +1204,14 @@ public class Constant {
     }
 
     /**
-     * @desc   : 出库状态
      * @author : 付斌
-     * @date   : 2024-03-01 15:45
+     * @desc : 出库状态
+     * @date : 2024-03-01 15:45
      */
     public enum OutStatus {
         DAICHUKU("出库状态-待出库"),
-        CHUKUZHONG("出库状态-出库中") ,
-        YICHUKU("出库状态-已出库") ;
+        CHUKUZHONG("出库状态-出库中"),
+        YICHUKU("出库状态-已出库");
 
         private String name;
 
@@ -1229,9 +1231,9 @@ public class Constant {
     }
 
     /**
-     * @desc   : appCode
      * @author : 周兴
-     * @date   : 2024-03-01 15:45
+     * @desc : appCode
+     * @date : 2024-03-01 15:45
      */
     public enum AppCode {
 
@@ -1258,15 +1260,15 @@ public class Constant {
     }
 
     /**
-     * @desc   : 订单状态
      * @author : 常皓宁
-     * @date   : 2024/3/2 9:05
+     * @desc : 订单状态
+     * @date : 2024/3/2 9:05
      */
     public enum OrderStatus {
         //成交
         STATUS_DEAL("订单状态-成交"),
         //销售订单
-        ORDER_STAGING("订单状态-暂存") ;
+        ORDER_STAGING("订单状态-暂存");
 
         private String name;
 
@@ -1286,9 +1288,9 @@ public class Constant {
     }
 
     /**
-     * @desc   : 销售状态
      * @author : 付斌
-     * @date   : 2024-03-02 17:12
+     * @desc : 销售状态
+     * @date : 2024-03-02 17:12
      */
     public enum SaleStatus {
         //公海
@@ -1296,7 +1298,7 @@ public class Constant {
         //潜客
         QIANKE("销售状态-潜客"),
         //成交
-        CHENGJIAO("销售状态-成交") ;
+        CHENGJIAO("销售状态-成交");
 
         private String name;
 
@@ -1314,4 +1316,43 @@ public class Constant {
             this.name = name;
         }
     }
+
+    /**
+     * @author : 周兴
+     * @desc : 显示顺序的设置
+     * @date : 2024-03-02 17:12
+     */
+    public enum DisplayNoTable {
+        // 资金账户
+        MONEYACCOUNT("dkic_b","t_mst_money_account"),
+        // 数据字典
+        DICTIONARYDATA("dkic_b1","t_mst_dictionary_data"),
+        ;
+
+        private String mode; // 模式名
+        private String table;// 表名
+
+        // get set 方法
+        public String getMode() {
+            return mode;
+        }
+
+        public void setMode(String mode) {
+            this.mode = mode;
+        }
+
+        public String getTable() {
+            return table;
+        }
+
+        public String setTable() {
+            return table;
+        }
+
+        // 构造方法
+        DisplayNoTable(String mode, String table) {
+            this.mode = mode;
+            this.table = table;
+        }
+    }
 }

src/main/java/com/dk/common/infrastructure/util/AuthUtils.java

@@ -34,4 +34,5 @@ public class AuthUtils {
         }
         return vo.getData();
     }
+
 }

src/main/java/com/dk/common/model/vo/core/StaffEntity.java

@@ -0,0 +1,231 @@
+package com.dk.common.model.vo.core;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+import java.io.Serializable;
+
+import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.*;
+import com.dk.common.model.pojo.PageInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.ibatis.type.JdbcType;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+/**
+ *  员工
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ExportTitle("员工")
+@TableName(value = "t_mst_staff", schema =  "dkic_b", autoResultMap = true)
+@ApiModel(value="实体类：员工", description="表名：t_mst_staff")
+public class StaffEntity implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 员工ID
+     */
+    //@TableId(value = "staff_id", type = IdType.INPUT)
+    @ApiModelProperty(value = "员工ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String staffId;
+
+    /**
+     * 员工编号
+     */
+    @Excel(name = "员工编号")
+    @ApiModelProperty(value = "员工编号")
+    private String staffCode;
+
+    /**
+     * 员工名称
+     */
+    @Excel(name = "员工名称")
+    @ApiModelProperty(value = "员工名称")
+    private String staffName;
+
+
+    /**
+     * 员工电话 (同步微信用户电话)
+     */
+    @Excel(name = "员工电话 (同步微信用户电话)")
+    @ApiModelProperty(value = "员工电话 (同步微信用户电话)")
+    private String staffPhone;
+
+
+    /**
+     * 组织部门
+     */
+    @Excel(name = "组织部门")
+    @ApiModelProperty(value = "组织部门")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String orgId;
+
+
+    /**
+     * 角色
+     */
+    @Excel(name = "角色")
+    @ApiModelProperty(value = "角色")
+    @TableField(typeHandler = UuidListTypeHandler.class)
+    private List<String> roleIds;
+
+
+    /**
+     * 微信用户
+     */
+    @Excel(name = "微信用户")
+    @ApiModelProperty(value = "微信用户")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String wxUserId;
+
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+
+    /**
+     * 企业ID
+     */
+    @Excel(name = "企业ID")
+    @ApiModelProperty(value = "企业ID")
+    private Integer cpId;
+
+    /**
+     * 企业编码
+     */
+    @Excel(name = "企业编码")
+    @ApiModelProperty(value = "企业编码")
+    private String cpCode;
+
+
+    /**
+     * 创建时间 (触发器自动处理)
+     */
+    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
+    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opCreateTime;
+
+
+    /**
+     * 创建用户 (触发器自动处理)
+     */
+    @Excel(name = "创建用户 (触发器自动处理)")
+    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opCreateUserId;
+
+
+    /**
+     * 修改时间 (触发器自动处理)
+     */
+    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
+    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opUpdateTime;
+
+
+    /**
+     * 修改用户 (触发器自动处理)
+     */
+    @Excel(name = "修改用户 (触发器自动处理)")
+    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opUpdateUserId;
+
+
+    /**
+     * 数据操作应用 (触发器自动处理)
+     */
+    @Excel(name = "数据操作应用 (触发器自动处理)")
+    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
+    private String opAppCode;
+
+
+    /**
+     * 数据时间戳 (触发器自动处理)
+     */
+    @Excel(name = "数据时间戳 (触发器自动处理)")
+    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opTimestamp;
+
+
+    /**
+     * 数据操作数据库用户 (触发器自动处理)
+     */
+    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
+    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
+    private String opDbUser;
+
+
+    /**
+     * 登录标识 (统计企业当前人数)
+     */
+    @Excel(name = "登录标识 (统计企业当前人数)")
+    @ApiModelProperty(value = "登录标识 (统计企业当前人数)")
+    private Boolean flgCanLogin;
+
+
+    /**
+     * 登录标识1能登录 0不能登录
+     */
+    @Excel(name = "登录标识")
+    @ApiModelProperty(value = "登录标识")
+    private Integer hrStatus;
+
+    @ApiModelProperty(value = "")
+    @NotNull(message = "未选择所属应用")
+    private String appCode;
+
+
+    /*
+     * 相关属性
+     * @TableField(exist = false)
+     */
+
+    /*
+     * 关联属性 + 查询条件
+     * @TableField(exist = false)
+     */
+
+
+    private static final long serialVersionUID = 1L;
+
+
+
+
+}

src/main/java/com/dk/common/model/vo/core/UserVO.java

@@ -63,10 +63,10 @@ public class UserVO implements Serializable {
     private String userName;
 
     /**
-     * 工厂编码
+     * 企业编码
      */
-    @ApiModelProperty(value = "工厂编码")
-    private String ftyCode;
+    @ApiModelProperty(value = "企业编码")
+    private String cpCode;
 
 
     /**
@@ -96,14 +96,6 @@ public class UserVO implements Serializable {
 
 
     /**
-     * 用户类型 (1：文员 2：生产工号（班组） -1：接口用户)
-     */
-    @Excel(name = "用户类型 (1：文员 2：生产工号（班组） -1：接口用户)")
-    @ApiModelProperty(value = "用户类型 (1：文员 2：生产工号（班组） -1：接口用户)")
-    private Integer userType;
-
-
-    /**
      * 客户端ID (接口用户：oauth的clientid)
      */
     @Excel(name = "客户端ID (接口用户：oauth的clientid)")

src/main/java/com/dk/common/util/oauth/JwtUtil.java

@@ -13,10 +13,10 @@ import javax.servlet.http.HttpServletRequest;
 
 @Slf4j
 public class JwtUtil {
-    public static final String SHIRO_FTY_ID = "ftyId";
-    public static final String SHIRO_FTY_CODE = "ftyCode";
-    public static final String SHIRO_USER_NAME = "username";
-    public static final String SHIRO_USER_ID = "userId";
+    public static final String SHIRO_CP_ID = "ftyId";
+    public static final String SHIRO_CP_CODE = "ftyCode";
+    public static final String SHIRO_STAFF_NAME = "username";
+    public static final String SHIRO_STAFF_ID = "userId";
     public static final String SHIRO_APP_CODE = "appCode";
     public static final String SHIRO_CLIENT_ID = "clientId";
     public static final String SHIRO_USER_SALT = "salt";
@@ -74,14 +74,14 @@ public class JwtUtil {
     }
 
     /**
-     * @desc   : 通过已解密的token获取userName
+     * @desc   : 通过已解密的token获取staffName
      * @author : 周兴
      * @date   : 2023/2/26 16:07
      */
-    public static String getUserName(String token) {
+    public static String getStaffName(String token) {
         try {
             DecodedJWT jwt = JWT.decode(token);
-            return jwt.getClaim(SHIRO_USER_NAME).asString();
+            return jwt.getClaim(SHIRO_STAFF_NAME).asString();
         } catch (JWTDecodeException e) {
             log.error("error：{}", e.getMessage());
             return null;
@@ -89,14 +89,14 @@ public class JwtUtil {
     }
 
     /**
-     * @desc   : 通过已解密的token获取userId
+     * @desc   : 通过已解密的token获取staffId
      * @author : 周兴
      * @date   : 2023/2/26 16:07
      */
-    public static String getUserId(String token) {
+    public static String getStaffId(String token) {
         try {
             DecodedJWT jwt = JWT.decode(token);
-            return jwt.getClaim(SHIRO_USER_ID).asString();
+            return jwt.getClaim(SHIRO_STAFF_ID).asString();
         } catch (JWTDecodeException e) {
             log.error("error：{}", e.getMessage());
             return null;
@@ -104,14 +104,14 @@ public class JwtUtil {
     }
 
     /**
-     * @desc   : 通过已解密的token获取ftyId
+     * @desc   : 通过已解密的token获取cpId
      * @author : 周兴
      * @date   : 2023/2/26 16:07
      */
-    public static String getFtyId(String token) {
+    public static String getCpId(String token) {
         try {
             DecodedJWT jwt = JWT.decode(token);
-            return jwt.getClaim(SHIRO_FTY_ID).asString();
+            return jwt.getClaim(SHIRO_CP_ID).asString();
         } catch (JWTDecodeException e) {
             log.error("error：{}", e.getMessage());
             return null;
@@ -119,14 +119,14 @@ public class JwtUtil {
     }
 
     /**
-     * @desc   : 通过已解密的token获取ftyCode
+     * @desc   : 通过已解密的token获取cpCode
      * @author : 周兴
      * @date   : 2023/2/26 16:07
      */
-    public static String getFtyCode(String token) {
+    public static String getCpCode(String token) {
         try {
             DecodedJWT jwt = JWT.decode(token);
-            return jwt.getClaim(SHIRO_FTY_CODE).asString();
+            return jwt.getClaim(SHIRO_CP_CODE).asString();
         } catch (JWTDecodeException e) {
             log.error("error：{}", e.getMessage());
             return null;