From 856f526f823f5dad88c28657d82f971ff66afb1e Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 15 九月 2025 13:37:01 +0800
Subject: [PATCH] 优化

---
 server/services/src/main/java/com/doumee/core/constants/Constants.java |   87 +++++++++++++++++++++++++++++++++++++------
 1 files changed, 75 insertions(+), 12 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index 4bdbd4a..bf2d151 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -1,18 +1,20 @@
 package com.doumee.core.constants;
 
+import ch.qos.logback.core.util.COWArrayList;
+import com.doumee.dao.business.web.request.LocaltionDTO;
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
+import java.awt.*;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
+import java.util.*;
 import java.util.List;
-import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -24,25 +26,65 @@
   public static final String TOKEN ="TOKEN" ;
     public static final String SYSTEM ="SYSTEM" ;
     public static final String DINGDING ="DINGDING" ;
+    public static final String DINGDING_APPKEY ="DINGDING_APPKEY" ;
+    public static final String DINGDING_CHATTOKEN ="DINGDING_CHATTOKEN" ;
+    public static final String DINGDING_ROBOTCODE ="DINGDING_ROBOTCODE" ;
+    public static final String DINGDING_SECRET ="DINGDING_SECRET" ;
+    public static final String DINGDING_TOKEN ="DINGDING_TOKEN" ;
+
     public static final String MINI_PROGRAMME ="MINI_PROGRAMME" ;
     public static final String FREE_RENT_TIME ="FREE_RENT_TIME" ;
+    public static final String LOW_VOLTAGE ="LOW_VOLTAGE" ;
+    public static final String ACCESS_TOKEN ="ACCESS_TOKEN" ;
     public static final String IMG_DIR = "IMG_DIR";
     public static final String FILE_DIR ="FILE_DIR" ;
     public static final String PRIVATE_KEY = "PRIVATE_KEY";
     public static final String PROJECT_FILE = "PROJECT_FILE";
+    public static final String PROJECTS = "PROJECTS";
+    public static final String DISCOUNT = "DISCOUNT";
+    public static final String ELEC_BIKE_CONTRIL_API_URL = "ELEC_BIKE_CONTRIL_API_URL";
     public static final String FORCE_BACK_LOCK = "FORCE_BACK_LOCK";
     public static final String FORCE_BACK_SITE = "FORCE_BACK_SITE";
+    //杞﹁締绫诲瀷鏁版嵁
+    public static final String  BIKE_TYPE ="0,1,2,3,4,5,6,7,8" ;
+    public static final String MINI_PROGRAMME_REALEASE ="MINI_PROGRAMME_REALEASE" ;
+    public static final String TIME_OUT_TEMPID ="TIME_OUT_TEMPID" ;
+
+    public static final int FOUR =4 ;
+    public static final String PAUSE_BIKE_TYPE ="PAUSE_BIKE_TYPE" ;
+    public static final String HEART_TIME_EXPIRE_TIME ="HEART_TIME_EXPIRE_TIME" ;
+    public static final String PARK_LAT_LNG_LIST = "PARK_LAT_LNG_LIST";
+    public static final String LOW_BIKE_VOLTAGE ="LOW_BIKE_VOLTAGE" ;
+    public static final String OBLINE_HEART_TIME_LIMIT ="OBLINE_HEART_TIME_LIMIT" ;
+    public static final String EBIKE_PREFIX ="ebike-" ;
     public static String REDIS_DEBUG_STR="test_";
     public static final String AD = "AD";
+    public static String REPAIR = "REPAIR";
+    public static final String NOTICE_SITE_LINK_LIMIT="NOTICE_SITE_LINK_LIMIT";
+
+    public static boolean equalsInteger(Integer a, Integer b) {
+        if (formatIntegerNum(a) == formatIntegerNum(b)) {
+            return true;
+        }
+        return false;
+    }
+
     public  interface MqttTopic{
 
         String topic_index = "device/lock/";
         //寮�閿侊紙鍙戝竷锛�
         String pub_openLock = "device/lock/{siteId}/{lockId}/unlock";
+        //绔欑偣鍏ㄩ噺閿佸ご鏁伴噺淇℃伅
+        String sub_siteInfo = "device/lock/+/siteInfo";
+        //绠$悊鍛樺埛鍗¤褰曚笂鎶�
+        String sub_adminCard = "device/lock/+/+/adminCard";
         //閿佷俊鎭紝鍦ㄥ垵濮嬪寲銆佺姸鎬佸彉鏇存椂浼氭帹閫侀攣鐨勫畬鏁寸姸鎬�(璁㈤槄锛�
         String sub_lockInfo = "device/lock/+/+/info";
         //杩樿溅閿佸ご锛堣闃咃級
         String sub_closeLock = "device/lock/+/+/bike";
+        String sub_health= "device/lock/+/health";
+
+        String sub_brokers = "$SYS/brokers/+/clients/#";
         //瀹炴椂鑾峰彇閿佷俊鎭紙鍙戝竷锛�
         String pub_getLockInfo = "device/lock/{siteId}/{lockId}/getInfo";
     }
