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

doum

4 天以前 b1941a86deae55e72823961b0efcec61349fa720

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

@@ -790,7 +790,7 @@
                String t = reversedHex.substring(i*2,i*2+2);
                result += new StringBuilder(t).reverse().toString();
            }
            return result;
            return result.toUpperCase();
        }catch (Exception e){

        }
@@ -1523,18 +1523,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,6 +1556,15 @@
            this.info = info;
        }

        public int getProcessArea() {
            return processArea;
        }

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


    }