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 | 90 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 79 insertions(+), 11 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 b6d0e88..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
@@ -12,6 +12,11 @@
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;
@@ -20,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 ;
@@ -61,6 +67,14 @@
//绛旈涓婚
public static final String LW_THEME = "LW_THEME";
public static final String THEME = "THEME";
+ //涓婁笅鐝� 闂撮殧鏃堕棿
+ public static final String WORK_START = "WORK_START";
+ public static final String WORK_END = "WORK_END";
+ public static final String INTERVAL = "INTERVAL";
+ public static final String USE_CAR_TAKE_CARE = "USE_CAR_TAKE_CARE";
+
+
+
// 鍔冲姟鏉ヨ閰嶇疆
public static final String LABOR_CONFIG = "LABOR_CONFIG";
@@ -89,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;
@@ -105,6 +119,12 @@
public static boolean DEALING_HK_EMPOWER_DETAIL = false;
public static boolean DEALING_HK_EMPOWER_RESULT = false;
public static boolean DEALING_HK_PARKBOOK = false;
+ public static final String SMS ="SMS" ;
+ public static final String SMS_COMNAME = "SMS_COMNAME";
+ public static final String SMS_IP ="SMS_IP" ;
+ public static final String SMS_PORT ="SMS_PORT" ;
+ public static final String SMS_APPKEY="SMS_APPKEY";
+ public static final String SMS_APPSECRET ="SMS_APPSERECT" ;
// ERP鎺ュ彛閰嶇疆
public static final String ERP_CONFIG = "ERP_CONFIG";
// ERP ACCESS_KEY
@@ -118,6 +138,19 @@
// 瓒呮椂棰勮閰嶇疆
public static final String TIMEOUT_WARNING = "TIMEOUT_WARNING";
// FTP鏂囦欢鏈嶅姟鍣ㄨ祫婧愯闂湴鍧�
+
+ public static String getRandom6Num( ) {
+ Random random = new Random();
+ StringBuilder sb = new StringBuilder();
+
+ for (int i = 0; i < 6; i++) {
+ int digit = random.nextInt(10);
+ sb.append(digit);
+ }
+
+ return sb.toString();
+ }
+
public interface DATAPERMISSION_TYPE{
public static final int all = 0;
public static final int departAndChild = 1;
@@ -266,6 +299,8 @@
int signout = 8;
int invalid =9;
}
+
+
public interface EmpowerStatus{
//涓�鍗￠�氭巿鏉冧笅鍙戠姸鎬� 0寰呬笅鍙� 1宸蹭笅鍙� 2涓嬪彂鎴愬姛 3宸插彇娑� 4涓嬪彂澶辫触 5浠诲姟涓嬭浇宸茬粨鏉�
int wait = 0;
@@ -344,15 +379,6 @@
return d;
}
- public static boolean equalsObject(Object a, Object b) {
- if (a == null && b == null) {
- return true;
- }
- if (a != null){
- return a.equals(b);
- }
- return false;
- }
public static boolean equalsInteger(Integer a, Integer b) {
@@ -384,12 +410,52 @@
}
+public interface approveObjectType{
+ int unConstructionVisit = 0;//闈炴柦宸ヤ汉鍛樿瀹㈢敵璇�
+ int constructionVisit = 1;//宸ヤ汉鍛樿瀹㈢敵璇�
+ int visitReporting = 2;//璁垮鎶ュ
+ 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{
int wait = 0;//寰呭鎵�
int auditIng = 1;//瀹℃壒涓�
int pass = 2;//瀹℃壒閫氳繃
int unPass = 3;//瀹℃壒鏈�氳繃
- int otherDeal = 4;//浠栦汉宸插鐞�
+ int cancel = 4;//宸插彇娑�
+ int otherDeal = 5;//浠栦汉宸插鐞�
+ int otherUnPass = 6;//浠栦汉鎷掔粷
}
/**
@@ -529,6 +595,8 @@
return reqJson;
}
+
+
public enum NoticeType {
ZERO(0, "寰呭鏍�","","","寰呭鏍�","寰呭鐞�","澶勭悊涓�"),
--
Gitblit v1.9.3