From 4ee00850f197d769481f73acb8ed79ab1c75b84d Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 14 十一月 2025 11:41:24 +0800
Subject: [PATCH] 问题修复
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 0c40d2f..c6b8fa5 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/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;
+ }
+
}
--
Gitblit v1.9.3