From 04bf59bbc3fad774c57a2ee5ebf07db24b476bf2 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 17 十二月 2024 17:43:14 +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 | 259 +++++++++++++++++++++++++++++----------------------
1 files changed, 148 insertions(+), 111 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 dd26eaf..69ed8e8 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
@@ -15,6 +15,7 @@
import java.io.IOException;
import java.math.BigDecimal;
import java.net.URLDecoder;
+import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -39,18 +40,26 @@
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" ;
public static final String SIGN_IN_PLACE_DISTANCE ="SIGN_IN_PLACE_DISTANCE" ;
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" ;
//琚嫓璁夸汉淇℃伅鏍￠獙鏂瑰紡锛�0鎵嬫満鍙峰崟鐙牎楠� 1鎵嬫満鍙峰拰濮撳悕缁勫悎鏍￠獙锛�
@@ -73,6 +82,10 @@
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 VISIT_REPORT_TIME_OUT_MOBILE = "VISIT_REPORT_TIME_OUT_MOBILE";
+ public static final String VISIT_TIME_OUT_MOBILE = "VISIT_TIME_OUT_MOBILE";
+
//鍋ュ悍璇侀厤缃�
public static final String LW_HEALTH_CARD = "LW_HEALTH_CARD";
public static final String HEALTH_CARD = "HEALTH_CARD";
@@ -102,6 +115,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" ;
@@ -122,15 +136,25 @@
public static final String HK_NGINX_URL = "HK_NGINX_URL";
public static final String PLATFORM_BOOKING_TIPS = "PLATFORM_BOOKING_TIPS";
public static final String PLATFORM_GUIDEMAP = "PLATFORM_GUIDEMAP";
- public static final String WSM_PARAM ="WSM_PARAM" ;
+ public static final String WMS_PARAM ="WMS_PARAM" ;
public static final String WMS_INBOUND_PLATFROM_URL ="WMS_INBOUND_PLATFROM_URL" ;
public static final String WMS_GET_INVENTORYLIST_URL ="WMS_GET_INVENTORYLIST_URL" ;
public static final String WMS_OUTBOUND_PLATFROM_URL ="WMS_OUTBOUND_PLATFROM_URL" ;
public static final String TSM_PARAM ="TSM_PARAM" ;
- public static final String TMS_ORDER_LIST_URL ="TMS_ORDER_LIST_URL" ;
- 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 final String TEMPERATURE_HUMIDITY ="TEMPERATURE_HUMIDITY" ;
+
+ public static final String HK_WXTOKEN_CONFIGID ="HK_WXTOKEN_CONFIGID" ;
+ public static final String HK_WXTOKEN_TAGID ="HK_WXTOKEN_TAGID" ;
+ public static final String WMS_TOTAL_STOCK_NUM ="WMS_TOTAL_STOCK_NUM" ;
+ public static final String WX_REDIRECT_URL = "WX_REDIRECT_URL";
+ public static final String HK_CHANGNEI_SCREEN_INDEXCODES = "HK_CHANGNEI_SCREEN_INDEXCODES";
+ public static final String CITY_XH_REASON_ID ="CITY_XH_REASON_ID" ;
+ public static final String ATWL_XH_PLATFORM_ID ="ATWL_XH_PLATFORM_ID" ;
public static boolean DEALING_HK_SYNCPRIVILEGE= false;
public static boolean DEALING_HK_SYNCDEVICE = false;
public static boolean DEALING_HK_SYNCPLATFORM = false;
@@ -143,6 +167,7 @@
public static boolean DEALING_HK_DEL_USER = false;
public static boolean DEALING_HK_VISIT = false;
public static boolean DEALING_HK_VISIT_EXPIRE = false;
+ 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_HK_EMPOWER_DETAIL = false;
@@ -180,6 +205,24 @@
return sb.toString();
}
+
+ /**
+ * 鑾峰彇鍏紬鍙疯烦杞噸瀹氬悜涓氬姟鍦板潃
+ * @param code
+ * @param paramCode
+ * @param ywid
+ * @return
+ */
+ public static String getWxUrl(String code, WxUrlParams paramCode, String ywid) {
+ String url = code.replace("${type}",paramCode.type+"").replace("${yw}",paramCode.yw).replace("${ywid}",ywid);
+// try {
+// url = URLEncoder.encode(code,"UTF-8");
+// }catch (Exception e){
+//
+// }
+ return url;
+ }
+
public interface VisitIccmStatus{
//璁垮鐘舵��(0:鏈鍒�,1:宸茬鍒�,2:宸茬閫�,3:婊炵暀,4:鏈闂�,5:鑷姩绛剧,6:鏈閫�)
int waitSign = 0;
@@ -238,6 +281,7 @@
return null;
}
+
/**
* 鍒ゆ柇鏄惁涓烘湁鏁堣溅鐗屽彿
*/
@@ -295,10 +339,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;
}
@@ -369,6 +413,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浠诲姟涓嬭浇宸茬粨鏉�
@@ -419,7 +473,10 @@
public interface RedisKeys {
+ public static final String IMPORTING_CARS ="IMPORTING_CARS";
public static final String IMPORTING_MEMBER ="IMPORTING_MEMBER";
+ 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 long EXPIRE_TIME = 7200;
@@ -445,6 +502,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;
}
@@ -520,6 +593,7 @@
int logisticsCarUse = 4;//鐗╂祦杞﹀鎵�
int system = 5;//绯荤粺娑堟伅
int reason = 6;//鍏ュ洯鍘熷洜
+ int hknotice = 7;//娴峰悍鑰冨嫟浠ｅ姙
}
@@ -601,8 +675,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());
@@ -671,105 +745,6 @@
return reqJson;
}
-
- public enum NoticeType {
-
- ZERO(0, "寰呭鏍�","","","寰呭鏍�","寰呭鐞�","澶勭悊涓�"),
- ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","宸茬粨妗�"),
- TWO(2, "寰呭嚭鍗�","寰呭鏍�","寰呭鏍�","","",""),
- THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","",""),
- FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","","宸叉挙閿�"),
- FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","",""),
- //缁繚閫氱煡
- SIX(6, "","","","","",""),
- //鍟嗘埛绔� 濮旀墭淇� - 鎶曚繚寰呭鏍� 鍔犲噺淇� 鎹㈠巶 寰呭鏍�
- SEVEN(7, "寰呭鏍�","寰呭鏍�","寰呭鏍�","","",""),
- EIGHT(8, "","","","","",""),
- NINE(9, "","","","","",""),
- ;
-
- // 鎴愬憳鍙橀噺
- private int status;
- private String insuranceApplyDetail;
- private String applyChangeDetail;
- private String changeFactoryDetail;
- private String dispatchUnitDetail;
- private String taxesDetail;
- private String settleClaimsDetail;
-
- // 鏋勯�犳柟娉�
- NoticeType(int status, String insuranceApplyDetail,String applyChangeDetail
- , String changeFactoryDetail,String dispatchUnitDetail
- , String taxesDetail,String settleClaimsDetail) {
- this.status = status;
- this.insuranceApplyDetail = insuranceApplyDetail;
- this.applyChangeDetail = applyChangeDetail;
- this.changeFactoryDetail = changeFactoryDetail;
- this.dispatchUnitDetail = dispatchUnitDetail;
- this.taxesDetail = taxesDetail;
- this.settleClaimsDetail = settleClaimsDetail;
- }
-
-
- // get set 鏂规硶
- public int getStatus() {
- return status;
- }
-
- public void setStatus(int status) {
- this.status = status;
- }
-
- public String getInsuranceApplyDetail() {
- return insuranceApplyDetail;
- }
-
- public void setInsuranceApplyDetail(String name) {
- this.insuranceApplyDetail = insuranceApplyDetail;
- }
-
- public String getApplyChangeDetail() {
- return applyChangeDetail;
- }
-
- public void setApplyChangeDetail(String info) {
- this.applyChangeDetail = applyChangeDetail;
- }
-
- public String getChangeFactoryDetail() {
- return changeFactoryDetail;
- }
-
- public void setChangeFactoryDetail(String info) {
- this.changeFactoryDetail = changeFactoryDetail;
- }
-
- public String getDispatchUnitDetail() {
- return dispatchUnitDetail;
- }
-
- public void setDispatchUnitDetail(String info) {
- this.dispatchUnitDetail = dispatchUnitDetail;
- }
-
- public String getTaxesDetail() {
- return taxesDetail;
- }
-
- public void setTaxesDetail(String info) {
- this.taxesDetail = taxesDetail;
- }
-
- public String getSettleClaimsDetail() {
- return settleClaimsDetail;
- }
-
- public void setSettleClaimsDetail(String info) {
- this.settleClaimsDetail = settleClaimsDetail;
- }
-
-
- }
public enum PlatformWarnEvent {
STOP_TIMEOUT(0, "鍋滈潬瓒呮椂","${carCode}鏈堝彴鍋滈潬瓒呮椂" ),
@@ -894,12 +869,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} 浣滀笟瀹屾垚" ),
;
// 鎴愬憳鍙橀噺
@@ -958,7 +934,7 @@
CALLING(1, "鍙彿涓�","${param}璇峰墠寰�${param2}绛夊緟浣滀笟"),
DONE(2, "浣滀笟瀹屾垚","${param}浣滀笟瀹屾垚锛岃灏藉揩椹剁" ),
WRONG_IN(3, "閿欒鍋滈潬","${param}鏈堝彴鍋滈潬閿欒锛岃灏藉揩椹剁" ),
- TIMEOUT_IN(4, "瓒呮椂鍋滈潬","${param}鏈堝彴鍋滈潬瓒呮椂锛岃灏藉揩椹剁璇峰敖蹇┒绂�" ),
+ TIMEOUT_IN(4, "瓒呮椂鍋滈潬","${param}鏈堝彴鍋滈潬瓒呮椂锛岃灏藉揩椹剁" ),
TIMEOUT_WORK(5, "浣滀笟瓒呮椂","${param}浣滀笟瓒呮椂" ),
;
@@ -973,6 +949,7 @@
this.info = info;
this.name = name;
}
+
public static String getName(int index) {
for (PlatformBroadcastContent c : PlatformBroadcastContent.values()) {
if (c.getKey() == index) {
@@ -1009,7 +986,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, "寰呯‘璁�","寰呯‘璁�" ),
@@ -1017,7 +994,7 @@
WAIT_CALL(2, "宸茬鍒�","宸茬鍒�"),
IN_WAIT(3, "鍏ュ洯绛夊緟","鍏ュ洯绛夊緟" ),
CALLED(4, "宸插彨鍙�","宸插彨鍙�" ),
- WORKING(5, "浣滀笟涓�","浣滀笟涓�" ),
+ WORKING(5, "浣滀笟涓�","浣滀笟涓�" ),
DONE(6, "浣滀笟瀹屾垚 ","浣滀笟瀹屾垚" ),
TRANSFERING(7, "杞Щ涓�","杞Щ涓�" ),
EXCEPTION(8, "寮傚父鎸傝捣","寮傚父鎸傝捣" ),
@@ -1193,6 +1170,66 @@
}
}
+ public enum WxUrlParams {
+ BISCREEN_CODE(0,0, "0", "闂ㄥ彛澶у睆浜岀淮鐮�"),
+ MEETING_CODE(1,2, "1","浼氳瀹ゅぇ灞�"),
+ VISIT_RECORD_VISIT(2,1, "2","璁垮璁板綍-璁垮"),
+ VISIT_RECORD_USER(3,2, "2","璁垮璁板綍-鍛樺伐"),
+ VISIT_REPORT_RECORD_USER(5,2, "3","璁垮鎶ュ璁板綍-鍛樺伐"),
+ HIDDEN_DANGER(6,2, "4","闅愭偅闅忔墜鎷�"),
+ CAR_USE(7,2, "5","鐢ㄨ溅鐢宠"),
+ MEETING(8,2, "6","浼氳璇︽儏"),
+ PLATFORM_BOOK_DRIVER(9,0, "7","鐗╂祦杞﹂绾�-鍙告満"),
+ PLATFORM_BOOK(10,2, "7","鐗╂祦杞﹂绾�-鍛樺伐"),
+ PLATFORM_JOB_DRIVER(11,0, "8","鏈堝彴浣滀笟-鍙告満"),
+ ;
+ // 鎴愬憳鍙橀噺
+ private int key;
+ private int type;//鐢ㄦ埛绫诲瀷 0鍙告満 1璁垮 2鍛樺伐
+ private String yw;//涓氬姟绫诲瀷
+ private String info;//璇存槑
+
+ // 鏋勯�犳柟娉�
+ WxUrlParams(int key,int type, String yw,String info) {
+ this.yw = yw;
+ this.key = key;
+ this.type = type;
+ this.info= info;
+ }
+
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ public int getType() {
+ return type;
+ }
+
+ public void setType(int type) {
+ this.type = type;
+ }
+
+ public String getYw() {
+ return yw;
+ }
+
+ public void setYw(String yw) {
+ this.yw = yw;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+ }
public static <T> T toSnakeObject(String json, Class<T> clazz) throws IOException {
ObjectMapper mapper = new ObjectMapper();
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
--
Gitblit v1.9.3