问题修复

rk

昨天 4ee00850f197d769481f73acb8ed79ab1c75b84d

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

@@ -84,6 +84,7 @@
    public static final String LOCATION ="LOCATION" ;
    public static final String API_KEY ="API_KEY" ;
    public static final String CABINET_CONFIG ="CABINET_CONFIG" ;
    public static final String JDY_CONFIG ="JDY_CONFIG" ;
    public static final String BLOW_TIME ="BLOW_TIME" ;
    public static final String PRESSURE ="PRESSURE" ;
    public static final String CONCENTRATION ="CONCENTRATION" ;
@@ -127,6 +128,8 @@
    public static final String WORK_END = "WORK_END";
    public static final String INTERVAL = "INTERVAL";
    public static final String USE_CAR_TAKE_CARE = "USE_CAR_TAKE_CARE";

    public static final String PUSH_URL_KEYS = "PUSH_URL_KEYS";



@@ -537,6 +540,9 @@
    public static final String APP_SECRET ="APP_SECRET";
    public static final String ACCESS_TOKEN ="ACCESS_TOKEN";
    public static final String AGENT_ID ="AGENT_ID";
    public static final String CLEAN_TIME ="CLEAN_TIME";
    public static final String EARLY_CONFIG ="EARLY_CONFIG";




@@ -1130,7 +1136,7 @@
        WAIT_CALL(2, "已签到","已签到"),
        IN_WAIT(3, "入园等待","入园等待" ),
        CALLED(4, "已叫号","已叫号" ),
         WORKING(5, "作业中","作业中" ),
        WORKING(5, "作业中","作业中" ),
        DONE(6, "作业完成 ","作业完成" ),
        TRANSFERING(7, "转移中","转移中" ),
        EXCEPTION(8, "异常挂起","异常挂起" ),
@@ -1194,7 +1200,7 @@
        IN_CITY_CAR_USE(3, "公车市内用车 ", "公车市内用车 "),
        OUT_CITY_CAR_USE(4, "公车室外用车 ", "公车室外用车 "),
        CITY_WLC_BOOK(5, "市公司物流车预约 ", "5市公司物流车预约 "),
        PLATFROM_REASON(6, "月台入园原因审批 ", "月台入园原因审批 "),
        PLATFROM_REASON(6, "月台入园原因审批 ", "月台入园原因审批 ")
        ;
        // 成员变量
        private String name;
@@ -1523,18 +1529,20 @@


    public  enum WarningConfig {
        ALARM_TEST(10002, "【钥匙柜】酒精测试异常"),
        GRID_TIME_OUT_INFO(10003, "【钥匙柜】开门超时未关闭"),
        KEY_TIME_OUT_BACK(10004, "【钥匙柜】钥匙超时未归还"),
        ALARM_TEST(10002, "【钥匙柜】酒精测试异常",0),
        GRID_TIME_OUT_INFO(10003, "【钥匙柜】开门超时未关闭",0),
        KEY_TIME_OUT_BACK(10004, "【钥匙柜】钥匙超时未归还",0),
        ;
        // 成员变量
        private int key;
        private String info;
        private int processArea;

        // 构造方法
        WarningConfig(int key,String info) {
        WarningConfig(int key,String info,int processArea) {
            this.key = key;
            this.info = info;
            this.processArea = processArea;
        }


@@ -1554,8 +1562,39 @@
            this.info = info;
        }

        public int getProcessArea() {
            return processArea;
        }

        public void setProcessArea(int processArea) {
            this.processArea = processArea;
        }


    }


    public static boolean  betweenTimeConfig(String timeConfigData){
        if(StringUtils.isNotBlank(timeConfigData)){
            Integer nowTime = Integer.valueOf(DateUtil.getFormattedDateUtil(new Date(),"HH:mm").replace(":",""));
            List<String> cleanConfigList = Arrays.asList(StringUtils.split(timeConfigData,","));
            for (String config:cleanConfigList) {
                String [] timeArr = config.split("-");
                if(timeArr.length>Constants.ONE){
                    try {
                        Integer start = Integer.valueOf(timeArr[0].replace(":",""));
                        Integer end = Integer.valueOf(timeArr[1].replace(":",""));
                        if(start <= nowTime && end >= nowTime){
                            return true;
                        }
                    }catch (Exception e){

                    }
                }
            }
        }
        return false;
    }


}