From 83c7cfa4ecd5d59106b09efff26be43141e38386 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 21 十二月 2023 09:10:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java | 40 +++++++++++++++++++++++++++++++++++----- 1 files changed, 35 insertions(+), 5 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 69242b4..e1ea0ee 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 @@ -61,8 +61,18 @@ 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 @@ -71,7 +81,6 @@ public static final String ERP_ACCESS_SECRET = "ERP_ACCESS_SECRET"; // FTP鏂囦欢鏈嶅姟鍣ㄨ祫婧愯闂湴鍧� - public static final String FTP_RESOURCE_PATH = "FTP_RESOURCE_PATH"; public static Date getBirthdyByCardNo(String idCard){ if(idCard ==null || idCard.length()<14){ @@ -83,10 +92,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; + } /** * 鍒ゆ柇鏄惁涓烘湁鏁堣溅鐗屽彿 @@ -148,6 +169,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; @@ -246,8 +276,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