From 4936ba718f4ec2d069a9c28d07215573ed8548aa Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 30 一月 2026 10:12:10 +0800
Subject: [PATCH] 修改简道云人员推送删除功能bug
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 151 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 143 insertions(+), 8 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 e3459ae..9edb8e1 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
@@ -1,7 +1,9 @@
package com.doumee.core.utils;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -23,7 +25,9 @@
public static final String HEADER_USER_TOKEN = "dm_user_token";
public static final String REDIS_USER_KEY = "user_token_list_";
public static final String REDIS_TOKEN_KEY = "token_";
+ public static final String WMS_IN_REPERTOTY_CODE_LIST = "WMS_IN_REPERTOTY_CODE_LIST";
public static final String REDIS_HK_TOKEN_KEY = "hk_token_";
+ public static boolean IS_AUTOCALL_WORKING = false;
public static final String HK_TOKEN_VALIDITY = "HK_TOKEN_VALIDITY";
public static final String[] ALL_SPELL_LIST_FIRST = new String[]{"A", "B", "C", "D", "E", "F", "G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"};
public static final int ZERO = 0 ;
@@ -34,6 +38,8 @@
public static final String HK_PARAM ="HK_PARAM" ;
public static final String HK_WEBSITE_DOMAIN_URL ="HK_WEBSITE_DOMAIN_URL" ;
public static final String LED_CONTENT_SPEED ="LED_CONTENT_SPEED" ;
+ public static final String SYSTEM_TITLE ="SYSTEM_TITLE" ;
+ public static final String SYSTEM_SUBTITLE ="SYSTEM_SUBTITLE" ;
public static final String HK_HOST ="HK_HOST" ;
public static final String HK_APPKEY ="HK_APPKEY" ;
public static final String LOGIN_OUT_URL ="LOGIN_OUT" ;
@@ -57,6 +63,20 @@
public static final String SIGN_IN_QRCODE ="SIGN_IN_QRCODE" ;
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_DISTANCE_CLUSTER ="JK_PLAN_DISTANCE_CLUSTER" ;
+ public static final String HK_PUSH_THIRD_URL ="HK_PUSH_THIRD_URL" ;
+
+ public static final String API_KEY ="API_KEY" ;
+
+ public static final String JDY_APPID = "JDY_APPID";
+ public static final String JDY_ENTRY_ID ="JDY_ENTRY_ID";
+ public static final String JDY_API_KEY ="JDY_API_KEY" ;
+ public static final String JDY_CONFIG ="JDY_CONFIG" ;
+ public static final String JDY_COMPANY_ROOT_NO ="JDY_COMPANY_ROOT_NO" ;
+ public static final String JDY_SECRET ="JDY_SECRET";
+ public static final String JDY_MEMBER_PUSH_STATUS_URL ="JDY_MEMBER_PUSH_STATUS_URL";
+ public static final String JDY_API_HOST = "JDY_API_HOST";
/**
* 鎿嶄綔绫诲瀷锛岀敤浜庡仛鎺ュ彛楠岃瘉鍒嗙粍
@@ -82,7 +102,6 @@
public static final String WEATHER_CONFIG ="WEATHER_CONFIG" ;
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 CABINET_CONFIG ="CABINET_CONFIG" ;
public static final String BLOW_TIME ="BLOW_TIME" ;
public static final String PRESSURE ="PRESSURE" ;
@@ -107,6 +126,7 @@
// 璁垮鏉ヨ閰嶇疆
public static final String VISIT_CONFIG = "VISIT_CONFIG";
public static final String MEMBER_IMG = "MEMBER_IMG";
+ public static final String ACTIVATE = "ACTIVATE";
public static final String PLATFORM_EVENT_IMG = "PLATFORM_EVENT_IMG";
public static final String VISIT_NOTICE = "VISIT_NOTICE";
public static final String TIME_OUT_CONFIG = "TIME_OUT_CONFIG";
@@ -214,6 +234,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;
@@ -284,6 +305,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;
}
/**
@@ -530,6 +560,7 @@
public static final String COFFEE_BEAN_TASK ="COFFEE_BEAN_TASK";
+ public static final String IN_REPERTOTY_CODE ="IN_REPERTOTY_CODE";
public static final String HOME_IMAGE ="HOME_IMAGE";
public static final String DD_TALK ="DD_TALK";
@@ -537,8 +568,6 @@
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 WX_PLATFORM = "WX_PLATFORM";
@@ -569,6 +598,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";
@@ -763,14 +797,73 @@
}
}
+ public static String getWmsAreasNameByCode(String listStr,String code) {
+ try {
+ JSONArray list = JSONObject.parseArray(listStr );
+ if(list!=null && list.size()>0){
+ for (int i = 0; i < list.size(); i++) {
+ if(StringUtils.equals(list.getJSONObject(i).getString("code"),code)){
+ return list.getJSONObject(i).getString("name");
+ }
+ }
+ }
+ }catch (Exception e){
+
+ }
+ return null;
+ }
+ public static List<JSONObject> getWmsAreasList(){
+ List<JSONObject> list = new ArrayList<>();
+ JSONObject t = new JSONObject();
+ t.put("code","01");
+ t.put("name","铓屽煚鑿寸儫鍘�");
+ list.add(t);
+ t = new JSONObject();
+ t.put("code","02");
+ t.put("name","鑺滄箹鍗风儫鍘�");
+ list.add(t);
+ t = new JSONObject();
+ t.put("code","03");
+ t.put("name","鍚堣偉鍗风儫鍘�");
+ list.add(t);
+ t = new JSONObject();
+ t.put("code","04");
+ t.put("name","闃滈槼鍗风儫鍘�");
+ list.add(t);
+ t = new JSONObject();
+ t.put("code","04206");
+ t.put("name","鍚堣偉鍗风儫鍘傞瀺灞卞簱");
+ list.add(t);
+ t = new JSONObject();
+ t.put("code","05");
+ t.put("name","婊佸窞鍗风儫鍘�");
+ list.add(t);
+ t = new JSONObject();
+ t.put("code","06");
+ t.put("name","钂欏煄棣欒寗鐢熶骇閮�");
+ list.add(t);
+ t = new JSONObject();
+ t.put("code","07");
+ t.put("name","閲嶅簡涓儫宸ヤ笟鏈夐檺璐ｄ换鍏徃");
+ list.add(t);
+ t = new JSONObject();
+ t.put("code","08");
+ t.put("name","闄曡タ涓儫宸ヤ笟鏈夐檺璐ｄ换鍏徃");
+ list.add(t);
+ t = new JSONObject();
+ t.put("code","09");
+ t.put("name","鐗规畩绾康鐗�");
+ list.add(t);
+ return list;
+ }
public static void main(String[] args) {
+ System.out.println(JSONObject.toJSONString(getWmsAreasList()));
// getChinesePingyin("DDaa姹熻悕鐨勫瀵瑰");
// System.out.println(DateUtil.getShortTime(new Date()));
// System.out.println( "2025-01-14 10:50:56".substring(0,10));
// System.out.println(Constants.checkCarNo("鐨朅A10991"));
// System.out.println(Constants.getVehiclePlateNo("婀楤140D17").getDescription());
// System.out.println(Constants.getVehiclePlateNo("瀹緼P0637").getDescription());
-
// 0789150665 C97B092F 0789150561
@@ -931,6 +1024,7 @@
LEAVED(10, "宸茬鍥� ","杞﹁締浠巤data}绂诲満 " ),
OVER_NUMBER(11, "宸茶繃鍙�","瓒呮椂鏈埌鎸囧畾鏈堝彴鑷姩杩囧彿" ),
CHANGE_GROUP(12, "鏇存崲鏈堝彴缁�","浠庛�恵data}銆戞洿鎹㈠埌銆恵data1}銆�" ),
+ BACK_TO_WAIT_SIGNIN(13, "閲嶆柊绛惧埌","閲嶆柊绛惧埌" ),
;
// 鎴愬憳鍙橀噺
@@ -1520,21 +1614,53 @@
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 {
- 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),
+ 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(254047, "銆愭秷闃蹭簨浠躲�戠伀鐏炬姤璀�",1),
+ XF_YWGDBJ(254331, "銆愭秷闃蹭簨浠躲�戞恫浣嶈繃浣庢姤璀�",1),
+ XF_YWGGBJ(254332, "銆愭秷闃蹭簨浠躲�戞恫浣嶈繃楂樻姤璀�",1),
+ AF_DZWL(327681, "銆愬畨闃蹭簨浠躲�戠數瀛愬洿鏍�",1),
;
// 鎴愬憳鍙橀噺
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;
+ }
+
+
+ public static WarningConfig getConfig(int index) {
+ for (WarningConfig c : WarningConfig.values()) {
+ if (c.getKey() == index) {
+ return c;
+ }
+ }
+ return null;
}
@@ -1554,6 +1680,15 @@
this.info = info;
}
+ public int getProcessArea() {
+ return processArea;
+ }
+
+ public void setProcessArea(int processArea) {
+ this.processArea = processArea;
+ }
+
+
}
--
Gitblit v1.9.3