From d2902daad7261ac7d0148dbb9f33f39e52d433f6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 16 八月 2024 18:15:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 345 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 215 insertions(+), 130 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 6ba808c..90cea78 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
@@ -38,6 +38,13 @@
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" ;
+ public static final String PLATFORM ="PLATFORM" ;
+ public static final String RESERVATION_TOTAL_NUM ="RESERVATION_TOTAL_NUM" ;
+ public static final String SIGN_IN_PLACE_LAT ="SIGN_IN_PLACE_LAT" ;
+ public static final String SIGN_IN_PLACE_LNT ="SIGN_IN_PLACE_LNT" ;
+ public static final String SIGN_IN_PLACE_DISTANCE ="SIGN_IN_PLACE_DISTANCE" ;
+ public static final String SIGN_IN_QRCODE ="SIGN_IN_QRCODE" ;
+
//琚嫓璁夸汉淇℃伅鏍￠獙鏂瑰紡锛�0鎵嬫満鍙峰崟鐙牎楠� 1鎵嬫満鍙峰拰濮撳悕缁勫悎鏍￠獙锛�
public static final String BEVISITED_USER_VALID = "BEVISITED_USER_VALID";
@@ -94,6 +101,7 @@
public static final String ERP ="ERP" ;
public static final Integer THREE =3 ;
public static final Integer FOUR =4 ;
+ public static final Integer FIVE =5 ;
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" ;
@@ -106,7 +114,9 @@
public static final String HK_NGINX_URL = "HK_NGINX_URL";
public static boolean DEALING_HK_SYNCPRIVILEGE= false;
public static boolean DEALING_HK_SYNCDEVICE = false;
+ public static boolean DEALING_HK_SYNCPLATFORM = false;
public static boolean DEALING_HK_SYNCDEVICE_STATUS = false;
+ public static boolean DEALING_HK_SYNCPLATFORM_STATUS = false;
public static boolean DEALING_HK_SYNCPARK = false;
public static boolean DEALING_HK_IMG = false;
public static boolean DEALING_HK_ORG = false;
@@ -159,6 +169,19 @@
public static final int custom = 4;
public static final int self = -1;
}
+
+ /**
+ * 浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣
+ */
+ public interface platformJobType{
+ int zycxh = 0;
+ int zyczh = 1;
+ int wxcxh = 2;
+ int wxczh = 3;
+ int sgscxh = 4;
+ }
+
+
public static Date getBirthdyByCardNo(String idCard){
if(idCard ==null || idCard.length()<14){
return null;
@@ -404,7 +427,7 @@
public interface memberType{
- int lw_visitor = 0;//鍔冲姟璁垮
+ int driver = 0;//鍙告満浜哄憳
int visitor = 1;//鏅�氳瀹�
int internal = 2;//鍐呴儴浜哄憳
}
@@ -596,7 +619,6 @@
}
-
public enum NoticeType {
ZERO(0, "寰呭鏍�","","","寰呭鏍�","寰呭鐞�","澶勭悊涓�"),
@@ -696,6 +718,197 @@
}
+
+ /**
+ * 鏈堝彴浣滀笟 鐘舵��
+ * 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙�
+ */
+ public enum PlatformJobStatus {
+ WAIT_CONFIRM(0, "寰呯‘璁�","寰呯‘璁�" ),
+ WART_SIGN_IN(1, "寰呯鍒�","寰呯鍒�" ),
+ WAIT_CALL(2, "宸茬鍒�","宸茬鍒�"), //绛夊緟鍙彿鍏ュ洯
+ IN_WAIT(3, "鍏ュ洯绛夊緟","鍏ュ洯绛夊緟" ),//宸插叆鍥� 鏈彨鍙疯繘鍏ユ湀鍙�
+ CALLED(4, "宸插彨鍙�","宸插彨鍙�" ),
+ WORKING(5, "浣滀笟涓�","浣滀笟涓�" ),
+ DONE(6, "浣滀笟瀹屾垚 ","浣滀笟瀹屾垚 " ),
+ TRANSFERING(7, "杞Щ涓�","杞Щ涓�" ),
+ EXCEPTION(8, "寮傚父鎸傝捣","寮傚父鎸傝捣" ),
+ AUTHED_LEAVE(9, "宸叉巿鏉冪鍥�","宸叉巿鏉冪鍥�" ),
+ LEAVED(10, "宸茬鍥� ","宸茬鍥� " ),
+ OVER_NUMBER(11, "宸茶繃鍙�","宸茶繃鍙�" ),
+ ;
+
+ // 鎴愬憳鍙橀噺
+ private int key;
+ private String name;
+ private String info;
+
+ // 鏋勯�犳柟娉�
+ PlatformJobStatus(int key, String name,String info ) {
+ this.key = key;
+ this.info = info;
+ this.name = name;
+ }
+ public static String getName(int index) {
+ for (PlatformJobStatus c : PlatformJobStatus.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+ }
+ /**
+ * 瀹℃壒妯℃嫙绫诲瀷 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害
+ */
+ public enum ApproveTmplType{
+ NOT_SG_VISIT(0, "闈炴柦宸ヤ汉鍛樿瀹㈢敵璇�", "闈炴柦宸ヤ汉鍛樿瀹㈢敵璇�"),
+ SG_VISIT(1, "鏂藉伐浜哄憳璁垮鐢宠", "鏂藉伐浜哄憳璁垮鐢宠"),
+ CAR_VISIT(2, "璁垮鎶ュ ", "璁垮鎶ュ "),
+ IN_CITY_CAR_USE(3, "鍏溅甯傚唴鐢ㄨ溅 ", "鍏溅甯傚唴鐢ㄨ溅 "),
+ OUT_CITY_CAR_USE(4, "鍏溅瀹ゅ鐢ㄨ溅 ", "鍏溅瀹ゅ鐢ㄨ溅 "),
+ CITY_WLC_BOOK(5, "甯傚叕鍙哥墿娴佽溅棰勭害 ", "5甯傚叕鍙哥墿娴佽溅棰勭害 "),
+ ;
+ // 鎴愬憳鍙橀噺
+ private String name;
+ private int key;
+ private String noteinfo;// 鎻忚堪
+
+ // 鏋勯�犳柟娉�
+ ApproveTmplType(int key, String name, String noteinfo) {
+ this.name = name;
+ this.key = key;
+ this.noteinfo = noteinfo;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (ApproveTmplType c : ApproveTmplType.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getInfo(int index) {
+ for (ApproveTmplType c : ApproveTmplType.values()) {
+ if (c.getKey() == index) {
+ return c.noteinfo;
+ }
+ }
+ return null;
+ }
+
+ // get set 鏂规硶
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ public String getNoteinfo() {
+ return noteinfo;
+ }
+
+
+
+ }
+ public enum NoticeObjectType {
+ MEETING_BOOK_SUCCESS(0, "浼氫笌棰勫畾鎴愬姛","浼氫笌棰勫畾鎴愬姛"),
+ MEETING_CACEL(1, "浼氳鍙栨秷","浼氳鍙栨秷"),
+ MEETING_START(2, "浼氳鍗冲皢寮�濮�","浼氳鍗冲皢寮�濮�"),
+ ;
+ // 鎴愬憳鍙橀噺
+ private int key;
+ private String name;
+ private String info;
+
+ // 鏋勯�犳柟娉�
+ NoticeObjectType(int key, String name,String info) {
+ this.name = name;
+ this.key = key;
+ this.info = info;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (NoticeObjectType c : NoticeObjectType.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+
+
+ // get set 鏂规硶
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+
+ }
+ public static <T> T toSnakeObject(String json, Class<T> clazz) throws IOException {
+ ObjectMapper mapper = new ObjectMapper();
+ mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
+ T reqJson = mapper.readValue(json, clazz);
+ return reqJson;
+ }
/**
* 鍛樺伐淇℃伅缁存姢鎿嶄綔鍘嗗彶绫诲瀷 0瑙ｅ喕 1鍐荤粨 2鎷夐粦 3鎭㈠ 4璁句负鎷滆浜� 5鍙栨秷鎷滆浜� 6璁句负楂樼骇瀹℃壒浜� 7鍙栨秷楂樼骇瀹℃壒浜� 8鎵嬪姩绂诲満 9鍒犻櫎 10鏇存柊 11鎺堟潈闂ㄧ鏉冮檺 12绂昏亴 13鎭㈠鍦ㄨ亴
*/
@@ -829,132 +1042,4 @@
}
- /**
- * 瀹℃壒妯℃嫙绫诲瀷 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害
- */
- public enum ApproveTmplType{
- NOT_SG_VISIT(0, "闈炴柦宸ヤ汉鍛樿瀹㈢敵璇�", "闈炴柦宸ヤ汉鍛樿瀹㈢敵璇�"),
- SG_VISIT(1, "鏂藉伐浜哄憳璁垮鐢宠", "鏂藉伐浜哄憳璁垮鐢宠"),
- CAR_VISIT(2, "璁垮鎶ュ ", "璁垮鎶ュ "),
- IN_CITY_CAR_USE(3, "鍏溅甯傚唴鐢ㄨ溅 ", "鍏溅甯傚唴鐢ㄨ溅 "),
- OUT_CITY_CAR_USE(4, "鍏溅瀹ゅ鐢ㄨ溅 ", "鍏溅瀹ゅ鐢ㄨ溅 "),
- CITY_WLC_BOOK(5, "甯傚叕鍙哥墿娴佽溅棰勭害 ", "5甯傚叕鍙哥墿娴佽溅棰勭害 "),
- ;
- // 鎴愬憳鍙橀噺
- private String name;
- private int key;
- private String noteinfo;// 鎻忚堪
-
- // 鏋勯�犳柟娉�
- ApproveTmplType(int key, String name, String noteinfo) {
- this.name = name;
- this.key = key;
- this.noteinfo = noteinfo;
- }
-
- // 鏅�氭柟娉�
- public static String getName(int index) {
- for (ApproveTmplType c : ApproveTmplType.values()) {
- if (c.getKey() == index) {
- return c.name;
- }
- }
- return null;
- }
-
- // 鏅�氭柟娉�
- public static String getInfo(int index) {
- for (ApproveTmplType c : ApproveTmplType.values()) {
- if (c.getKey() == index) {
- return c.noteinfo;
- }
- }
- return null;
- }
-
- // get set 鏂规硶
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public int getKey() {
- return key;
- }
-
- public void setKey(int key) {
- this.key = key;
- }
-
- public String getNoteinfo() {
- return noteinfo;
- }
-
-
-
- }
- public enum NoticeObjectType {
- MEETING_BOOK_SUCCESS(0, "浼氫笌棰勫畾鎴愬姛","浼氫笌棰勫畾鎴愬姛"),
- MEETING_CACEL(1, "浼氳鍙栨秷","浼氳鍙栨秷"),
- MEETING_START(2, "浼氳鍗冲皢寮�濮�","浼氳鍗冲皢寮�濮�"),
- ;
- // 鎴愬憳鍙橀噺
- private int key;
- private String name;
- private String info;
-
- // 鏋勯�犳柟娉�
- NoticeObjectType(int key, String name,String info) {
- this.name = name;
- this.key = key;
- this.info = info;
- }
-
- // 鏅�氭柟娉�
- public static String getName(int index) {
- for (NoticeObjectType c : NoticeObjectType.values()) {
- if (c.getKey() == index) {
- return c.name;
- }
- }
- return null;
- }
-
-
- // get set 鏂规硶
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public int getKey() {
- return key;
- }
-
- public void setKey(int key) {
- this.key = key;
- }
-
- public String getInfo() {
- return info;
- }
-
- public void setInfo(String info) {
- this.info = info;
- }
-
- }
- public static <T> T toSnakeObject(String json, Class<T> clazz) throws IOException {
- ObjectMapper mapper = new ObjectMapper();
- mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
- T reqJson = mapper.readValue(json, clazz);
- return reqJson;
- }
-
}
--
Gitblit v1.9.3