Merge remote-tracking branch 'origin/master'

jiangping

2024-01-05 cb6874174975a370cb60f1557704c9d49a05f9e6

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

@@ -63,6 +63,7 @@
    public static final String ERP_USERSTATUS_RL ="ERP_USERSTATUS_RL" ;
    public static final String ERP ="ERP" ;
    public static final Integer THREE =3 ;
    public static final Integer FOUR =4 ;
    public static final String ORG_USER_ORIGIN = "ORG_USER_ORIGIN";
    public static  boolean DEALING_HK_SYNCPRIVILEGE= false;
    public static  boolean DEALING_HK_SYNCDEVICE = false;
@@ -206,6 +207,7 @@
    public static final String COFFEE_BEAN_TASK ="COFFEE_BEAN_TASK";


    public static final String HOME_IMAGE ="HOME_IMAGE";



@@ -214,6 +216,8 @@
    public static final String WX_PLATFORM_ACCESS_TOKEN = "WX_PLATFORM_ACCESS_TOKEN";
    public static final String WX_PLATFORM_APPID = "WX_PLATFORM_APPID";
    public static final String WX_PLATFORM_SECRET = "WX_PLATFORM_SECRET";
    public static final String WX_PLATFORM_AUDIT_VISIT = "WX_PLATFORM_AUDIT_VISIT";
    public static final String WX_PLATFORM_PREFIX = "WX_PLATFORM_PREFIX";



@@ -223,6 +227,8 @@
    public interface RedisKeys {
        public static final String ERP_TOKEN ="ERP_TOKEN";
        public static final long EXPIRE_TIME = 7200;

        public static final String INTERNAL_TOKEN ="INTERNAL_TOKEN";

        public static final String GOODSORDER_KEY = "ordercode_";
        public static final String ACTIVITY_SIGN_KEY = "actcode_";
@@ -285,6 +291,17 @@
    int visitor = 1;//普通访客
    int internal = 2;//内部人员
}


public interface  approveStatus{
    int wait = 0;//待审批
    int auditIng = 1;//审批中
    int pass = 2;//审批通过
    int unPass = 3;//审批未通过
    int otherDeal = 4;//他人已处理
}


    public static void main(String[] args) {
        String t = URLDecoder.decode("https://lsqw.gtja.com/qwcos/v-index.html#/loginforProperty?corpId=ww4b7aefafeb430e4b&corpId=ww4b7aefafeb430e4b&agentId=1000005&agentId=1000005&fromRoute=&userCode=013561&userCode=&userId=zz&userId=&encryptUserCode=&custQwId=wmIUuSDgAAR8MhtVY8w90EyKltvoK5fA&custCode=&openId=op1wZwD1dKuBQywmWWS5957zUOJI&name=%E8%B9%84%E8%B9%84&headUrl=http%3A%2F%2Fwx.qlogo.cn%2Fmmhead%2FQ3auHgzwzM4QlibSOAvYcvRMdsoyF3Ua7duLOYSJfB3dsGsYxIYonBw%2F0&dbHeadUrl=https%3A%2F%2Ftgf.gtja.com%2Ff%2F%2Fqwoms%2F2022512%2Fqwoms_1652332606613_8.jpg");
        System.out.println(t);
@@ -306,7 +323,11 @@
        /** 用户类型 **/
        LW_FK(0,"劳务访客"),
        PT_FK(1,"普通访客"),
        NB_FK(2,"内部人员");
        NB_FK(2,"内部人员"),

        /** 进场类型 **/
        OUT(0,"出"),
        IN(1,"进");

        private  Integer value;
        private  String des;