From 42f57295f5fe64132c11a25f55cd25c3c8acf167 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 28 八月 2024 15:35:55 +0800 Subject: [PATCH] 最新版本 --- 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 90cea78..7d0eb08 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,12 +1,16 @@ 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 org.apache.commons.collections4.CollectionUtils; +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; @@ -112,6 +116,8 @@ public static final String LOG_DEL_DAYS_LIMIT ="LOG_DEL_DAYS_LIMIT" ; public static final String HK_LOG_DEL_DAYS_LIMIT ="HK_LOG_DEL_DAYS_LIMIT" ; 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 boolean DEALING_HK_SYNCPRIVILEGE= false; public static boolean DEALING_HK_SYNCDEVICE = false; public static boolean DEALING_HK_SYNCPLATFORM = false; @@ -148,7 +154,6 @@ // 瓒呮椂棰勮閰嶇疆 public static final String TIMEOUT_WARNING = "TIMEOUT_WARNING"; // FTP鏂囦欢鏈嶅姟鍣ㄨ祫婧愯闂湴鍧� - public static String getRandom6Num( ) { Random random = new Random(); StringBuilder sb = new StringBuilder(); @@ -160,7 +165,16 @@ return sb.toString(); } - + public interface VisitIccmStatus{ + //璁垮鐘舵��(0:鏈鍒�,1:宸茬鍒�,2:宸茬閫�,3:婊炵暀,4:鏈闂�,5:鑷姩绛剧,6:鏈閫�) + int waitSign = 0; + int signin= 1; + int signout = 2; + int noleave =3; + int novisit =4; + int autoOut =5; + int noSignout =6; + } public interface DATAPERMISSION_TYPE{ public static final int all = 0; public static final int departAndChild = 1; @@ -440,6 +454,7 @@ int cityUseCar = 3;//甯傚唴鐢ㄨ溅 int unCityUseCar = 4;//甯傚鐢ㄨ溅 int logisticsCarUse = 5;//鐗╂祦杞﹂绾� + int reason = 6;//鍏ュ洯鍘熷洜 } @@ -453,6 +468,10 @@ }else if(Constants.equalsInteger(approveType,Constants.approveObjectType.cityUseCar) ||Constants.equalsInteger(approveType,Constants.approveObjectType.unCityUseCar)){ return Constants.noticesObjectType.useCar; + }else if(Constants.equalsInteger(approveType,Constants.approveObjectType.logisticsCarUse)){ + return Constants.noticesObjectType.logisticsCarUse; + }else if(Constants.equalsInteger(approveType, approveObjectType.reason)){ + return noticesObjectType.reason; }else { return Constants.noticesObjectType.system; } @@ -468,6 +487,7 @@ int dangerDeal = 3;//闅愭偅澶勭悊 int logisticsCarUse = 4;//鐗╂祦杞﹀鎵� int system = 5;//绯荤粺娑堟伅 + int reason = 6;//鍏ュ洯鍘熷洜 } @@ -792,6 +812,7 @@ IN_CITY_CAR_USE(3, "鍏溅甯傚唴鐢ㄨ溅 ", "鍏溅甯傚唴鐢ㄨ溅 "), OUT_CITY_CAR_USE(4, "鍏溅瀹ゅ鐢ㄨ溅 ", "鍏溅瀹ゅ鐢ㄨ溅 "), CITY_WLC_BOOK(5, "甯傚叕鍙哥墿娴佽溅棰勭害 ", "5甯傚叕鍙哥墿娴佽溅棰勭害 "), + PLATFROM_REASON(6, "鏈堝彴鍏ュ洯鍘熷洜瀹℃壒 ", "鏈堝彴鍏ュ洯鍘熷洜瀹℃壒 "), ; // 鎴愬憳鍙橀噺 private String name; @@ -909,6 +930,8 @@ T reqJson = mapper.readValue(json, clazz); return reqJson; } + + /** * 鍛樺伐淇℃伅缁存姢鎿嶄綔鍘嗗彶绫诲瀷 0瑙e喕 1鍐荤粨 2鎷夐粦 3鎭㈠ 4璁句负鎷滆浜� 5鍙栨秷鎷滆浜� 6璁句负楂樼骇瀹℃壒浜� 7鍙栨秷楂樼骇瀹℃壒浜� 8鎵嬪姩绂诲満 9鍒犻櫎 10鏇存柊 11鎺堟潈闂ㄧ鏉冮檺 12绂昏亴 13鎭㈠鍦ㄨ亴 */ -- Gitblit v1.9.3