From 34f587564c9a34515e7deda4dcd02eb748480e1f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 13 一月 2025 18:05:24 +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 | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 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 1abf3d0..9b6bc6d 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
@@ -1,28 +1,19 @@
package com.doumee.core.utils;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.doumee.core.model.LoginUserInfo;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-import io.swagger.models.auth.In;
-import org.apache.batik.util.Platform;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.util.CollectionUtils;
import java.io.IOException;
import java.math.BigDecimal;
-import java.net.URLDecoder;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Random;
-import java.util.*;
-import java.util.Date;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -140,18 +131,26 @@
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 WMS_LIQUID_LEVEL ="WMS_LIQUID_LEVEL" ;
+ public static final String WMS_PRESSURE_LEVEL ="WMS_PRESSURE_LEVEL" ;
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 final String SCREEN_SEVENT_ARRIVAL_STARTDATE = "SCREEN_SEVENT_ARRIVAL_STARTDATE";
+ public static final String EARLY_START_WX_NOTICE = "EARLY_START_WX_NOTICE";
+ public static final String OVER_NOTICE_WX = "OVER_NOTICE_WX";
+
public static boolean DEALING_HK_SYNCPRIVILEGE= false;
public static boolean DEALING_HK_SYNCDEVICE = false;
public static boolean DEALING_HK_SYNCPLATFORM = false;
@@ -211,7 +210,13 @@
* @return
*/
public static String getWxUrl(String code, WxUrlParams paramCode, String ywid) {
- return code.replace("${type}",paramCode.type+"").replace("${yw}",paramCode.yw).replace("${ywid}",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{
@@ -536,10 +541,15 @@
}
+ /**
+ * 杩愬崟浜嗗崟浣嶇被鍨� 0涓囨敮 1绠�
+ */
+ public static final int UNIT_TYPE =1;
public interface memberType{
int driver = 0;//鍙告満浜哄憳
int visitor = 1;//鏅�氳瀹�
int internal = 2;//鍐呴儴浜哄憳
+ int gkuser = 3;//绠℃帶浜哄憳锛堣繍鍗曟煡璇級
}
@@ -985,7 +995,7 @@
WAIT_CALL(2, "宸茬鍒�","宸茬鍒�"),
IN_WAIT(3, "鍏ュ洯绛夊緟","鍏ュ洯绛夊緟" ),
CALLED(4, "宸插彨鍙�","宸插彨鍙�" ),
- WORKING(5, "浣滀笟涓�","浣滀笟涓�" ),
+ WORKING(5, "浣滀笟涓�","浣滀笟涓�" ),
DONE(6, "浣滀笟瀹屾垚 ","浣滀笟瀹屾垚" ),
TRANSFERING(7, "杞Щ涓�","杞Щ涓�" ),
EXCEPTION(8, "寮傚父鎸傝捣","寮傚父鎸傝捣" ),
@@ -1162,8 +1172,8 @@
}
public enum WxUrlParams {
- BISCREEN_CODE(0,2, "0", "闂ㄥ彛澶у睆浜岀淮鐮�"),
- MEETING_CODE(1,0, "1","浼氳瀹ゅぇ灞�"),
+ 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","璁垮鎶ュ璁板綍-鍛樺伐"),
@@ -1173,11 +1183,10 @@
PLATFORM_BOOK_DRIVER(9,0, "7","鐗╂祦杞﹂绾�-鍙告満"),
PLATFORM_BOOK(10,2, "7","鐗╂祦杞﹂绾�-鍛樺伐"),
PLATFORM_JOB_DRIVER(11,0, "8","鏈堝彴浣滀笟-鍙告満"),
- PLATFORM_JOB_BOOK(12,2, "8","鏈堝彴浣滀笟-鍛樺伐"),
;
// 鎴愬憳鍙橀噺
private int key;
- private int type;//鐢ㄦ埛绫诲瀷 0鍙告満 1璁垮 2鍛樺伐
+ private int type;//鐢ㄦ埛绫诲瀷 0鍙告満 1璁垮 2鍛樺伐
private String yw;//涓氬姟绫诲瀷
private String info;//璇存槑
--
Gitblit v1.9.3