From efcdc8c49b0452d9c7f192ab351da09bf8aafc80 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 27 五月 2024 18:34:58 +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 |   65 ++++++++++++++++++++++++++++----
 1 files changed, 56 insertions(+), 9 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..9271ca9 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;
@@ -61,6 +66,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";
@@ -105,6 +118,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 +137,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 +298,16 @@
          int signout =  8;
          int invalid =9;
     }
+
+    public interface multifileObjType{
+        //0闅愭偅鐜板満鎯呭喌 1闅愭偅澶勭悊鍓嶆儏鍐� 2闅愭偅澶勭悊鍚庢儏鍐� 3闅愭偅閫�鍥炶鏄�
+        int zero = 0;
+        int one = 1;
+        int two = 2;
+        int three = 3;
+    }
+
+
     public interface EmpowerStatus{
         //涓�鍗¢�氭巿鏉冧笅鍙戠姸鎬� 0寰呬笅鍙� 1宸蹭笅鍙� 2涓嬪彂鎴愬姛   3宸插彇娑� 4涓嬪彂澶辫触 5浠诲姟涓嬭浇宸茬粨鏉�
          int wait = 0;
@@ -344,15 +386,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 +417,26 @@
 }
 
 
+public interface  approveObjectType{
+    int unConstructionVisit = 0;//闈炴柦宸ヤ汉鍛樿瀹㈢敵璇�
+    int constructionVisit = 1;//宸ヤ汉鍛樿瀹㈢敵璇�
+    int visitReporting = 2;//璁垮鎶ュ
+    int cityUseCar = 3;//甯傚唴鐢ㄨ溅
+    int unCityUseCar = 4;//甯傚鐢ㄨ溅
+    int logisticsCarUse = 5;//鐗╂祦杞﹂绾�
+
+}
+
+
+
 public interface  approveStatus{
     int wait = 0;//寰呭鎵�
     int auditIng = 1;//瀹℃壒涓�
     int pass = 2;//瀹℃壒閫氳繃
     int unPass = 3;//瀹℃壒鏈�氳繃
     int otherDeal = 4;//浠栦汉宸插鐞�
+    int cancel = 5;//宸插彇娑�
+    int otherUnPass = 6;//浠栦汉鎷掔粷
 }
 
     /**

--
Gitblit v1.9.3