From a2e8793e2c53c7e80b67c1fe407b78fde59b2296 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 29 十一月 2024 10:01:27 +0800 Subject: [PATCH] 最新版本541200007 --- server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 425 +++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 335 insertions(+), 90 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 8646006..5a66940 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 @@ -1,12 +1,16 @@ package com.doumee.core.utils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.doumee.core.model.LoginUserInfo; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategy; -import org.apache.commons.collections4.CollectionUtils; +import io.swagger.models.auth.In; +import org.apache.batik.util.Platform; import org.apache.commons.lang3.StringUtils; +import org.springframework.util.CollectionUtils; import java.io.IOException; import java.math.BigDecimal; @@ -26,18 +30,34 @@ public static final String HEADER_USER_TOKEN = "dm_user_token"; public static final String REDIS_TOKEN_KEY = "token_"; public static final String REDIS_HK_TOKEN_KEY = "hk_token_"; + public static final String HK_TOKEN_VALIDITY = "HK_TOKEN_VALIDITY"; public static final String[] ALL_SPELL_LIST_FIRST = new String[]{"A", "B", "C", "D", "E", "F", "G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"}; public static final int ZERO = 0 ; public static final int ONE = 1 ; public static final int TWO = 2 ; public static final String HK_PARAM ="HK_PARAM" ; + public static final String LED_CONTENT_SPEED ="LED_CONTENT_SPEED" ; public static final String HK_HOST ="HK_HOST" ; public static final String HK_APPKEY ="HK_APPKEY" ; + public static final String LOGIN_OUT_URL ="LOGIN_OUT" ; public static final String HK_APPSECRET ="HK_APPSECRET" ; public static final String HK_HTTPS ="HK_HTTPS" ; public static final String HK_PUSH_URL = "HK_PUSH_URL"; + public static final String HK_CARS_OPENAPI_ACCESS_KEY = "HK_CARS_OPENAPI_ACCESS_KEY"; + public static final String HK_CARS_OPENAPI_ACCESS_SECRET = "HK_CARS_OPENAPI_ACCESS_SECRET"; + public static final String HK_CARS_OPENAPI_URL = "HK_CARS_OPENAPI_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 POWER_MINUTE ="POWER_MINUTE" ; + public static final String SPECIAL_COMPANY_ID ="SPECIAL_COMPANY_ID" ; + + 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"; @@ -57,7 +77,10 @@ // 璁垮鏉ヨ閰嶇疆 public static final String VISIT_CONFIG = "VISIT_CONFIG"; public static final String MEMBER_IMG = "MEMBER_IMG"; + public static final String PLATFORM_EVENT_IMG = "PLATFORM_EVENT_IMG"; public static final String VISIT_NOTICE = "VISIT_NOTICE"; + public static final String TIME_OUT_CONFIG = "TIME_OUT_CONFIG"; + //鍋ュ悍璇侀厤缃� public static final String LW_HEALTH_CARD = "LW_HEALTH_CARD"; public static final String HEALTH_CARD = "HEALTH_CARD"; @@ -87,6 +110,7 @@ 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 FTP_LOCAL_RESOURCE_PATH ="FTP_LOCAL_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" ; @@ -105,6 +129,21 @@ public static final String LOG_DEL_DAYS_LIMIT ="LOG_DEL_DAYS_LIMIT" ; public static final String HK_LOG_DEL_DAYS_LIMIT ="HK_LOG_DEL_DAYS_LIMIT" ; public static final String HK_NGINX_URL = "HK_NGINX_URL"; + public static final String PLATFORM_BOOKING_TIPS = "PLATFORM_BOOKING_TIPS"; + public static final String PLATFORM_GUIDEMAP = "PLATFORM_GUIDEMAP"; + public static final String WMS_PARAM ="WMS_PARAM" ; + public static final String WMS_INBOUND_PLATFROM_URL ="WMS_INBOUND_PLATFROM_URL" ; + public static final String WMS_GET_INVENTORYLIST_URL ="WMS_GET_INVENTORYLIST_URL" ; + public static final String WMS_OUTBOUND_PLATFROM_URL ="WMS_OUTBOUND_PLATFROM_URL" ; + public static final String TSM_PARAM ="TSM_PARAM" ; + public static final String TMS_ORDER_LIST_URL ="TMS_ORDER_LIST_URL" ; + public static final String TMS_ORDER_DETAIL_URL ="TMS_ORDER_DETAIL_URL" ; + public static final String TMS_LOCK_STATUS_URL ="TMS_LOCK_STATUS_URL" ; + public static final String TMS_INTERFACE_URL_PREFIX ="TMS_INTERFACE_URL_PREFIX" ; + public static final String MYSQL_BACKUP_CDOE ="MYSQL_BACKUP_CDOE" ; + public static final String MYSQL_BACKUP_DIR ="MYSQL_BACKUP_DIR" ; + public static final String EVENT_FILES_PRIVATE_DOMAIN ="EVENT_FILES_PRIVATE_DOMAIN" ; + public static final String EVENT_FILES_PUBLIC_DOMAIN ="EVENT_FILES_PUBLIC_DOMAIN" ; public static boolean DEALING_HK_SYNCPRIVILEGE= false; public static boolean DEALING_HK_SYNCDEVICE = false; public static boolean DEALING_HK_SYNCPLATFORM = false; @@ -142,6 +181,7 @@ public static final String TIMEOUT_WARNING = "TIMEOUT_WARNING"; // FTP鏂囦欢鏈嶅姟鍣ㄨ祫婧愯闂湴鍧� + public static String getRandom6Num( ) { Random random = new Random(); StringBuilder sb = new StringBuilder(); @@ -153,7 +193,16 @@ return sb.toString(); } - + 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 DATAPERMISSION_TYPE{ public static final int all = 0; public static final int departAndChild = 1; @@ -173,6 +222,8 @@ int wxczh = 3; int sgscxh = 4; } + + public static Date getBirthdyByCardNo(String idCard){ if(idCard ==null || idCard.length()<14){ return null; @@ -199,6 +250,7 @@ } return null; } + /** * 鍒ゆ柇鏄惁涓烘湁鏁堣溅鐗屽彿 @@ -249,6 +301,23 @@ } return s.substring(0,5)+"*******"+s.substring(l-6,l); } + + + public static String carCodeTuominStr(String s){ + if(StringUtils.isEmpty(s)){ + return ""; + } + int l = s.length(); + if(Constants.equalsInteger(l,7)){ + return s.substring(0,3)+"**"+s.substring(l-2,l); + } + if(l <= 8){ + return s.substring(0,3)+"***"+s.substring(l-2,l); + } + return s; + } + + /** * 鍒囧垎閫楀彿鎷兼帴鐨勬暣褰㈤泦鍚� @@ -314,6 +383,16 @@ int invalid =9; } + public interface RetentionCarType{ + //杞﹁締绫诲瀷 0鍐呴儴杞﹁締 1鐩稿叧鏂硅溅杈� 2璁垮杞﹁締 3鍐呰繍鐗╂祦杞� 4澶栧崗杞﹁締 5甯傚叕鍙稿嵏璐ц溅 + int internal = 0; + int relation = 1; + int visitor = 2; + int selfTruck = 3; + int outTruck = 4; + int cityComTruck = 5; + } + public interface EmpowerStatus{ //涓�鍗¢�氭巿鏉冧笅鍙戠姸鎬� 0寰呬笅鍙� 1宸蹭笅鍙� 2涓嬪彂鎴愬姛 3宸插彇娑� 4涓嬪彂澶辫触 5浠诲姟涓嬭浇宸茬粨鏉� @@ -364,7 +443,9 @@ public interface RedisKeys { + public static final String IMPORTING_CARS ="IMPORTING_CARS"; public static final String IMPORTING_MEMBER ="IMPORTING_MEMBER"; + public static final String IMPORTING_GAS ="IMPORTING_GAS"; public static final String ERP_TOKEN ="ERP_TOKEN"; public static final long EXPIRE_TIME = 7200; @@ -390,6 +471,22 @@ } //淇濈暀涓や綅灏忔暟涓斿洓鑸嶄簲鍏� d = d.setScale(4, BigDecimal.ROUND_HALF_UP); + return d; + } + public static BigDecimal formatBigdecimal0Float(BigDecimal d) { + if (d == null) { + d = new BigDecimal(0.0); + } + //淇濈暀涓や綅灏忔暟涓斿洓鑸嶄簲鍏� + d = d.setScale(0, BigDecimal.ROUND_HALF_UP); + return d; + } + public static BigDecimal formatBigdecimal2Float(BigDecimal d) { + if (d == null) { + d = new BigDecimal(0.0); + } + //淇濈暀涓や綅灏忔暟涓斿洓鑸嶄簲鍏� + d = d.setScale(2, BigDecimal.ROUND_HALF_UP); return d; } @@ -431,6 +528,7 @@ int cityUseCar = 3;//甯傚唴鐢ㄨ溅 int unCityUseCar = 4;//甯傚鐢ㄨ溅 int logisticsCarUse = 5;//鐗╂祦杞﹂绾� + int reason = 6;//鍏ュ洯鍘熷洜 } @@ -444,6 +542,10 @@ }else if(Constants.equalsInteger(approveType,Constants.approveObjectType.cityUseCar) ||Constants.equalsInteger(approveType,Constants.approveObjectType.unCityUseCar)){ return Constants.noticesObjectType.useCar; + }else if(Constants.equalsInteger(approveType,Constants.approveObjectType.logisticsCarUse)){ + return Constants.noticesObjectType.logisticsCarUse; + }else if(Constants.equalsInteger(approveType, approveObjectType.reason)){ + return noticesObjectType.reason; }else { return Constants.noticesObjectType.system; } @@ -459,6 +561,7 @@ int dangerDeal = 3;//闅愭偅澶勭悊 int logisticsCarUse = 4;//鐗╂祦杞﹀鎵� int system = 5;//绯荤粺娑堟伅 + int reason = 6;//鍏ュ洯鍘熷洜 } @@ -540,7 +643,8 @@ } public static void main(String[] args) { - System.out.println(Constants.getVehiclePlateNo("鐨朅A10991").getDescription()); + System.out.println(Constants.checkCarNo("鐨朅10991")); + System.out.println(Constants.checkCarNo("鐨朅A10991")); // System.out.println(Constants.getVehiclePlateNo("婀楤140D17").getDescription()); // System.out.println(Constants.getVehiclePlateNo("瀹緼P0637").getDescription()); @@ -610,124 +714,262 @@ } - public enum NoticeType { - - ZERO(0, "寰呭鏍�","","","寰呭鏍�","寰呭鐞�","澶勭悊涓�"), - ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","宸茬粨妗�"), - TWO(2, "寰呭嚭鍗�","寰呭鏍�","寰呭鏍�","","",""), - THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","",""), - FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","","宸叉挙閿�"), - FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","",""), - //缁繚閫氱煡 - SIX(6, "","","","","",""), - //鍟嗘埛绔� 濮旀墭淇� - 鎶曚繚寰呭鏍� 鍔犲噺淇� 鎹㈠巶 寰呭鏍� - SEVEN(7, "寰呭鏍�","寰呭鏍�","寰呭鏍�","","",""), - EIGHT(8, "","","","","",""), - NINE(9, "","","","","",""), - ; + public enum PlatformWarnEvent { + STOP_TIMEOUT(0, "鍋滈潬瓒呮椂","${carCode}鏈堝彴鍋滈潬瓒呮椂" ), + STOP_ERROR(1, "鍋滈潬閿欒","${carCode}鏈堝彴鍋滈潬閿欒" ), + WORK_TIMEOUT(2, "浣滀笟瓒呮椂","${carCode}浣滀笟瓒呮椂" ); // 鎴愬憳鍙橀噺 - private int status; - private String insuranceApplyDetail; - private String applyChangeDetail; - private String changeFactoryDetail; - private String dispatchUnitDetail; - private String taxesDetail; - private String settleClaimsDetail; + private int key; + private String name; + private String info; // 鏋勯�犳柟娉� - NoticeType(int status, String insuranceApplyDetail,String applyChangeDetail - , String changeFactoryDetail,String dispatchUnitDetail - , String taxesDetail,String settleClaimsDetail) { - this.status = status; - this.insuranceApplyDetail = insuranceApplyDetail; - this.applyChangeDetail = applyChangeDetail; - this.changeFactoryDetail = changeFactoryDetail; - this.dispatchUnitDetail = dispatchUnitDetail; - this.taxesDetail = taxesDetail; - this.settleClaimsDetail = settleClaimsDetail; + PlatformWarnEvent(int key, String name,String info ) { + this.key = key; + this.info = info; + this.name = name; + } + public static String getName(int index) { + for (PlatformWarnEvent c : PlatformWarnEvent.values()) { + if (c.getKey() == index) { + return c.name; + } + } + return null; } - - // get set 鏂规硶 - public int getStatus() { - return status; + public int getKey() { + return key; } - public void setStatus(int status) { - this.status = status; + public void setKey(int key) { + this.key = key; } - public String getInsuranceApplyDetail() { - return insuranceApplyDetail; + public String getName() { + return name; } - public void setInsuranceApplyDetail(String name) { - this.insuranceApplyDetail = insuranceApplyDetail; + public void setName(String name) { + this.name = name; } - public String getApplyChangeDetail() { - return applyChangeDetail; + public String getInfo() { + return info; } - public void setApplyChangeDetail(String info) { - this.applyChangeDetail = applyChangeDetail; + public void setInfo(String info) { + this.info = info; } - - public String getChangeFactoryDetail() { - return changeFactoryDetail; - } - - public void setChangeFactoryDetail(String info) { - this.changeFactoryDetail = changeFactoryDetail; - } - - public String getDispatchUnitDetail() { - return dispatchUnitDetail; - } - - public void setDispatchUnitDetail(String info) { - this.dispatchUnitDetail = dispatchUnitDetail; - } - - public String getTaxesDetail() { - return taxesDetail; - } - - public void setTaxesDetail(String info) { - this.taxesDetail = taxesDetail; - } - - public String getSettleClaimsDetail() { - return settleClaimsDetail; - } - - public void setSettleClaimsDetail(String info) { - this.settleClaimsDetail = settleClaimsDetail; - } - - } /** * 鏈堝彴浣滀笟 鐘舵�� - * 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� + * 0浠诲姟鍒涘缓 1鍙告満纭浠诲姟 2鍙告満绛惧埌 3鍏ュ洯绛夊緟 4鏈堝彴鍙彿 5寮�濮嬩綔涓� 6浣滀笟瀹屾垚 7鏈堝彴杞Щ 8浠诲姟鎸傝捣 9涓嬪彂鎺堟潈绂诲洯 10绂诲洯 + */ + public enum PlatformJobLogType { + CREATE(0, "浠诲姟鍒涘缓","鍏ュ洯棰勭害鎴愬姛" ), + CONFIRM_TASK(1, "鍙告満纭浠诲姟","宸插畬鎴愭椂闂寸‘璁�" ), + SIGN(2, "鍙告満绛惧埌","鎺掗槦绛夊緟鍙彿"), + IN_WAIT(3, "鍏ュ洯绛夊緟","鍙彿鍏ュ洯绛夊緟" ), + CALLED(4, "鏈堝彴鍙彿","{data}鍙彿" ), + WORKING(5, "寮�濮嬩綔涓�","杩涘叆{data}寮�濮嬩綔涓�" ), + DONE(6, "浣滀笟瀹屾垚 ","鏈堝彴浣滀笟瀹屾垚锛岄┒绂绘湀鍙�" ), + TRANSFERING(7, "鏈堝彴杞Щ","{data}鍙戣捣鏈堝彴杞Щ" ), + EXCEPTION(8, "浠诲姟鎸傝捣","浣滀笟寮傚父琚寕璧�" ), + AUTHED_LEAVE(9, "涓嬪彂鎺堟潈绂诲洯","涓嬪彂鎺堟潈绂诲洯" ), + LEAVED(10, "宸茬鍥� ","杞﹁締浠巤data}绂诲満 " ), + OVER_NUMBER(11, "宸茶繃鍙�","瓒呮椂鏈埌鎸囧畾鏈堝彴鑷姩杩囧彿" ), + ; + + // 鎴愬憳鍙橀噺 + private int key; + private String name; + private String info; + + // 鏋勯�犳柟娉� + PlatformJobLogType(int key, String name,String info ) { + this.key = key; + this.info = info; + this.name = name; + } + public static String getName(int index) { + for (PlatformJobLogType c : PlatformJobLogType.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; + } + } + /** + * 鏈堝彴浣滀笟澶у睆鏂囨 鐘舵�� + * 1銆佹湀鍙扮┖闂诧細1鍙锋湀鍙帮紙鏈堝彴鍚嶇О锛� + * 2銆佸彨鍙蜂腑锛�1鍙锋湀鍙� 鐨朅12345 鍙彿涓� + * 3銆佷綔涓氫腑锛�1鍙锋湀鍙� 鐨朅12345 浣滀笟涓� + * 4銆侀敊璇仠闈狅細1鍙锋湀鍙� 鐨朅12345 褰撳墠杞﹁締閿欒鍋滈潬锛岃灏藉揩椹剁 + * 5銆佽秴鏃跺仠闈狅細1鍙锋湀鍙� 鐨朅12345 褰撳墠杞﹁締瓒呮椂鍋滈潬锛岃灏藉揩椹剁 + */ + public enum PlatformLedContent { + IDEL_CONTNET(1, "绌洪棽涓�","瀹夋嘲鐗╂祦鏈夐檺璐d换鍏徃" ), + CALLING(2, "鍙彿涓�","${param} ${param2} 鍙彿涓�"), + WORKING(3, "浣滀笟涓�","${param} ${param2} 浣滀笟涓�" ), + WRONG_IN(4, "閿欒鍋滈潬","${param} ${param2} 褰撳墠杞﹁締閿欒鍋滈潬锛岃灏藉揩椹剁" ), + TIMEOUT_IN(5, "瓒呮椂鍋滈潬","${param} ${param2} 褰撳墠杞﹁締瓒呮椂鍋滈潬锛岃灏藉揩椹剁" ), + TIMEOUT_WORK(6, "浣滀笟瓒呮椂","${param} ${param2} 褰撳墠杞﹁締浣滀笟瓒呮椂" ), + DONE(7, "浣滀笟瀹屾垚","${param} ${param2} 浣滀笟瀹屾垚" ), + ; + + // 鎴愬憳鍙橀噺 + private int key; + private String name; + private String info; + + // 鏋勯�犳柟娉� + PlatformLedContent(int key, String name,String info ) { + this.key = key; + this.info = info; + this.name = name; + } + public static String getName(int index) { + for (PlatformLedContent c : PlatformLedContent.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; + } + } + /** + * 骞挎挱閫氱煡鍐呭 + 1. 鍙彿涓細鐨朅12345璇峰墠寰�1鍙锋湀鍙扮瓑寰呬綔涓� + 2. 浣滀笟瀹屾垚锛氱殩A12345浣滀笟瀹屾垚锛岃灏藉揩椹剁 + 3. 閿欒鍋滈潬锛氱殩A12345鏈堝彴鍋滈潬閿欒锛岃灏藉揩椹剁 + 4. 瓒呮椂鍋滈潬锛氱殩A12345鏈堝彴鍋滈潬瓒呮椂锛岃灏藉揩椹剁璇峰敖蹇┒绂� + 5. 浣滀笟瓒呮椂锛氱殩A12345鏈堝彴鍋滈潬瓒呮椂锛岃灏藉揩椹剁璇峰敖蹇┒绂� + */ + public enum PlatformBroadcastContent { + CALLING(1, "鍙彿涓�","${param}璇峰墠寰�${param2}绛夊緟浣滀笟"), + DONE(2, "浣滀笟瀹屾垚","${param}浣滀笟瀹屾垚锛岃灏藉揩椹剁" ), + WRONG_IN(3, "閿欒鍋滈潬","${param}鏈堝彴鍋滈潬閿欒锛岃灏藉揩椹剁" ), + TIMEOUT_IN(4, "瓒呮椂鍋滈潬","${param}鏈堝彴鍋滈潬瓒呮椂锛岃灏藉揩椹剁" ), + TIMEOUT_WORK(5, "浣滀笟瓒呮椂","${param}浣滀笟瓒呮椂" ), + ; + + // 鎴愬憳鍙橀噺 + private int key; + private String name; + private String info; + + // 鏋勯�犳柟娉� + PlatformBroadcastContent(int key, String name,String info ) { + this.key = key; + this.info = info; + this.name = name; + } + + public static String getName(int index) { + for (PlatformBroadcastContent c : PlatformBroadcastContent.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浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12宸插彇娑� */ public enum PlatformJobStatus { - WAIT_CONFIRM(0, "寰呯‘璁�","" ), - WART_SIGNIN(1, "寰呯鍒�","寰呯鍒�" ), - WAIT_CALL(2, "绛夊緟鍙彿","绛夊緟鍙彿"), + WAIT_CONFIRM(0, "寰呯‘璁�","寰呯‘璁�" ), + WART_SIGN_IN(1, "寰呯鍒�","寰呯鍒�" ), + WAIT_CALL(2, "宸茬鍒�","宸茬鍒�"), IN_WAIT(3, "鍏ュ洯绛夊緟","鍏ュ洯绛夊緟" ), CALLED(4, "宸插彨鍙�","宸插彨鍙�" ), WORKING(5, "浣滀笟涓�","浣滀笟涓�" ), - //缁繚閫氱煡 - DONE(6, "浣滀笟瀹屾垚 ","浣滀笟瀹屾垚 " ), - TRANSFERING(7, "杞Щ涓�","7杞Щ涓�" ), + DONE(6, "浣滀笟瀹屾垚 ","浣滀笟瀹屾垚" ), + TRANSFERING(7, "杞Щ涓�","杞Щ涓�" ), EXCEPTION(8, "寮傚父鎸傝捣","寮傚父鎸傝捣" ), AUTHED_LEAVE(9, "宸叉巿鏉冪鍥�","宸叉巿鏉冪鍥�" ), LEAVED(10, "宸茬鍥� ","宸茬鍥� " ), OVER_NUMBER(11, "宸茶繃鍙�","宸茶繃鍙�" ), + CANCEL(12, "宸插彇娑�","宸插彇娑�" ), ; // 鎴愬憳鍙橀噺 @@ -784,6 +1026,7 @@ IN_CITY_CAR_USE(3, "鍏溅甯傚唴鐢ㄨ溅 ", "鍏溅甯傚唴鐢ㄨ溅 "), OUT_CITY_CAR_USE(4, "鍏溅瀹ゅ鐢ㄨ溅 ", "鍏溅瀹ゅ鐢ㄨ溅 "), CITY_WLC_BOOK(5, "甯傚叕鍙哥墿娴佽溅棰勭害 ", "5甯傚叕鍙哥墿娴佽溅棰勭害 "), + PLATFROM_REASON(6, "鏈堝彴鍏ュ洯鍘熷洜瀹℃壒 ", "鏈堝彴鍏ュ洯鍘熷洜瀹℃壒 "), ; // 鎴愬憳鍙橀噺 private String name; @@ -901,6 +1144,8 @@ T reqJson = mapper.readValue(json, clazz); return reqJson; } + + /** * 鍛樺伐淇℃伅缁存姢鎿嶄綔鍘嗗彶绫诲瀷 0瑙e喕 1鍐荤粨 2鎷夐粦 3鎭㈠ 4璁句负鎷滆浜� 5鍙栨秷鎷滆浜� 6璁句负楂樼骇瀹℃壒浜� 7鍙栨秷楂樼骇瀹℃壒浜� 8鎵嬪姩绂诲満 9鍒犻櫎 10鏇存柊 11鎺堟潈闂ㄧ鏉冮檺 12绂昏亴 13鎭㈠鍦ㄨ亴 */ -- Gitblit v1.9.3