From 917c4ee8b05e816602aa06f67f2f5447150b242f Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 17 十二月 2025 09:35:50 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 18 +++++++++++++-----
1 files changed, 13 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 119bf72..481a4bc 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
@@ -58,7 +58,7 @@
public static final String SIGN_IN_ATTENTION ="SIGN_IN_ATTENTION" ;
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_DISTANCECLUSTER ="JK_PLAN_DISTANCECLUSTER" ;
+ public static final String JK_PLAN_DISTANCE_CLUSTER ="JK_PLAN_DISTANCE_CLUSTER" ;
/**
* 鎿嶄綔绫诲瀷锛岀敤浜庡仛鎺ュ彛楠岃瘉鍒嗙粍
@@ -572,6 +572,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";
@@ -1530,12 +1535,15 @@
GRID_TIME_OUT_INFO(10003, "銆愰挜鍖欐煖銆戝紑闂ㄨ秴鏃舵湭鍏抽棴",0),
KEY_TIME_OUT_BACK(10004, "銆愰挜鍖欐煖銆戦挜鍖欒秴鏃舵湭褰掕繕",0),
AF_QYRQ(131588, "銆愬畨闃蹭簨浠躲�戝尯鍩熷叆渚�",1),
- AF_QUPD(131592, "銆愬畨闃蹭簨浠躲�戝尯鍩熻窇鍔�",1),
- AF_RYLG(131603, "銆愬畨闃蹭簨浠躲�戜汉鍛樼宀�",1),
+ AF_QUPD(131668, "銆愬畨闃蹭簨浠躲�戝尯鍩熻窇鍔�",1),
+ AF_RYLG(422000001, "銆愬畨闃蹭簨浠躲�戜汉鍛樼宀�",1),
AF_KYSCX(131585, "銆愬畨闃蹭簨浠躲�戣法瓒婄敓浜х嚎",1),
- XF_SYBJ(253956, "銆愭秷闃蹭簨浠躲�戞按鍘嬫姤璀�",1),
+ AF_XFTDZS(422000000, "銆愬畨闃蹭簨浠躲�戞秷闃查�氶亾闃诲",1),
+ XF_SYGDBJ(254215, "銆愭秷闃蹭簨浠躲�戞按鍘嬭繃浣庢姤璀�",1),
+ XF_SYGGBJ(254216, "銆愭秷闃蹭簨浠躲�戞按鍘嬭繃楂樻姤璀�",1),
XF_HZBJ(253999, "銆愭秷闃蹭簨浠躲�戠伀鐏炬姤璀�",1),
- XF_YWBJ(254047, "銆愭秷闃蹭簨浠躲�戞恫浣嶆姤璀�",1),
+ XF_YWGDBJ(254331, "銆愭秷闃蹭簨浠躲�戞恫浣嶈繃浣庢姤璀�",1),
+ XF_YWGGBJ(254332, "銆愭秷闃蹭簨浠躲�戞恫浣嶈繃楂樻姤璀�",1),
;
// 鎴愬憳鍙橀噺
private int key;
--
Gitblit v1.9.3