@@ -57,11 +99,12 @@
         int partful = 3;
   }
     public interface LockStatus{
-      //  //鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父
+      //  //鐘舵�侊紝0闂悎, 1鎵撳紑锛�2杩愯涓�, 3寮傚父 -1鑷
         int closed =0;
         int open =1;
         int running =2;
         int error= 3;
+        int checking= -1;
     }
     public interface goodsorderStatus{
         int waitPay =0;
@@ -78,11 +121,13 @@
       //浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾 1缁撶畻瀹為檯娑堣垂 2缁撶畻閫�娆� 3骞冲彴閫�娆�"
         DEPOSIT(0,"绉熻溅鎶奸噾", "绉熻溅鎶奸噾"),
 
-        CONSUMPTION(1,"缁撶畻瀹為檯娑堣垂", "缁撶畻瀹為檯娑堣垂"),
+        CONSUMPTION(1,"璁㈠崟娑堣垂缁撶畻", "璁㈠崟娑堣垂缁撶畻"),
 
-        REFUND(2,"缁撶畻閫�娆�", "缁撶畻閫�娆�"),
+        REFUND(2,"缁撶畻閫�鎶奸噾", "缁撶畻閫�鎶奸噾"),
 
-        PLATFORMREFUND(3,"骞冲彴閫�娆�", "骞冲彴閫�娆�")
+        PLATFORM_REFUND(3,"骞冲彴閫�娆�", "骞冲彴閫�娆�"),
+
+        DISCOUNT(4,"濂楅璐拱", "濂楅璐拱")
 
         ;
         String name;
@@ -137,6 +182,7 @@
 }
         public interface RedisKeys {
             public static final String submission_period_key = "sp_";
+            public static final String import_bikes = "import_bikes";
         }
 
         public static final String ACCESS_ID = "ACCESS_ID";
@@ -162,8 +208,13 @@
         public static final String LEASE_NOTICE_URL = "LEASE_NOTICE_URL";
         //鎶奸噾
         public static final String RENT_DEPOSIT = "RENT_DEPOSIT";
+        //鐢佃溅涓村仠鑷姩鍏抽攣鏃堕暱锛堝垎閽燂級
+        public static final String PAUSE_AUTO_CLOSE_TIME = "PAUSE_AUTO_CLOSE_TIME";
+
         //娓╅Θ鎻愮ず
         public static final String TIPS = "TIPS";
+        //娓╅Θ鎻愮ず
+        public static final String RENT_NOTICE = "RENT_NOTICE";
         //灏忕▼搴忓仠姝㈡湇鍔℃彁绀�
         public static final String STOP_SERVE_TIPS = "STOP_SERVE_TIPS";
         //灏忕▼搴忔槸鍚﹀仠姝㈡湇鍔� 0鍚� 1鏄�
@@ -176,11 +227,12 @@
         public static final String BUSINESS_STARTTIME = "BUSINESS_STARTTIME";
         //灏忕▼搴忔瘡鏃ユ湇鍔$粨鏉熸椂闂�
         public static final String BUSINESS_ENDTIME = "BUSINESS_ENDTIME";
+        //鐢佃溅浜岀淮鐮佸墠缂�
+        public static final String ELECTRICITY_PREFIX = "ELECTRICITY_PREFIX";
 
         //閽夐拤閫氱煡鍦板潃
         public static final String DINGDING_URL = "DINGDING_URL";
         //閽夐拤绛惧悕
-        public static final String DINGDING_SECRET = "DINGDING_SECRET";
 
         //灏忕▼搴忔弧杞介璀�(%)鏈�澶у��
         public static final String WARN_MAX = "WARN_MAX";
@@ -200,6 +252,14 @@
                 return 0;
             }
             return num;
+        }
+        public static Integer formatIntegerFromStr(String num) {
+            try {
+                return  Integer.parseInt(num);
+            }catch (Exception e){
+
+            }
+            return null;
         }
 
         public interface UserActionsType {
@@ -315,13 +375,13 @@
 
     public enum REFUND_TYPE{
         // '閫�娆剧被鍨� 0鐢ㄦ埛缁撶畻閫�娆� 1骞冲彴鑷姩缁撶畻閫�娆� 2寮哄埗缁撶畻閫�娆� 3缁撶畻鍚庨��娆�'
-        NORMAL(  0,"鐢ㄦ埛缁撶畻閫�娆�",""),
+        NORMAL(  0,"鐢ㄦ埛缁撶畻閫�娆�","缁撶畻閫�鎶奸噾"),
 
-        PLAT_AUTO( 1,"骞冲彴鑷姩缁撶畻閫�娆�",""),
+        PLAT_AUTO( 1,"骞冲彴鑷姩缁撶畻閫�娆�","骞冲彴閫�鎶奸噾"),
 
-        PLAT_FORCE( 2,"寮哄埗缁撶畻閫�娆�",""),
+        PLAT_FORCE( 2,"寮哄埗缁撶畻閫�娆�","骞冲彴閫�鎶奸噾"),
 
-        BACK( 3,"缁撶畻鍚庨��娆�",""),
+        BACK( 3,"缁撶畻鍚庨��娆�","骞冲彴閫�娆�"),
 
         ;
         String name;
@@ -378,7 +438,8 @@
 
             BACK_CYCLING("宸茶繕杞�", 2,"宸茶繕杞�"),
 
-            LOCKING_DEFEAT("寮�閿佸け璐�", 3,"寮�閿佸け璐�")
+            LOCKING_DEFEAT("寮�閿佸け璐�", 3,"寮�閿佸け璐�"),
+            RIDES_PAUSING("涓村仠涓�", 4,"涓村仠涓�")
             ;
             String name;
 
@@ -561,4 +622,6 @@
             return  Constants.formatDecimalNum(money).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP);
 
         }
+
+
 }

--
Gitblit v1.9.3