From fd3453d1d6cd98be518edf793d9db50c06c726b1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 05 一月 2024 08:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
index 22ac061..bcb0f8a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -30,6 +30,7 @@
public static final String HK_HTTPS ="HK_HTTPS" ;
public static final String HK_PUSH_URL = "HK_PUSH_URL";
public static final String HK_ROOTORG_CODE ="HK_ROOTORG_CODE" ;
+ public static final String HK_ROOTORG_NAME ="HK_ROOTORG_NAME" ;
//琚嫓璁夸汉淇℃伅鏍￠獙鏂瑰紡锛�0鎵嬫満鍙峰崟鐙牎楠� 1鎵嬫満鍙峰拰濮撳悕缁勫悎鏍￠獙锛�
public static final String BEVISITED_USER_VALID = "BEVISITED_USER_VALID";
@@ -62,18 +63,28 @@
public static final String ERP_USERSTATUS_RL ="ERP_USERSTATUS_RL" ;
public static final String ERP ="ERP" ;
public static final Integer THREE =3 ;
-
+ public static final Integer FOUR =4 ;
+ public static final String ORG_USER_ORIGIN = "ORG_USER_ORIGIN";
+ public static boolean DEALING_HK_SYNCPRIVILEGE= false;
+ public static boolean DEALING_HK_SYNCDEVICE = false;
+ public static boolean DEALING_HK_SYNCPARK = false;
public static boolean DEALING_HK_IMG = false;
public static boolean DEALING_HK_ORG = false;
public static boolean DEALING_HK_USER = false;
public static boolean DEALING_HK_VISIT = false;
public static boolean DEALING_HK_EMPOWER = false;
+ public static boolean DEALING_HK_EMPOWER_DETAIL = false;
+ public static boolean DEALING_HK_EMPOWER_RESULT = false;
+ public static boolean DEALING_HK_PARKBOOK = false;
// ERP鎺ュ彛閰嶇疆
public static final String ERP_CONFIG = "ERP_CONFIG";
// ERP ACCESS_KEY
public static final String ERP_ACCESS_KEY = "ERP_ACCESS_KEY";
// ERP ACCESS_SECRET
public static final String ERP_ACCESS_SECRET = "ERP_ACCESS_SECRET";
+
+ // 鍐呴儴浜哄憳鍐荤粨閰嶇疆鏃堕棿
+ public static final String TIMEOUT_FREEZE = "TIMEOUT_FREEZE";
// FTP鏂囦欢鏈嶅姟鍣ㄨ祫婧愯闂湴鍧�
@@ -165,6 +176,15 @@
int xfFail = 6;
int signout = 7;
}
+ public interface EmpowerStatus{
+ //涓�鍗￠�氭巿鏉冧笅鍙戠姸鎬� 0寰呬笅鍙� 1宸蹭笅鍙� 2涓嬪彂鎴愬姛 3宸插彇娑� 4涓嬪彂澶辫触 5浠诲姟涓嬭浇宸茬粨鏉�
+ int wait = 0;
+ int ing = 1;
+ int pass = 2;
+ int cancel = 3;
+ int fail = 4;
+ int downloaded = 5;
+ }
public interface DOOR_ROLE_TYPE{
int lw = 0;
int fk = 1;
@@ -195,6 +215,8 @@
public static final String WX_PLATFORM_ACCESS_TOKEN = "WX_PLATFORM_ACCESS_TOKEN";
public static final String WX_PLATFORM_APPID = "WX_PLATFORM_APPID";
public static final String WX_PLATFORM_SECRET = "WX_PLATFORM_SECRET";
+ public static final String WX_PLATFORM_AUDIT_VISIT = "WX_PLATFORM_AUDIT_VISIT";
+ public static final String WX_PLATFORM_PREFIX = "WX_PLATFORM_PREFIX";
@@ -282,7 +304,16 @@
/** 鐢ㄦ埛鍚敤绂佺敤鏋氫妇鍊�*/
ENABLE(0,"姝ｅ父"),
DISABLE(1,"绂佺敤"),
- FREEZE(2,"鎷夐粦/鍐荤粨");
+ FREEZE(2,"鎷夐粦/鍐荤粨"),
+
+ /** 鐢ㄦ埛绫诲瀷 **/
+ LW_FK(0,"鍔冲姟璁垮"),
+ PT_FK(1,"鏅�氳瀹�"),
+ NB_FK(2,"鍐呴儴浜哄憳"),
+
+ /** 杩涘満绫诲瀷 **/
+ OUT(0,"鍑�"),
+ IN(1,"杩�");
private Integer value;
private String des;
@@ -331,6 +362,5 @@
T reqJson = mapper.readValue(json, clazz);
return reqJson;
}
-
}
--
Gitblit v1.9.3