From 59fb524d6b081f0faba177ffd13a0132d314dbae Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 19 十一月 2024 14:15:49 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 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 75f7777..6bedf52 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
@@ -137,6 +137,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;
@@ -302,10 +306,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;
}
@@ -376,6 +380,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浠诲姟涓嬭浇宸茬粨鏉�
@@ -426,6 +440,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";
@@ -453,6 +468,14 @@
}
//淇濈暀涓や綅灏忔暟涓斿洓鑸嶄簲鍏�
d = d.setScale(4, 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;
}
@@ -920,7 +943,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