From 9bfd32ac0781b51d2b8479b91a9754f18060fcb9 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 14 十一月 2024 17:48:50 +0800
Subject: [PATCH] ll
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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 ad045f1..91918e1 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
@@ -39,6 +39,7 @@
public static final String LED_CONTENT_SPEED ="LED_CONTENT_SPEED" ;
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" ;
public static final String HK_APPSECRET ="HK_APPSECRET" ;
public static final String HK_HTTPS ="HK_HTTPS" ;
public static final String HK_PUSH_URL = "HK_PUSH_URL";
@@ -46,6 +47,8 @@
public static final String HK_ROOTORG_NAME ="HK_ROOTORG_NAME" ;
public static final String PLATFORM ="PLATFORM" ;
public static final String POWER_MINUTE ="POWER_MINUTE" ;
+ public static final String SPECIAL_COMPANY_ID ="SPECIAL_COMPANY_ID" ;
+
public static final String RESERVATION_TOTAL_NUM ="RESERVATION_TOTAL_NUM" ;
public static final String SIGN_IN_PLACE_LAT ="SIGN_IN_PLACE_LAT" ;
public static final String SIGN_IN_PLACE_LNT ="SIGN_IN_PLACE_LNT" ;
@@ -73,6 +76,8 @@
public static final String MEMBER_IMG = "MEMBER_IMG";
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";
+
//鍋ュ悍璇侀厤缃�
public static final String LW_HEALTH_CARD = "LW_HEALTH_CARD";
public static final String HEALTH_CARD = "HEALTH_CARD";
@@ -102,6 +107,7 @@
public static final String FTP_USERNAME ="FTP_USERNAME" ;
public static final String FTP_PWD ="FTP_PWD" ;
public static final String FTP_RESOURCE_PATH ="FTP_RESOURCE_PATH" ;
+ public static final String FTP_LOCAL_RESOURCE_PATH ="FTP_LOCAL_RESOURCE_PATH" ;
public static final String ERP_ORGLIST_URL ="ERP_ORGLIST_URL" ;
public static final String ERP_USERLIST_URL ="ERP_USERLIST_URL" ;
public static final String ERP_APPROVE_URL ="ERP_APPROVE_URL" ;
@@ -131,6 +137,8 @@
public static final String TMS_ORDER_DETAIL_URL ="TMS_ORDER_DETAIL_URL" ;
public static final String TMS_LOCK_STATUS_URL ="TMS_LOCK_STATUS_URL" ;
public static final String TMS_INTERFACE_URL_PREFIX ="TMS_INTERFACE_URL_PREFIX" ;
+ public static final String MYSQL_BACKUP_CDOE ="MYSQL_BACKUP_CDOE" ;
+ public static final String MYSQL_BACKUP_DIR ="MYSQL_BACKUP_DIR" ;
public static boolean DEALING_HK_SYNCPRIVILEGE= false;
public static boolean DEALING_HK_SYNCDEVICE = false;
public static boolean DEALING_HK_SYNCPLATFORM = false;
@@ -238,6 +246,7 @@
return null;
}
+
/**
* 鍒ゆ柇鏄惁涓烘湁鏁堣溅鐗屽彿
*/
@@ -295,10 +304,10 @@
}
int l = s.length();
if(Constants.equalsInteger(l,7)){
- return s.substring(0,3)+"***"+s.substring(l-1,l);
+ return s.substring(0,3)+"**"+s.substring(l-2,l);
}
if(l <= 8){
- return s.substring(0,3)+"****"+s.substring(l-1,l);
+ return s.substring(0,3)+"***"+s.substring(l-2,l);
}
return s;
}
@@ -419,7 +428,9 @@
public interface RedisKeys {
+ public static final String IMPORTING_CARS ="IMPORTING_CARS";
public static final String IMPORTING_MEMBER ="IMPORTING_MEMBER";
+ public static final String IMPORTING_GAS ="IMPORTING_GAS";
public static final String ERP_TOKEN ="ERP_TOKEN";
public static final long EXPIRE_TIME = 7200;
@@ -601,8 +612,8 @@
}
public static void main(String[] args) {
- System.out.println(Constants.carCodeTuominStr("鐨朅10991"));
- System.out.println(Constants.carCodeTuominStr("鐨朅A10991"));
+ System.out.println(Constants.checkCarNo("鐨朅10991"));
+ System.out.println(Constants.checkCarNo("鐨朅A10991"));
// System.out.println(Constants.getVehiclePlateNo("婀楤140D17").getDescription());
// System.out.println(Constants.getVehiclePlateNo("瀹緼P0637").getDescription());
@@ -795,12 +806,13 @@
* 5銆佽秴鏃跺仠闈狅細1鍙锋湀鍙� 鐨朅12345 褰撳墠杞﹁締瓒呮椂鍋滈潬锛岃灏藉揩椹剁
*/
public enum PlatformLedContent {
- IDEL_CONTNET(1, "绌洪棽涓�","{param}" ),
+ IDEL_CONTNET(1, "绌洪棽涓�","瀹夋嘲鐗╂祦鏈夐檺璐ｄ换鍏徃" ),
CALLING(2, "鍙彿涓�","${param} ${param2} 鍙彿涓�"),
WORKING(3, "浣滀笟涓�","${param} ${param2} 浣滀笟涓�" ),
WRONG_IN(4, "閿欒鍋滈潬","${param} ${param2} 褰撳墠杞﹁締閿欒鍋滈潬锛岃灏藉揩椹剁" ),
TIMEOUT_IN(5, "瓒呮椂鍋滈潬","${param} ${param2} 褰撳墠杞﹁締瓒呮椂鍋滈潬锛岃灏藉揩椹剁" ),
TIMEOUT_WORK(6, "浣滀笟瓒呮椂","${param} ${param2} 褰撳墠杞﹁締浣滀笟瓒呮椂" ),
+ DONE(7, "浣滀笟瀹屾垚","${param} ${param2} 浣滀笟瀹屾垚" ),
;
// 鎴愬憳鍙橀噺
@@ -859,7 +871,7 @@
CALLING(1, "鍙彿涓�","${param}璇峰墠寰�${param2}绛夊緟浣滀笟"),
DONE(2, "浣滀笟瀹屾垚","${param}浣滀笟瀹屾垚锛岃灏藉揩椹剁" ),
WRONG_IN(3, "閿欒鍋滈潬","${param}鏈堝彴鍋滈潬閿欒锛岃灏藉揩椹剁" ),
- TIMEOUT_IN(4, "瓒呮椂鍋滈潬","${param}鏈堝彴鍋滈潬瓒呮椂锛岃灏藉揩椹剁璇峰敖蹇┒绂�" ),
+ TIMEOUT_IN(4, "瓒呮椂鍋滈潬","${param}鏈堝彴鍋滈潬瓒呮椂锛岃灏藉揩椹剁" ),
TIMEOUT_WORK(5, "浣滀笟瓒呮椂","${param}浣滀笟瓒呮椂" ),
;
@@ -874,6 +886,7 @@
this.info = info;
this.name = name;
}
+
public static String getName(int index) {
for (PlatformBroadcastContent c : PlatformBroadcastContent.values()) {
if (c.getKey() == index) {
@@ -910,7 +923,7 @@
/**
* 鏈堝彴浣滀笟 鐘舵��
- * 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙�
+ * 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12宸插彇娑�
*/
public enum PlatformJobStatus {
WAIT_CONFIRM(0, "寰呯‘璁�","寰呯‘璁�" ),
--
Gitblit v1.9.3