From 6765787baa5e0b771d71f865c4deb776367410c4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 13 八月 2024 13:38:19 +0800
Subject: [PATCH] 修复bug
---
server/dmvisit_service/src/main/java/com/doumee/core/utils/Constants.java | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 215 insertions(+), 13 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..f265a0d 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,9 +30,11 @@
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";
+ public static final String LW_BEVISITED_USER_VALID = "LW_BEVISITED_USER_VALID";
public static final String SELECT_DOORS_VISIT_REQUIRED = "SELECT_DOORS_VISIT_REQUIRED";
public static final String SELECT_DOORS_LW_REQUIRED = "SELECT_DOORS_LW_REQUIRED";
public static final String PROBLEM_LW_REQUIRED = "PROBLEM_LW_REQUIRED";
@@ -42,8 +44,23 @@
public static final String EDS_PWD ="!@#$%^&QWERTY" ;
public static final String ROOT_PATH = "";
public static final String FILE_DIR = "";
+ public static final String INITIAL_PASSWORD = "INITIAL_PASSWORD";
+ public static final String VALIDATE_VISIT = "VALIDATE_VISIT";
+
// 璁垮鏉ヨ閰嶇疆
public static final String VISIT_CONFIG = "VISIT_CONFIG";
+ public static final String MEMBER_IMG = "MEMBER_IMG";
+ public static final String VISIT_NOTICE = "VISIT_NOTICE";
+ //鍋ュ悍璇侀厤缃�
+ public static final String LW_HEALTH_CARD = "LW_HEALTH_CARD";
+ public static final String HEALTH_CARD = "HEALTH_CARD";
+ //绛旈璇存槑
+ public static final String LW_DESCRIPTION = "LW_DESCRIPTION";
+ public static final String DESCRIPTION = "DESCRIPTION";
+ //绛旈涓婚
+ public static final String LW_THEME = "LW_THEME";
+ public static final String THEME = "THEME";
+
// 鍔冲姟鏉ヨ閰嶇疆
public static final String LABOR_CONFIG = "LABOR_CONFIG";
public static final String VISIT_EVENT_IMG = "VISIT_EVENT_IMG";
@@ -54,13 +71,45 @@
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 final Integer FOUR =4 ;
+ public static final String ORG_USER_ORIGIN = "ORG_USER_ORIGIN";
+ public static final String VIRTUAL_CARD_INDEX = "02098469790";
+ public static final String RETRY_CONNECT_NUM ="RETRY_CONNECT_NUM" ;
+ public static boolean DEALING_HK_SYNCPRIVILEGE= false;
+ public static boolean DEALING_HK_SYNCDEVICE = false;
+ public static boolean DEALING_HK_SYNCDEVICE_STATUS = 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_DEL_USER = false;
+ public static boolean DEALING_HK_VISIT = false;
+ public static boolean DEALING_HK_VISIT_EXPIRE = false;
+ public static boolean DEALING_FROM_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";
+
+ // 瓒呮椂棰勮閰嶇疆
+ public static final String TIMEOUT_WARNING = "TIMEOUT_WARNING";
+ // FTP鏂囦欢鏈嶅姟鍣ㄨ祫婧愯闂湴鍧�
public static Date getBirthdyByCardNo(String idCard){
if(idCard ==null || idCard.length()<14){
@@ -72,19 +121,48 @@
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;
+ }
/**
* 鍒ゆ柇鏄惁涓烘湁鏁堣溅鐗屽彿
*/
public static boolean checkCarNo(String str) {
- String patt="^[浜触娌唨鏅嬭窘鍚夐粦鑻忔禉鐨栭椊璧ｉ瞾璞剛婀樼菠妗傜惣宸濋粩浜戞笣钘忛檿闄囬潚瀹佹柊闂界菠鏅嬬惣浣块A_Z]{1}[A_Z]{1}[A-Z0-9]{4}[A-Z0-9鎸傚璀︽腐婢砞{1}$";
- Pattern r = Pattern.compile(patt);
- Matcher matcher = r.matcher(str);
- return matcher.find();
+// String patt="^[浜触娌笣鍐�璞簯杈介粦婀樼殩椴佹柊鑻忔禉璧ｉ剛妗傜敇鏅嬭挋闄曞悏闂借吹宸濋潚钘忕惣瀹佺Е宸漖\\\\d{5}[A-Z]$";
+// Pattern r = Pattern.compile(patt);
+// Matcher matcher = r.matcher(str);
+// String regex = "^[\u4e00-\u9fa5]{1}[A-Z]{1}[A-HJ-NP-Z]{1}[A-HJ-NP-Z0-9]{4}[D0-9X]$";
+// Pattern pattern = Pattern.compile(regex);
+// Matcher matcher = pattern.matcher(str);
+// boolean isMatcher = matcher.matches();
+// return isMatcher;
+
+
+ if (str.length() >= 7 && str.length() <= 8){
+ Pattern pattern = Pattern.compile("^([浜触娌笣鍐�璞簯杈介粦婀樼殩椴佹柊鑻忔禉璧ｉ剛妗傜敇鏅嬭挋闄曞悏闂借吹绮ら潚钘忓窛瀹佺惣浣块A-Z]{1}[a-zA-Z](([ABCDF]((?![IO])[a-zA-Z0-9](?![IO]))[0-9]{4})|([0-9]{5}[ABCDF]))|[浜触娌笣鍐�璞簯杈介粦婀樼殩椴佹柊鑻忔禉璧ｉ剛妗傜敇鏅嬭挋闄曞悏闂借吹绮ら潚钘忓窛瀹佺惣浣块A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9鎸傚璀︽腐婢砞{1})$");
+ Matcher m = pattern.matcher(str);
+ if (!m.matches()){
+ return false;
+ }
+ return true;
+ }else {
+ return false;
+ }
+
}
public static String getTuominStr(String s){
@@ -118,6 +196,16 @@
String order = "order";
String activity = "activity";
}
+
+ /**
+ * 鍗＄墖鐘舵�� 0绂佺敤 1鍚敤 2閫�鍗� 3鎸傚け
+ */
+ public interface MemberCard{
+ int forbidden = 0;
+ int normal = 1;
+ int returned = 2;
+ int loss = 3;
+ }
public interface MQ_KEY{
String activity_looknum = "looknum";
String activity_signup = "signup";
@@ -128,7 +216,7 @@
int nb = 2;//鍐呴儴璁垮
}
public interface VisitStatus{
- //瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7宸茬绂�
+ //瀹℃牳鐘舵�� 0寰呭鏍� 1宸叉彁浜RP瀹℃壒 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 5涓嬪彂鎴愬姛 6涓嬪彂澶辫触 7宸茬櫥璁� 8宸茬绂� 9宸插け鏁�
int waitCheck = 0;
int submitCheck = 1;
int pass = 2;
@@ -136,7 +224,28 @@
int cancel = 4;
int xfSuccess = 5;
int xfFail = 6;
- int signout = 7;
+ int signin= 7;
+ int signout = 8;
+ int invalid =9;
+ }
+ public interface VisitIccmStatus{
+ //璁垮鐘舵��(0:鏈鍒�,1:宸茬鍒�,2:宸茬閫�,3:婊炵暀,4:鏈闂�,5:鑷姩绛剧,6:鏈閫�)
+ int waitSign = 0;
+ int signin= 1;
+ int signout = 2;
+ int noleave =3;
+ int novisit =4;
+ int autoOut =5;
+ int noSignout =6;
+ }
+ 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;
@@ -160,6 +269,7 @@
public static final String COFFEE_BEAN_TASK ="COFFEE_BEAN_TASK";
+ public static final String HOME_IMAGE ="HOME_IMAGE";
@@ -168,6 +278,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";
@@ -177,6 +289,8 @@
public interface RedisKeys {
public static final String ERP_TOKEN ="ERP_TOKEN";
public static final long EXPIRE_TIME = 7200;
+
+ public static final String INTERNAL_TOKEN ="INTERNAL_TOKEN";
public static final String GOODSORDER_KEY = "ordercode_";
public static final String ACTIVITY_SIGN_KEY = "actcode_";
@@ -235,13 +349,93 @@
public interface memberType{
- int visitor = 0;//鏅�氳瀹�
- int lw_visitor = 1;//鍔冲姟璁垮
+ int lw_visitor = 0;//鍔冲姟璁垮
+ int visitor = 1;//鏅�氳瀹�
int internal = 2;//鍐呴儴浜哄憳
}
+
+
+public interface approveStatus{
+ int wait = 0;//寰呭鎵�
+ int auditIng = 1;//瀹℃壒涓�
+ int pass = 2;//瀹℃壒閫氳繃
+ int unPass = 3;//瀹℃壒鏈�氳繃
+ int otherDeal = 4;//浠栦汉宸插鐞�
+}
+
+ /**
+ * 鑾峰彇杞︾墝绫诲瀷淇℃伅
+ *
+ * @param plateNo
+ * @return 杩斿洖null锛岃〃绀鸿溅鐗屼笉鍖归厤
+ */
+ public static VehiclePlateNoEnum getVehiclePlateNo(String plateNo) {
+ for (VehiclePlateNoEnum vehiclePlateNoEnum : VehiclePlateNoEnum.values()) {
+ Matcher matcher = vehiclePlateNoEnum.pattern.matcher(plateNo);
+ if (matcher.find()) {
+ return vehiclePlateNoEnum;
+ }
+ }
+ return null;
+ }
+
+
+ public enum VehiclePlateNoEnum {
+ /**
+ * 鍖归厤姘戠敤杞︾墝鍜屼娇棣嗚溅鐗�
+ * 1銆佺涓�浣嶄负姹夊瓙鐪佷唤缂╁啓
+ * 2銆佺浜屼綅涓哄ぇ鍐欏瓧姣嶅煄甯傜紪鐮�
+ * 3銆佸悗闈㈡槸5浣嶄粎鍚瓧姣嶅拰鏁板瓧鐨勭粍鍚�
+ */
+ CIVIL_LICENSE_PLATE_AND_EMBASSY_LICENSE_PLATE(1, "姘戠敤杞︾墝鍜屼娇棣嗚溅鐗�", Pattern.compile("^[浜触鍐�鏅嬭挋杈藉悏榛戞勃鑻忔禉鐨栭椊璧ｉ瞾璞剛婀樼菠妗傜惣宸濊吹浜戞笣钘忛檿鐢橀潚瀹佹柊]{1}[A-Z]{1}[0-9a-zA-Z]{5}$")),
+ /**
+ * 鍖归厤鐗圭杞︾墝(鎸�,璀�,瀛�,棰�,娓�,婢�)
+ */
+ SPECIAL_LICENSE_PLATES(2, "鐗圭杞︾墝", Pattern.compile("^[浜触鍐�鏅嬭挋杈藉悏榛戞勃鑻忔禉鐨栭椊璧ｉ瞾璞剛婀樼菠妗傜惣宸濊吹浜戞笣钘忛檿鐢橀潚瀹佹柊]{1}[A-Z]{1}[0-9a-zA-Z]{4}[鎸傝瀛﹂娓境]{1}$")),
+ /**
+ * 鍖归厤
+ */
+ ARMED_POLICE_CAR(3, "姝﹁杞︾墝", Pattern.compile("^WJ[浜触鍐�鏅嬭挋杈藉悏榛戞勃鑻忔禉鐨栭椊璧ｉ瞾璞剛婀樼菠妗傜惣宸濊吹浜戞笣钘忛檿鐢橀潚瀹佹柊]?[0-9a-zA-Z]{5}$")),
+ /**
+ * 鍖归厤鍐涚墝
+ */
+ MILITARY_CAR(4, "鍐涚敤杞︾墝", Pattern.compile("^[A-Z]{2}[0-9]{5}$")),
+ /**
+ * 灏忓瀷鏂拌兘婧愯溅
+ * 1銆佸尮閰嶆柊鑳芥簮杞﹁締6浣嶈溅鐗�
+ */
+ SMALL_NEW_ENERGY_VEHICLE(5, "灏忓瀷鏂拌兘婧愯溅鐗�", Pattern.compile("^[浜触鍐�鏅嬭挋杈藉悏榛戞勃鑻忔禉鐨栭椊璧ｉ瞾璞剛婀樼菠妗傜惣宸濊吹浜戞笣钘忛檿鐢橀潚瀹佹柊]{1}[A-Z]{1}[A-Z]{1}[0-9a-zA-Z]{5}$")),
+ /**
+ * 澶у瀷鏂拌兘婧愯溅
+ */
+ LARGE_NEW_ENERGY_VEHICLE(6, "澶у瀷鏂拌兘婧愯溅鐗�", Pattern.compile("^[浜触鍐�鏅嬭挋杈藉悏榛戞勃鑻忔禉鐨栭椊璧ｉ瞾璞剛婀樼菠妗傜惣宸濊吹浜戞笣钘忛檿鐢橀潚瀹佹柊]{1}[A-Z]{1}[0-9a-zA-Z]{5}[DF]{1}$"));
+ private int code;
+
+ private String description;
+
+ private Pattern pattern;
+
+ VehiclePlateNoEnum(int code, String description, Pattern pattern) {
+ this.code = code;
+ this.description = description;
+ this.pattern = pattern;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+ }
+
public static void main(String[] args) {
- String t = URLDecoder.decode("https://lsqw.gtja.com/qwcos/v-index.html#/loginforProperty?corpId=ww4b7aefafeb430e4b&corpId=ww4b7aefafeb430e4b&agentId=1000005&agentId=1000005&fromRoute=&userCode=013561&userCode=&userId=zz&userId=&encryptUserCode=&custQwId=wmIUuSDgAAR8MhtVY8w90EyKltvoK5fA&custCode=&openId=op1wZwD1dKuBQywmWWS5957zUOJI&name=%E8%B9%84%E8%B9%84&headUrl=http%3A%2F%2Fwx.qlogo.cn%2Fmmhead%2FQ3auHgzwzM4QlibSOAvYcvRMdsoyF3Ua7duLOYSJfB3dsGsYxIYonBw%2F0&dbHeadUrl=https%3A%2F%2Ftgf.gtja.com%2Ff%2F%2Fqwoms%2F2022512%2Fqwoms_1652332606613_8.jpg");
- System.out.println(t);
+ System.out.println((DESUtil.decrypt(Constants.EDS_PWD, "En35O2o+Mpw5bThqkT8lmE6UPG+W6LFs")));
+// System.out.println(Constants.getVehiclePlateNo("婀楤140D17").getDescription());
+// System.out.println(Constants.getVehiclePlateNo("瀹緼P0637").getDescription());
+
+
}
@@ -255,7 +449,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;
@@ -304,6 +507,5 @@
T reqJson = mapper.readValue(json, clazz);
return reqJson;
}
-
}
--
Gitblit v1.9.3