From a2e8793e2c53c7e80b67c1fe407b78fde59b2296 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十一月 2024 10:01:27 +0800
Subject: [PATCH] 最新版本541200007

---
 server/system_service/src/main/java/com/doumee/core/utils/Constants.java |   52 ++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 46 insertions(+), 6 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 47129e4..5a66940 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,13 +39,19 @@
     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";
+    public static final String HK_CARS_OPENAPI_ACCESS_KEY = "HK_CARS_OPENAPI_ACCESS_KEY";
+    public static final String HK_CARS_OPENAPI_ACCESS_SECRET = "HK_CARS_OPENAPI_ACCESS_SECRET";
+    public static final String HK_CARS_OPENAPI_URL = "HK_CARS_OPENAPI_URL";
     public static final String HK_ROOTORG_CODE ="HK_ROOTORG_CODE" ;
     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" ;
@@ -104,6 +110,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" ;
@@ -133,6 +140,10 @@
     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 final String EVENT_FILES_PRIVATE_DOMAIN ="EVENT_FILES_PRIVATE_DOMAIN" ;
+    public static final String EVENT_FILES_PUBLIC_DOMAIN ="EVENT_FILES_PUBLIC_DOMAIN" ;
     public static  boolean DEALING_HK_SYNCPRIVILEGE= false;
     public static  boolean DEALING_HK_SYNCDEVICE = false;
     public static  boolean DEALING_HK_SYNCPLATFORM = false;
@@ -240,6 +251,7 @@
         return  null;
     }
 
+
     /**
      *   鍒ゆ柇鏄惁涓烘湁鏁堣溅鐗屽彿
      */
@@ -297,10 +309,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;
     }
@@ -371,6 +383,16 @@
          int invalid =9;
     }
 
+    public interface RetentionCarType{
+        //杞﹁締绫诲瀷 0鍐呴儴杞﹁締 1鐩稿叧鏂硅溅杈� 2璁垮杞﹁締 3鍐呰繍鐗╂祦杞� 4澶栧崗杞﹁締 5甯傚叕鍙稿嵏璐ц溅
+         int internal = 0;
+         int relation = 1;
+         int visitor = 2;
+         int selfTruck = 3;
+         int outTruck = 4;
+         int cityComTruck = 5;
+    }
+
 
     public interface EmpowerStatus{
         //涓�鍗¢�氭巿鏉冧笅鍙戠姸鎬� 0寰呬笅鍙� 1宸蹭笅鍙� 2涓嬪彂鎴愬姛   3宸插彇娑� 4涓嬪彂澶辫触 5浠诲姟涓嬭浇宸茬粨鏉�
@@ -421,6 +443,7 @@
 
 
     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";
@@ -448,6 +471,22 @@
         }
         //淇濈暀涓や綅灏忔暟涓斿洓鑸嶄簲鍏�
         d = d.setScale(4, BigDecimal.ROUND_HALF_UP);
+        return  d;
+    }
+    public static BigDecimal formatBigdecimal0Float(BigDecimal d) {
+        if (d == null) {
+            d = new BigDecimal(0.0);
+        }
+        //淇濈暀涓や綅灏忔暟涓斿洓鑸嶄簲鍏�
+        d = d.setScale(0, BigDecimal.ROUND_HALF_UP);
+        return  d;
+    }
+    public static BigDecimal formatBigdecimal2Float(BigDecimal d) {
+        if (d == null) {
+            d = new BigDecimal(0.0);
+        }
+        //淇濈暀涓や綅灏忔暟涓斿洓鑸嶄簲鍏�
+        d = d.setScale(2, BigDecimal.ROUND_HALF_UP);
         return  d;
     }
 
@@ -604,8 +643,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());
 
@@ -863,7 +902,7 @@
         CALLING(1, "鍙彿涓�","${param}璇峰墠寰�${param2}绛夊緟浣滀笟"),
         DONE(2, "浣滀笟瀹屾垚","${param}浣滀笟瀹屾垚锛岃灏藉揩椹剁" ),
         WRONG_IN(3, "閿欒鍋滈潬","${param}鏈堝彴鍋滈潬閿欒锛岃灏藉揩椹剁" ),
-        TIMEOUT_IN(4, "瓒呮椂鍋滈潬","${param}鏈堝彴鍋滈潬瓒呮椂锛岃灏藉揩椹剁璇峰敖蹇┒绂�" ),
+        TIMEOUT_IN(4, "瓒呮椂鍋滈潬","${param}鏈堝彴鍋滈潬瓒呮椂锛岃灏藉揩椹剁" ),
         TIMEOUT_WORK(5, "浣滀笟瓒呮椂","${param}浣滀笟瓒呮椂" ),
         ;
 
@@ -878,6 +917,7 @@
             this.info = info;
             this.name = name;
         }
+
         public static String getName(int index) {
             for (PlatformBroadcastContent c : PlatformBroadcastContent.values()) {
                 if (c.getKey() == index) {
@@ -914,7 +954,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