From 8ead63412bbda132ba9404583c1704121dfbcbaf Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期二, 10 十二月 2024 20:16:13 +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 | 69 ++++++++++++++++++++++++++++++++++ 1 files changed, 69 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..d6fb18f 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 @@ -57,6 +57,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 +82,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 +151,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 +202,18 @@ return sb.toString(); } + + /** + * 鑾峰彇鍏紬鍙疯烦杞噸瀹氬悜涓氬姟鍦板潃 + * @param code + * @param paramCode + * @param ywid + * @return + */ + public static String getWxUrl(String code, WxUrlParams paramCode, String ywid) { + return code.replace("${type}",paramCode.type+"").replace("${yw}",paramCode.yw).replace("${ywid}",ywid); + } + public interface VisitIccmStatus{ //璁垮鐘舵��(0:鏈鍒�,1:宸茬鍒�,2:宸茬閫�,3:婊炵暀,4:鏈闂�,5:鑷姩绛剧,6:鏈閫�) int waitSign = 0; @@ -449,6 +466,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 +1161,57 @@ } } + public enum WxUrlParams { + BISCREEN_CODE(0,0, "0", "闂ㄥ彛澶у睆浜岀淮鐮�"), + MEETING_CODE(1,1, "1","浼氳瀹ゅぇ灞�") + ; + // 鎴愬憳鍙橀噺 + private int key; + private int type;//鐢ㄦ埛绫诲瀷 0鍛樺伐 1鍙告満 + 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