From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 85 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 85 insertions(+), 0 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 83f3437..fb12ff8 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;
@@ -57,6 +58,8 @@
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鎵嬫満鍙峰拰濮撳悕缁勫悎鏍￠獙锛�
@@ -80,6 +83,8 @@
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";
@@ -147,6 +152,7 @@
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 boolean DEALING_HK_SYNCPRIVILEGE= false;
public static boolean DEALING_HK_SYNCDEVICE = false;
public static boolean DEALING_HK_SYNCPLATFORM = false;
@@ -197,6 +203,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.replace("${type}",paramCode.type+"").replace("${yw}",paramCode.yw).replace("${ywid}",ywid),"UTF-8");
+ }catch (Exception e){
+
+ }
+ return url;
+ }
+
public interface VisitIccmStatus{
//璁垮鐘舵��(0:鏈鍒�,1:宸茬鍒�,2:宸茬閫�,3:婊炵暀,4:鏈闂�,5:鑷姩绛剧,6:鏈閫�)
int waitSign = 0;
@@ -449,6 +473,7 @@
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;
@@ -1143,6 +1168,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