From 5dd6f6e8db684e7dba19fd2ee7bce858f9f14485 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 29 八月 2024 09:02:57 +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 | 92 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 90 insertions(+), 2 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..69bfdaa 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;
@@ -149,6 +155,7 @@
public static final String TIMEOUT_WARNING = "TIMEOUT_WARNING";
// FTP鏂囦欢鏈嶅姟鍣ㄨ祫婧愯闂湴鍧�
+
public static String getRandom6Num( ) {
Random random = new Random();
StringBuilder sb = new StringBuilder();
@@ -160,7 +167,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 +456,7 @@
int cityUseCar = 3;//甯傚唴鐢ㄨ溅
int unCityUseCar = 4;//甯傚鐢ㄨ溅
int logisticsCarUse = 5;//鐗╂祦杞﹂绾�
+ int reason = 6;//鍏ュ洯鍘熷洜
}
@@ -453,6 +470,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 +489,7 @@
int dangerDeal = 3;//闅愭偅澶勭悊
int logisticsCarUse = 4;//鐗╂祦杞﹀鎵�
int system = 5;//绯荤粺娑堟伅
+ int reason = 6;//鍏ュ洯鍘熷洜
}
@@ -721,6 +743,69 @@
/**
* 鏈堝彴浣滀笟 鐘舵��
+ * 0浠诲姟鍒涘缓 1鍙告満纭浠诲姟 2鍙告満绛惧埌 3鍏ュ洯绛夊緟 4鏈堝彴鍙彿 5寮�濮嬩綔涓� 6浣滀笟瀹屾垚 7鏈堝彴杞Щ 8浠诲姟鎸傝捣 9涓嬪彂鎺堟潈绂诲洯 10绂诲洯
+ */
+ public enum PlatformJobLogType {
+ CREATE(0, "浠诲姟鍒涘缓","浠诲姟鍒涘缓" ),
+ CONFIRM_TASK(1, "鍙告満纭浠诲姟","鍙告満纭浠诲姟" ),
+ SIGN(2, "鍙告満绛惧埌","鍙告満绛惧埌"),
+ IN_WAIT(3, "鍏ュ洯绛夊緟","鍏ュ洯绛夊緟" ),
+ CALLED(4, "鏈堝彴鍙彿","鏈堝彴鍙彿" ),
+ WORKING(5, "寮�濮嬩綔涓�","寮�濮嬩綔涓�" ),
+ DONE(6, "浣滀笟瀹屾垚 ","浣滀笟瀹屾垚 " ),
+ TRANSFERING(7, "鏈堝彴杞Щ","鏈堝彴杞Щ" ),
+ EXCEPTION(8, "浠诲姟鎸傝捣","浠诲姟鎸傝捣" ),
+ AUTHED_LEAVE(9, "涓嬪彂鎺堟潈绂诲洯","涓嬪彂鎺堟潈绂诲洯" ),
+ LEAVED(10, "宸茬鍥� ","宸茬鍥� " ),
+ ;
+
+ // 鎴愬憳鍙橀噺
+ private int key;
+ private String name;
+ private String info;
+
+ // 鏋勯�犳柟娉�
+ PlatformJobLogType(int key, String name,String info ) {
+ this.key = key;
+ this.info = info;
+ this.name = name;
+ }
+ public static String getName(int index) {
+ for (PlatformJobLogType c : PlatformJobLogType.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+ }
+
+ /**
+ * 鏈堝彴浣滀笟 鐘舵��
* 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙�
*/
public enum PlatformJobStatus {
@@ -792,6 +877,7 @@
IN_CITY_CAR_USE(3, "鍏溅甯傚唴鐢ㄨ溅 ", "鍏溅甯傚唴鐢ㄨ溅 "),
OUT_CITY_CAR_USE(4, "鍏溅瀹ゅ鐢ㄨ溅 ", "鍏溅瀹ゅ鐢ㄨ溅 "),
CITY_WLC_BOOK(5, "甯傚叕鍙哥墿娴佽溅棰勭害 ", "5甯傚叕鍙哥墿娴佽溅棰勭害 "),
+ PLATFROM_REASON(6, "鏈堝彴鍏ュ洯鍘熷洜瀹℃壒 ", "鏈堝彴鍏ュ洯鍘熷洜瀹℃壒 "),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -909,6 +995,8 @@
T reqJson = mapper.readValue(json, clazz);
return reqJson;
}
+
+
/**
* 鍛樺伐淇℃伅缁存姢鎿嶄綔鍘嗗彶绫诲瀷 0瑙ｅ喕 1鍐荤粨 2鎷夐粦 3鎭㈠ 4璁句负鎷滆浜� 5鍙栨秷鎷滆浜� 6璁句负楂樼骇瀹℃壒浜� 7鍙栨秷楂樼骇瀹℃壒浜� 8鎵嬪姩绂诲満 9鍒犻櫎 10鏇存柊 11鎺堟潈闂ㄧ鏉冮檺 12绂昏亴 13鎭㈠鍦ㄨ亴
*/
--
Gitblit v1.9.3