Merge remote-tracking branch 'origin/master'

k94314517

2024-05-21 49405039d850c4256b1c3e87fd92c5cdbb08ff72

 server/system_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -11,9 +11,11 @@
import java.math.BigDecimal;
import java.net.URLDecoder;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import  java.util.Date;
import java.util.List;
import java.util.Random;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

@@ -61,6 +63,12 @@
    //答题主题
    public static final String LW_THEME = "LW_THEME";
    public static final String THEME = "THEME";
    //上下班 间隔时间
    public static final String WORK_START = "WORK_START";
    public static final String WORK_END = "WORK_END";
    public static final String INTERVAL = "INTERVAL";



    // 劳务来访配置
    public static final String LABOR_CONFIG = "LABOR_CONFIG";
@@ -84,6 +92,8 @@
    public static final String VIRTUAL_CARD_INDEX = "02098469790";
    public static final String RETRY_CONNECT_NUM ="RETRY_CONNECT_NUM" ;
    public static final String CLOUD_SERVICE_URL_INDEX = "/cloudService";
    public static final String VISIT_TIPS = "VISIT_TIPS";
    public static final String VISIT_GUIDEMAP = "VISIT_GUIDEMAP";
    public static  boolean DEALING_HK_SYNCPRIVILEGE= false;
    public static  boolean DEALING_HK_SYNCDEVICE = false;
    public static  boolean DEALING_HK_SYNCDEVICE_STATUS = false;
@@ -99,6 +109,12 @@
    public static  boolean DEALING_HK_EMPOWER_DETAIL = false;
    public static  boolean DEALING_HK_EMPOWER_RESULT = false;
    public static  boolean DEALING_HK_PARKBOOK = false;
    public static final String SMS ="SMS" ;
    public static final String SMS_COMNAME = "SMS_COMNAME";
    public static final String SMS_IP ="SMS_IP" ;
    public static final String SMS_PORT ="SMS_PORT" ;
    public static final String SMS_APPKEY="SMS_APPKEY";
    public static final String SMS_APPSECRET ="SMS_APPSERECT" ;
    // ERP接口配置
    public static final String ERP_CONFIG = "ERP_CONFIG";
    // ERP ACCESS_KEY
