From 70577a6d6cf2bded29e71dcad11a0c2605193d20 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 10:32:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 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 3c51aa3..069a63f 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
@@ -44,6 +44,7 @@
public static final String FILE_DIR = "";
// 璁垮鏉ヨ閰嶇疆
public static final String VISIT_CONFIG = "VISIT_CONFIG";
+ public static final String MEMBER_IMG = "MEMBER_IMG";
// 鍔冲姟鏉ヨ閰嶇疆
public static final String LABOR_CONFIG = "LABOR_CONFIG";
public static final String VISIT_EVENT_IMG = "VISIT_EVENT_IMG";
@@ -54,13 +55,35 @@
public static final String FTP_PORT ="FTP_PORT" ;
public static final String FTP_USERNAME ="FTP_USERNAME" ;
public static final String FTP_PWD ="FTP_PWD" ;
+ public static final String FTP_RESOURCE_PATH ="FTP_RESOURCE_PATH" ;
+ public static final String ERP_ORGLIST_URL ="ERP_ORGLIST_URL" ;
+ public static final String ERP_USERLIST_URL ="ERP_USERLIST_URL" ;
+ public static final String ERP_APPROVE_URL ="ERP_APPROVE_URL" ;
+ public static final String ERP_USERSTATUS_RL ="ERP_USERSTATUS_RL" ;
+ public static final String ERP ="ERP" ;
+ public static final Integer THREE =3 ;
+ 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鏂囦欢鏈嶅姟鍣ㄨ祫婧愯闂湴鍧�
public static Date getBirthdyByCardNo(String idCard){
if(idCard ==null || idCard.length()<14){
@@ -72,10 +95,22 @@
try {
birthday = dateFormat.parse(birthdayString);
} catch (Exception e) {
- throw new RuntimeException(e);
+// throw new RuntimeException(e);
}
return birthday;
}
+ public static Integer getSexByCardNo(String idCard){
+ if(idCard ==null || idCard.length()<17){
+ return null;
+ }
+ String str = idCard.substring(16, 17); // 鎴彇韬唤璇佸彿鐨勫墠鍏綅鏁板瓧浣滀负鍑虹敓鏃ユ湡
+ try {
+ Integer num = Integer.parseInt(str);
+ return (num % 2 !=0) ? 1:2 ;
+ } catch (Exception e) {
+ }
+ return null;
+ }
/**
* 鍒ゆ柇鏄惁涓烘湁鏁堣溅鐗屽彿
@@ -137,6 +172,15 @@
int xfSuccess = 5;
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;
@@ -235,8 +279,8 @@
public interface memberType{
- int visitor = 0;//鏅�氳瀹�
- int lw_visitor = 1;//鍔冲姟璁垮
+ int lw_visitor = 0;//鍔冲姟璁垮
+ int visitor = 1;//鏅�氳瀹�
int internal = 2;//鍐呴儴浜哄憳
}
public static void main(String[] args) {
--
Gitblit v1.9.3