From 308bc8e5c0db7298a127f3478995ddc6167328e9 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 25 十二月 2025 16:43:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 481a4bc..391f5a2 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
@@ -59,6 +59,7 @@
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_DISTANCE_CLUSTER ="JK_PLAN_DISTANCE_CLUSTER" ;
+ public static final String HK_PUSH_THIRD_URL ="HK_PUSH_THIRD_URL" ;
/**
* 鎿嶄綔绫诲瀷锛岀敤浜庡仛鎺ュ彛楠岃瘉鍒嗙粍
@@ -85,6 +86,7 @@
public static final String REQUEST_URL ="REQUEST_URL" ;
public static final String LOCATION ="LOCATION" ;
public static final String API_KEY ="API_KEY" ;
+ public static final String JDY_CONFIG ="JDY_CONFIG" ;
public static final String CABINET_CONFIG ="CABINET_CONFIG" ;
public static final String BLOW_TIME ="BLOW_TIME" ;
public static final String PRESSURE ="PRESSURE" ;
@@ -217,6 +219,7 @@
public static boolean DEALING_HK_NOTICE_LIST = false;
public static boolean DEALING_FROM_HK_VISIT = false;
public static boolean DEALING_HK_EMPOWER = false;
+ public static boolean DEALING_DUANLUQI_CLOSE = false;
public static boolean DEALING_HK_EMPOWER_DETAIL = false;
public static boolean DEALING_HK_EMPOWER_RESULT = false;
public static boolean DEALING_HK_PARKBOOK = false;
@@ -287,6 +290,15 @@
public static final int depart = 3;
public static final int custom = 4;
public static final int self = -1;
+ }
+ //绫诲瀷 0闂ㄧ 1杞﹀簱 2LED 3骞挎挱鐐� 4骞挎挱璁惧 5鏂矾鍣ㄧ┖寮�
+ public interface DEVICE_TYPE{
+ public static final int door = 0;
+ public static final int park = 1;
+ public static final int led = 2;
+ public static final int broadcaset = 3;
+ public static final int broadcasetChannel = 4;
+ public static final int duanluqi = 5;
}
/**
@@ -540,7 +552,8 @@
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 APPID = "APPID";
+ public static final String ENTRY_ID ="ENTRY_ID";
@@ -1528,6 +1541,14 @@
return JSONObject.toJSONString(map);
}
+ public interface MqttTopic{
+ String mts_attr = "/dev/+/+/attr/json";//灞炴�opic
+ String mts_status = "/dev/+/+/status/json";//鐘舵�乼opic
+ String mts_event= "/dev/+/+/event/json";//浜嬩欢topic
+ String mts_echo= "/dev/+/+/echo/json";//娑堟伅鍥炲topic
+ String mts_cmd= "/dev/$CATE/$DEVID/cmd/json";//鍛戒护topic
+ String mts_resp= "/dev/+/+/resp/json";//鍛戒护鍝嶅簲topic
+ }
public enum WarningConfig {
@@ -1537,13 +1558,15 @@
AF_QYRQ(131588, "銆愬畨闃蹭簨浠躲�戝尯鍩熷叆渚�",1),
AF_QUPD(131668, "銆愬畨闃蹭簨浠躲�戝尯鍩熻窇鍔�",1),
AF_RYLG(422000001, "銆愬畨闃蹭簨浠躲�戜汉鍛樼宀�",1),
+ AF_RYLG_CUSTOM(-422000001, "銆愬畨闃蹭簨浠躲�戜汉鍛樼宀�(瀹氬埗鍚庯級",1),
AF_KYSCX(131585, "銆愬畨闃蹭簨浠躲�戣法瓒婄敓浜х嚎",1),
AF_XFTDZS(422000000, "銆愬畨闃蹭簨浠躲�戞秷闃查�氶亾闃诲",1),
XF_SYGDBJ(254215, "銆愭秷闃蹭簨浠躲�戞按鍘嬭繃浣庢姤璀�",1),
XF_SYGGBJ(254216, "銆愭秷闃蹭簨浠躲�戞按鍘嬭繃楂樻姤璀�",1),
- XF_HZBJ(253999, "銆愭秷闃蹭簨浠躲�戠伀鐏炬姤璀�",1),
+ XF_HZBJ(254047, "銆愭秷闃蹭簨浠躲�戠伀鐏炬姤璀�",1),
XF_YWGDBJ(254331, "銆愭秷闃蹭簨浠躲�戞恫浣嶈繃浣庢姤璀�",1),
XF_YWGGBJ(254332, "銆愭秷闃蹭簨浠躲�戞恫浣嶈繃楂樻姤璀�",1),
+ AF_DZWL(327681, "銆愬畨闃蹭簨浠躲�戠數瀛愬洿鏍�",1),
;
// 鎴愬憳鍙橀噺
private int key;
--
Gitblit v1.9.3