From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 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 d89fc2d..6ba808c 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
@@ -25,6 +25,7 @@
public class Constants {
public static final String HEADER_USER_TOKEN = "dm_user_token";
public static final String REDIS_TOKEN_KEY = "token_";
+ public static final String REDIS_HK_TOKEN_KEY = "hk_token_";
public static final String[] ALL_SPELL_LIST_FIRST = new String[]{"A", "B", "C", "D", "E", "F", "G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"};
public static final int ZERO = 0 ;
public static final int ONE = 1 ;
@@ -102,7 +103,7 @@
public static final String HIDDEN_DANGER_FILE = "HIDDEN_DANGER_FILE";
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 boolean DEALING_HK_SYNCPRIVILEGE= false;
public static boolean DEALING_HK_SYNCDEVICE = false;
public static boolean DEALING_HK_SYNCDEVICE_STATUS = false;
@@ -416,9 +417,35 @@
int cityUseCar = 3;//甯傚唴鐢ㄨ溅
int unCityUseCar = 4;//甯傚鐢ㄨ溅
int logisticsCarUse = 5;//鐗╂祦杞﹂绾�
+}
+
+
+
+public static Integer approveTypeToNoticeType(Integer approveType){
+ if(Constants.equalsInteger(approveType,Constants.approveObjectType.unConstructionVisit)
+ ||Constants.equalsInteger(approveType,Constants.approveObjectType.constructionVisit)){
+ return Constants.noticesObjectType.visit;
+ }else if(Constants.equalsInteger(approveType,Constants.approveObjectType.visitReporting)){
+ return Constants.noticesObjectType.visitReporting;
+ }else if(Constants.equalsInteger(approveType,Constants.approveObjectType.cityUseCar)
+ ||Constants.equalsInteger(approveType,Constants.approveObjectType.unCityUseCar)){
+ return Constants.noticesObjectType.useCar;
+ }else {
+ return Constants.noticesObjectType.system;
+ }
}
+
+
+ public interface noticesObjectType{
+ int visit = 0;//璁垮鐢宠
+ int visitReporting = 1;//璁垮鎶ュ
+ int useCar = 2;//鐢ㄨ溅鐢宠
+ int dangerDeal = 3;//闅愭偅澶勭悊
+ int logisticsCarUse = 4;//鐗╂祦杞﹀鎵�
+ int system = 5;//绯荤粺娑堟伅
+}
public interface approveStatus{
@@ -426,8 +453,8 @@
int auditIng = 1;//瀹℃壒涓�
int pass = 2;//瀹℃壒閫氳繃
int unPass = 3;//瀹℃壒鏈�氳繃
- int otherDeal = 4;//浠栦汉宸插鐞�
- int cancel = 5;//宸插彇娑�
+ int cancel = 4;//宸插彇娑�
+ int otherDeal = 5;//浠栦汉宸插鐞�
int otherUnPass = 6;//浠栦汉鎷掔粷
}
@@ -568,6 +595,8 @@
return reqJson;
}
+
+
public enum NoticeType {
ZERO(0, "寰呭鏍�","","","寰呭鏍�","寰呭鐞�","澶勭悊涓�"),
--
Gitblit v1.9.3