Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

16 小时以前 70ac6517f3e343ae59454c045eebf984fc6562b7

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

@@ -59,6 +59,7 @@
    public static final String SIGN_IN_QRCODE_PREFIX ="SIGN_IN_QRCODE_PREFIX" ;
    public static final String JK_PLAN_MAX_CLUSTER ="JK_PLAN_MAX_CLUSTER" ;
    public static final String JK_PLAN_DISTANCE_CLUSTER ="JK_PLAN_DISTANCE_CLUSTER" ;
    public static final String HK_PUSH_THIRD_URL ="HK_PUSH_THIRD_URL" ;

    /**
     * 操作类型，用于做接口验证分组
@@ -572,6 +573,11 @@
        public static final String BIGSCREEN_UUID ="BIGSCREEN_UUID";
        public static final String IMPORTING_GAS ="IMPORTING_GAS";
        public static final String ERP_TOKEN ="ERP_TOKEN";
        public static final String HK_REGIONS ="HK_REGIONS";
        public static final String HK_CAMERAS ="HK_CAMERAS";
        public static final String HK_REGIONS_TREE ="HK_REGIONS_TREE";
        public static final String HK_FIRE_DEVICE="HK_FIRE_DEVICE";
        public static final String HK_SENSOR="HK_SENSOR";
        public static final long EXPIRE_TIME = 7200;

        public static final String INTERNAL_TOKEN ="INTERNAL_TOKEN";
@@ -1536,9 +1542,10 @@
        AF_XFTDZS(422000000, "【安防事件】消防通道阻塞",1),
        XF_SYGDBJ(254215, "【消防事件】水压过低报警",1),
        XF_SYGGBJ(254216, "【消防事件】水压过高报警",1),
        XF_HZBJ(253999, "【消防事件】火灾报警",1),
        XF_HZBJ(254047, "【消防事件】火灾报警",1),
        XF_YWGDBJ(254331, "【消防事件】液位过低报警",1),
        XF_YWGGBJ(254332, "【消防事件】液位过高报警",1),
        AF_DZWL(327681, "【安防事件】电子围栏",1),
        ;
        // 成员变量
        private int key;