@@ -112,6 +128,18 @@
    // 超时预警配置
    public static final String TIMEOUT_WARNING = "TIMEOUT_WARNING";
    // FTP文件服务器资源访问地址

    public static String getRandom6Num( ) {
        Random random = new Random();
        StringBuilder sb = new StringBuilder();

        for (int i = 0; i < 6; i++) {
            int digit = random.nextInt(10);
            sb.append(digit);
        }

        return sb.toString();
    }

    public static  Date  getBirthdyByCardNo(String idCard){
    if(idCard ==null || idCard.length()<14){
@@ -190,6 +218,29 @@
        return s.substring(0,5)+"*******"+s.substring(l-6,l);
}

    /**
     * 切分逗号拼接的整形集合
     * @param memberIds
     * @return
     */

    public static List<Integer> getIntegerListByStrs(String memberIds) {
        List<Integer> idsList = null;
        try {
            String[] strs = memberIds.split(",");
            for(String id :strs){
                if(idsList == null){
                    idsList = new ArrayList<>();
                }
                idsList.add(Integer.parseInt(id));
            }
        }catch (Exception e){

        }

        return idsList;
    }


    /**
     * mq tag
@@ -230,6 +281,16 @@
         int signout =  8;
         int invalid =9;
    }

    public interface multifileObjType{
        //0隐患现场情况 1隐患处理前情况 2隐患处理后情况 3隐患退回说明
        int zero = 0;
        int one = 1;
        int two = 2;
        int three = 3;
    }


    public interface EmpowerStatus{
        //一卡通授权下发状态 0待下发 1已下发 2下发成功   3已取消 4下发失败 5任务下载已结束
         int wait = 0;
@@ -279,6 +340,7 @@


    public interface RedisKeys {
        public static final String IMPORTING_MEMBER ="IMPORTING_MEMBER";
        public static final String ERP_TOKEN ="ERP_TOKEN";
        public static final long EXPIRE_TIME = 7200;

@@ -595,21 +657,24 @@
     * 员工信息维护操作历史类型 0解冻 1冻结 2拉黑 3恢复 4设为拜访人 5取消拜访人 6设为高级审批人 7取消高级审批人 8手动离场 9删除 10更新 11授权门禁权限 12离职 13恢复在职
     */
    public  enum UserActionType {
        CANCEL_FREEZE(0, "解冻","由【${param1}】于【操作时间：${param2}】，进行【解冻】" ),
        FREEZE(1, "冻结","由【${param1}】于【操作时间：${param2}】，进行【冻结】" ),
        BLACKLIST(2, "拉黑","由【${param1}】于【操作时间：${param2}】，进行【拉黑】"),
        CANCEL_BLACKLIST(3, "恢复","由【${param1}】于【操作时间：${param2}】，进行【移出黑名单】" ),
        CANVISIT(4, "设为拜访人","由【${param1}】于【操作时间：${param2}】，进行【设为拜访人】" ),
        CANCEL_VISIT(5, "取消拜访人","由【${param1}】于【操作时间：${param2}】，进行【取消拜访人】" ),
        CANCEL_FREEZE(0, "解冻","由【${param1}】于【${param2}】，进行【解冻】" ),
        FREEZE(1, "冻结","由【${param1}】于【${param2}】，进行【冻结】" ),
        BLACKLIST(2, "拉黑","由【${param1}】于【${param2}】，进行【拉黑】"),
        CANCEL_BLACKLIST(3, "恢复","由【${param1}】于【${param2}】，进行【移出黑名单】" ),
        CANVISIT(4, "设为拜访人","由【${param1}】于【${param2}】，进行【设为拜访人】" ),
        CANCEL_VISIT(5, "取消拜访人","由【${param1}】于【${param2}】，进行【取消拜访人】" ),
        //续保通知
        HIGHCHECKOR(6, "设为高级审批人","由【${param1}】于【操作时间：${param2}】，进行【设为高级审批人】" ),
        CANCEL_HIGHCHECKOR(7, "取消高级审批人","由【${param1}】于【操作时间：${param2}】，进行【取消高级审批人】" ),
        LEVEL(8, "手动离场","由【${param1}】于【操作时间：${param2}】，进行【手动离场】" ),
        DELETE(9, "删除","由【${param1}】于【操作时间：${param2}】，进行【删除】" ),
        EDIT(10, "更新","由【${param1}】于【操作时间：${param2}】，进行【更新】" ),
        AUTH_ROLE(11, "授权门禁权限","由【${param1}】于【操作时间：${param2}】，进行【授权门禁权限】" ),
        WORK_OFF(12, "离职","由【${param1}】于【操作时间：${param2}】，进行【离职】操作" ),
        WORK_ON(13, "在职","由【${param1}】于【操作时间：${param2}】，进行【在职】操作" ),
        HIGHCHECKOR(6, "设为高级审批人","由【${param1}】于【${param2}】，进行【设为高级审批人】" ),
        CANCEL_HIGHCHECKOR(7, "取消高级审批人","由【${param1}】于【${param2}】，进行【取消高级审批人】" ),
        LEVEL(8, "手动离场","由【${param1}】于【${param2}】，进行【手动离场】" ),
        DELETE(9, "删除","由【${param1}】于【${param2}】，进行【删除】" ),
        EDIT(10, "更新","由【${param1}】于【${param2}】，进行【更新】" ),
        AUTH_ROLE(11, "授权门禁权限","由【${param1}】于【${param2}】，进行【授权门禁权限】" ),
        WORK_OFF(12, "离职","由【${param1}】于【${param2}】，进行【离职】操作" ),
        WORK_ON(13, "在职","由【${param1}】于【${param2}】，进行【在职】操作" ),
        IMPORT_TRAIMETIME(14, "导入培训有效","由【${param1}】于【${param2}】，进行【导入培训有效】操作" ),
        BE_HEAD(15, "设为主管","由【${param1}】于【${param2}】，进行【设为主管】操作" ),
        NOT_HEAD(16, "取消主管","由【${param1}】于【${param2}】，进行【取消主管】操作" ),
        ;

        // 成员变量
@@ -623,6 +688,14 @@
            this.info = info;
            this.name = name;
        }
        public static String getName(int index) {
            for (UserActionType c : UserActionType.values()) {
                if (c.getKey() == index) {
                    return c.name;
                }
            }
            return null;
        }

        public int getKey() {
            return key;