From b1941a86deae55e72823961b0efcec61349fa720 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 04 十一月 2025 10:58:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 8093d93..f6daf8d 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
@@ -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;
+ }
+
+
}
--
Gitblit v1.9.3