From ea0698e0384aa60d3e2bad7da5efd7ea4fb8cf71 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 08 五月 2025 15:39:42 +0800 Subject: [PATCH] 最新版本541200007 --- server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 166 ++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 122 insertions(+), 44 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 1abf3d0..2bb838a 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,26 +1,17 @@ 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 io.swagger.models.auth.In; -import org.apache.batik.util.Platform; +import net.sourceforge.pinyin4j.PinyinHelper; import org.apache.commons.lang3.StringUtils; -import org.springframework.util.CollectionUtils; import java.io.IOException; import java.math.BigDecimal; -import java.net.URLDecoder; +import java.text.Collator; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Random; import java.util.*; import java.util.Date; import java.util.regex.Matcher; @@ -123,6 +114,7 @@ public static final Integer THREE =3 ; public static final Integer FOUR =4 ; public static final Integer FIVE =5 ; + public static final Integer SIX =6 ; 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" ; @@ -140,18 +132,28 @@ 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 final String TEMPERATURE_HUMIDITY ="TEMPERATURE_HUMIDITY" ; + public static final String HK_WXTOKEN_CONFIGID ="HK_WXTOKEN_CONFIGID" ; public static final String HK_WXTOKEN_TAGID ="HK_WXTOKEN_TAGID" ; public static final String WMS_TOTAL_STOCK_NUM ="WMS_TOTAL_STOCK_NUM" ; + public static final String WMS_LIQUID_LEVEL ="WMS_LIQUID_LEVEL" ; + public static final String WMS_PRESSURE_LEVEL ="WMS_PRESSURE_LEVEL" ; public static final String WX_REDIRECT_URL = "WX_REDIRECT_URL"; + public static final String HK_CHANGNEI_SCREEN_INDEXCODES = "HK_CHANGNEI_SCREEN_INDEXCODES"; + public static final String CITY_XH_REASON_ID ="CITY_XH_REASON_ID" ; + public static final String ATWL_XH_PLATFORM_ID ="ATWL_XH_PLATFORM_ID" ; + public static final String SCREEN_SEVENT_ARRIVAL_STARTDATE = "SCREEN_SEVENT_ARRIVAL_STARTDATE"; + public static final String EARLY_START_WX_NOTICE = "EARLY_START_WX_NOTICE"; + public static final String OVER_NOTICE_WX = "OVER_NOTICE_WX"; + public static final String PRESSURE_LEVEL_UNIT = "PRESSURE_LEVEL_UNIT"; + public static final String LIQUID_LEVEL_UNIT ="LIQUID_LEVEL_UNIT" ; + public static boolean DEALING_HK_SYNCPRIVILEGE= false; public static boolean DEALING_HK_SYNCDEVICE = false; public static boolean DEALING_HK_SYNCPLATFORM = false; @@ -211,7 +213,13 @@ * @return */ public static String getWxUrl(String code, WxUrlParams paramCode, String ywid) { - return code.replace("${type}",paramCode.type+"").replace("${yw}",paramCode.yw).replace("${ywid}",ywid); + String url = code.replace("${type}",paramCode.type+"").replace("${yw}",paramCode.yw).replace("${ywid}",ywid); +// try { +// url = URLEncoder.encode(code,"UTF-8"); +// }catch (Exception e){ +// +// } + return url; } public interface VisitIccmStatus{ @@ -329,11 +337,12 @@ 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); + if(l >= 7){ + String tt = ""; + for (int i = 0; i < l-6; i++) { + tt = tt+"*"; + } + return s.substring(0,2)+tt+s.substring(l-4,l); } return s; } @@ -404,14 +413,45 @@ int invalid =9; } + /** + * 0=璁垮杞﹁締-璁垮杞﹁締 + * 1=wms鎺ㄩ�佺殑鐗╂祦杞﹁締锛堥潪鑷湁杞︼級锛氳揣杩愯溅杈�-澶栧崗杩愯緭杞﹁締 + * 2= 甯傚叕鍙哥殑棰勭害鍏ュ洯杞﹁締锛氳揣杩愯溅杈�-甯傚叕鍙稿嵏璐ц溅杈� + * 3= 瀹夋嘲鐨勯绾﹀叆鍥溅杈嗭細璐ц繍杞﹁締-鍔犲伐鐑熷嵏璐ц溅杈� + * 4= 瀹夋嘲鍏姟杞︼細鍏姟杞�-瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅 + * 5= 瀹夋嘲鑷湁杞︼細璐ц繍杞﹁締-瀹夋嘲鐗╂祦璐ц繍杞﹁締 + */ 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; + //浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣 +// int internal = 0; +// int relation = 1; +// int visitor = 2; +// int selfTruck = 3; +// int outTruck = 4; +// int cityComTruck = 5; +// int unknown = 6; + int fkCar = 0;//璁垮杞﹁締-璁垮杞﹁締 + int wxysCar = 1;//鎺ㄩ�佺殑鐗╂祦杞﹁締锛堥潪鑷湁杞︼級锛氳揣杩愯溅杈�-澶栧崗杩愯緭杞﹁締 + int sgsxhCar = 2;//甯傚叕鍙哥殑棰勭害鍏ュ洯杞﹁締锛氳揣杩愯溅杈�-甯傚叕鍙稿嵏璐ц溅杈� + int jgyxhCar = 3;//瀹夋嘲鐨勯绾﹀叆鍥溅杈嗭細璐ц繍杞﹁締-鍔犲伐鐑熷嵏璐ц溅杈� + int atwlgwCar = 4;//瀹夋嘲鍏姟杞︼細鍏姟杞�-瀹夋嘲鐗╂祦鍏姟鐢ㄨ溅 + int atwlzyCar = 5;//瀹夋嘲鑷湁杞︼細璐ц繍杞﹁締-瀹夋嘲鐗╂祦璐ц繍杞﹁締 + int other = 6;//鏈煡杞﹁締 + int self = 7;//鑷湁杞� + } + + /** + * 鍦ㄥ満浜哄憳绫诲瀷 + */ + public interface RetentionMemberType{ + //绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐 3杞﹁締淇℃伅 4鐩稿叧鏂逛汉鍛� 5璐ц繍鍙告満 + int lwfk = 0;//0鍔冲姟璁垮 + int fk = 1;//1鏅�氳瀹� + int internalMember = 2;//鍐呴儴鍛樺伐 + int car = 3;//杞﹁締淇℃伅 + int relMember = 4;//鐩稿叧鏂逛汉鍛� + int driver = 5;//璐ц繍鍙告満 } @@ -536,10 +576,15 @@ } + /** + * 杩愬崟浜嗗崟浣嶇被鍨� 0涓囨敮 1绠� + */ + public static final int UNIT_TYPE =1; public interface memberType{ int driver = 0;//鍙告満浜哄憳 int visitor = 1;//鏅�氳瀹� int internal = 2;//鍐呴儴浜哄憳 + int gkuser = 3;//绠℃帶浜哄憳锛堣繍鍗曟煡璇級 } @@ -553,6 +598,16 @@ int reason = 6;//鍏ュ洯鍘熷洜 } +public interface noticesObjectType{ + int visit = 0;//璁垮鐢宠 + int visitReporting = 1;//璁垮鎶ュ + int useCar = 2;//鐢ㄨ溅鐢宠 + int dangerDeal = 3;//闅愭偅澶勭悊 + int logisticsCarUse = 4;//鐗╂祦杞﹀鎵� + int system = 5;//绯荤粺娑堟伅 + int reason = 6;//鍏ュ洯鍘熷洜 + int hknotice = 7;//娴峰悍鑰冨嫟浠e姙 +} public static Integer approveTypeToNoticeType(Integer approveType){ @@ -576,16 +631,6 @@ - public interface noticesObjectType{ - int visit = 0;//璁垮鐢宠 - int visitReporting = 1;//璁垮鎶ュ - int useCar = 2;//鐢ㄨ溅鐢宠 - int dangerDeal = 3;//闅愭偅澶勭悊 - int logisticsCarUse = 4;//鐗╂祦杞﹀鎵� - int system = 5;//绯荤粺娑堟伅 - int reason = 6;//鍏ュ洯鍘熷洜 - int hknotice = 7;//娴峰悍鑰冨嫟浠e姙 -} public interface approveStatus{ @@ -666,12 +711,15 @@ } public static void main(String[] args) { - System.out.println(Constants.checkCarNo("鐨朅10991")); - System.out.println(Constants.checkCarNo("鐨朅A10991")); +// getChinesePingyin("DDaa姹熻悕鐨勫瀵瑰"); +// System.out.println(DateUtil.getShortTime(new Date())); +// System.out.println( "2025-01-14 10:50:56".substring(0,10)); +// System.out.println(Constants.checkCarNo("鐨朅A10991")); // System.out.println(Constants.getVehiclePlateNo("婀楤140D17").getDescription()); // System.out.println(Constants.getVehiclePlateNo("瀹緼P0637").getDescription()); - + System.out.println("{\"data\":{\"paramValues\":{\"accessType\":\"2\",\"certTypes\":\"111\",\"certificateNos\":\"340621198301259374\",\"defineEventType\":\"771760131\",\"eventId\":\"6eb4a18bf3744c4385adb37eecdc9d37_634958cfeb68a_3a38\",\"eventType\":\"541200060\",\"eventTypeName\":\"\",\"extEventCardNo\":\"\",\"extEventPictureURL\":\"/pic?9d9c568c1a2do-4el*41-852o9=4586*2l9=0408*0606476=6137*=t213**ps5=0*1b9=559838d9837397-b106of-5pi2dc3=88=20c\",\"extEventReaderID\":\"\",\"extEventReaderKind\":\"\",\"gateIndex\":\"fc92c663ffb9420994f2574469f35e2d\",\"gateName\":\"瀹夋嘲瑗块棬\",\"happenTime\":\"2025-05-08T09:13:00.000+08:00\",\"inOrOut\":\"0\",\"invoicesIds\":\"9857A54DAD5947EDB032575ECDD9EA4B447f2a7ce6c043c393d0d3c372c545d9\",\"parkIndex\":\"1c4cdb8b66ed4c23bacb385c3fb6c46b\",\"parkName\":\"鍋滆溅鍦篭",\"phones\":\"18756162028\",\"plateNos\":\"鐨朆3X003\",\"srcIndex\":\"6eb4a18bf3744c4385adb37eecdc9d37\",\"srcName\":\"\",\"srcParentIndex\":\"\",\"srcType\":\"roadway\",\"svrIndexCode\":\"eae18a71-1ffd-4e72-bcf6-998c5977630d\",\"userType\":\"\",\"visitorNames\":\"榄忕ぜ\"},\"targetPerson\":{\"certType\":\"111\",\"createTime\":\"2024-08-19T17:43:09.966+08:00\",\"jobNo\":\"13856591439\",\"mobile\":\"13856591439\",\"name\":\"闄堥缚椋瀄",\"orgId\":\"986364bf-7d4c-49a4-91c8-2818c65885f3\",\"orgPathName\":\"瀹夋嘲鐗╂祦鍥尯/瀹夋嘲鐗╂祦/淇℃伅宸ョ▼绉慭",\"personId\":\"a3b3381325834e55a18ede6f4eac9552\",\"personNumber\":\"13856591439\",\"pinyin\":\"chenhongfei\",\"sex\":\"1\",\"updateTime\":\"2025-04-03T15:18:21.721+08:00\",\"userName\":\"13856591439\"},\"visitorInformationList\":[{\"appointmentCode\":\"763586\",\"cardNo\":\"5856663501660\",\"certNo\":\"340621198301259374\",\"certType\":111,\"companionPerson\":\"0\",\"createTime\":\"2025-05-08T08:18:22.857+08:00\",\"faceUrl\":\"822f9386e3f0494fa17ff012dc8c5ed4\",\"phone\":\"18756162028\",\"plateNo\":\"鐨朆3X003\",\"sex\":1,\"unit\":\"涓Щ闆嗘垚\",\"updateTime\":\"2025-05-08T09:12:49.255+08:00\",\"visitNum\":\"0\",\"visitorId\":\"6531b8ce08db4975b47250d2f3da4bc2\",\"visitorName\":\"榄忕ぜ\"}],\"visitorInvoices\":{\"appointmentType\":\"3\",\"authIssueStatus\":\"1\",\"beginTime\":\"2025-05-08T07:00:00.000+08:00\",\"campusId\":\"root000000\",\"campusName\":\"榛樿鍥尯\",\"createTime\":\"2025-05-08T08:18:22.828+08:00\",\"extendJson\":\"\",\"finishTime\":\"2025-05-08T18:00:00.000+08:00\",\"ifInfoAbnormal\":\"0\",\"invoicesId\":\"9857A54DAD5947EDB032575ECDD9EA4B447f2a7ce6c043c393d0d3c372c545d9\",\"invoicesNo\":\"FK20250508080001\",\"invoicesStatus\":\"1\",\"isRepast\":\"0\",\"type\":\"0\",\"updateTime\":\"2025-05-08T09:12:42.215+08:00\",\"visitReason\":\"-1\",\"visitReasonName\":\"鍏朵粬\",\"visitTargetId\":\"a3b3381325834e55a18ede6f4eac9552\",\"workflowInitiatorId\":\"6531b8ce08db4975b47250d2f3da4bc2\",\"workflowInitiatorType\":\"0\",\"workflowInstanceId\":\"946d456ce7ce44d58cca440e1093a8c7\"}},\"eventId\":\"3d337efbb8844b7dbd8ee280ee9d6b52\",\"eventType\":541200060,\"happenTime\":\"2025-05-08T09:13:00+08:00\",\"srcIndex\":\"9857A54DAD5947EDB032575ECDD9EA4B447f2a7ce6c043c393d0d3c372c545d9\",\"srcType\":\"9857A54DAD5947EDB032575ECDD9EA4B447f2a7ce6c043c393d0d3c372c545d9\",\"status\":0,\"timeout\":0}"); + System.out.println( "{\"data\":{\"paramValues\":{\"accessType\":\"1\",\"certTypes\":\"111\",\"certificateNos\":\"341122198804270428\",\"defineEventType\":\"196893\",\"eventId\":\"ec091e3c4bafd53b4f88563f28926ec1\",\"eventType\":\"541200060\",\"eventTypeName\":\"\",\"extEventCardNo\":\"5876663983160\",\"extEventInOut\":\"1\",\"extEventPictureURL\":\"/pic?0d9c111c1a7do-4el*61-821o9=6211*8l7=9180*7668406=6137*=t114**ps5=0*8b9=559838d9837373-b101of-5pi4dc3=68=25c\",\"extEventReaderID\":\"1\",\"extEventReaderKind\":\"0\",\"gateIndex\":\"\",\"gateName\":\"\",\"happenTime\":\"2025-05-08T09:33:24.000+08:00\",\"inOrOut\":\"0\",\"invoicesIds\":\"9857A54DAD5947EDB032575ECDD9EA4B833eb84a3b2b49cda6cc5b24837e747f\",\"parkIndex\":\"\",\"parkName\":\"\",\"phones\":\"15056231084\",\"plateNos\":\"鐨朅90LL0\",\"regionName\":\"瀹夋嘲鐗╂祦\",\"srcIndex\":\"ccba405a829d4814a3e050f9db0c6977\",\"srcName\":\"瑗块棬浜鸿鍏ュ彛_闂╛1\",\"srcParentIndex\":\"c5cda4e972c54711a89a2b557bb0e6bc\",\"srcType\":\"door\",\"svrIndexCode\":\"02591f1d-456e-4816-b988-72e7bed62129\",\"userType\":\"2\",\"visitorNames\":\"鏂芥棴杈塡"},\"targetPerson\":{\"certType\":\"111\",\"createTime\":\"2024-08-19T17:43:09.966+08:00\",\"jobNo\":\"13856591439\",\"mobile\":\"13856591439\",\"name\":\"闄堥缚椋瀄",\"orgId\":\"986364bf-7d4c-49a4-91c8-2818c65885f3\",\"orgPathName\":\"瀹夋嘲鐗╂祦鍥尯/瀹夋嘲鐗╂祦/淇℃伅宸ョ▼绉慭",\"personId\":\"a3b3381325834e55a18ede6f4eac9552\",\"personNumber\":\"13856591439\",\"pinyin\":\"chenhongfei\",\"sex\":\"1\",\"updateTime\":\"2025-04-03T15:18:21.721+08:00\",\"userName\":\"13856591439\"},\"visitorInformationList\":[{\"appointmentCode\":\"594451\",\"cardNo\":\"5876663983160\",\"certNo\":\"341122198804270428\",\"certType\":111,\"companionPerson\":\"0\",\"createTime\":\"2025-05-08T08:26:23.957+08:00\",\"faceUrl\":\"59f5ef5d9d374ef3896fdc1a551189c4\",\"phone\":\"15056231084\",\"plateNo\":\"鐨朅90LL0\",\"sex\":2,\"unit\":\"璞嗙背\",\"updateTime\":\"2025-05-08T09:33:17.148+08:00\",\"visitNum\":\"0\",\"visitorId\":\"5f3efa09d4114788ab46bc619a4950ee\",\"visitorName\":\"鏂芥棴杈塡"}],\"visitorInvoices\":{\"appointmentType\":\"3\",\"authIssueStatus\":\"1\",\"beginTime\":\"2025-05-08T08:24:50.000+08:00\",\"campusId\":\"root000000\",\"campusName\":\"榛樿鍥尯\",\"createTime\":\"2025-05-08T08:26:23.935+08:00\",\"extendJson\":\"\",\"finishTime\":\"2025-05-08T23:01:00.000+08:00\",\"ifInfoAbnormal\":\"0\",\"invoicesId\":\"9857A54DAD5947EDB032575ECDD9EA4B833eb84a3b2b49cda6cc5b24837e747f\",\"invoicesNo\":\"FK20250508080003\",\"invoicesStatus\":\"1\",\"isRepast\":\"0\",\"type\":\"0\",\"updateTime\":\"2025-05-08T09:33:12.509+08:00\",\"visitReason\":\"-1\",\"visitReasonName\":\"鍏朵粬\",\"visitTargetId\":\"a3b3381325834e55a18ede6f4eac9552\",\"workflowInitiatorId\":\"5f3efa09d4114788ab46bc619a4950ee\",\"workflowInitiatorType\":\"0\",\"workflowInstanceId\":\"a2397bfd491d440fabc24cedea8033f5\"}},\"eventId\":\"a3369228dc6b4e3ba212eeab6774e545\",\"eventType\":541200060,\"happenTime\":\"2025-05-08T09:33:27+08:00\",\"srcIndex\":\"9857A54DAD5947EDB032575ECDD9EA4B833eb84a3b2b49cda6cc5b24837e747f\",\"srcType\":\"9857A54DAD5947EDB032575ECDD9EA4B833eb84a3b2b49cda6cc5b24837e747f\",\"status\":0,\"timeout\":0}"); } @@ -691,6 +739,10 @@ LW_FK(0,"鍔冲姟璁垮"), PT_FK(1,"鏅�氳瀹�"), NB_FK(2,"鍐呴儴浜哄憳"), + + COMPANY_TYPE_REL(0,"鐩稿叧鏂圭粍缁�"), + COMPANY_TYPE_INTERNAL(1,"鍐呴儴浜哄憳"), + COMPANY_TYPE_FK(3,"璁垮"), /** 杩涘満绫诲瀷 **/ OUT(0,"鍑�"), @@ -974,6 +1026,25 @@ this.info = info; } } + public static String getChinesePingyin(String chinese) { + if(StringUtils.isBlank(chinese)){ + return null; + } + StringBuilder result = new StringBuilder(); + for (char ch : chinese.toCharArray()) { + String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(ch); + + // 濡傛灉瀛楃鏄腑鏂囷紝鍒欒幏鍙栧叾鎷奸煶鐨勯瀛楁瘝 + if (pinyinArray != null && pinyinArray.length > 0) { + result.append(pinyinArray[0].charAt(0)); + } else { + // 闈炰腑鏂囧瓧绗︾洿鎺ユ嫾鎺� + result.append(ch); + } + } + System.out.println(result.toString()); + return result.toString().toUpperCase(); + } /** * 鏈堝彴浣滀笟 鐘舵�� @@ -985,7 +1056,7 @@ WAIT_CALL(2, "宸茬鍒�","宸茬鍒�"), IN_WAIT(3, "鍏ュ洯绛夊緟","鍏ュ洯绛夊緟" ), CALLED(4, "宸插彨鍙�","宸插彨鍙�" ), - WORKING(5, "浣滀笟涓�","浣滀笟涓�" ), + WORKING(5, "浣滀笟涓�","浣滀笟涓�" ), DONE(6, "浣滀笟瀹屾垚 ","浣滀笟瀹屾垚" ), TRANSFERING(7, "杞Щ涓�","杞Щ涓�" ), EXCEPTION(8, "寮傚父鎸傝捣","寮傚父鎸傝捣" ), @@ -1162,8 +1233,8 @@ } public enum WxUrlParams { - BISCREEN_CODE(0,2, "0", "闂ㄥ彛澶у睆浜岀淮鐮�"), - MEETING_CODE(1,0, "1","浼氳瀹ゅぇ灞�"), + BISCREEN_CODE(0,0, "0", "闂ㄥ彛澶у睆浜岀淮鐮�"), + MEETING_CODE(1,2, "1","浼氳瀹ゅぇ灞�"), VISIT_RECORD_VISIT(2,1, "2","璁垮璁板綍-璁垮"), VISIT_RECORD_USER(3,2, "2","璁垮璁板綍-鍛樺伐"), VISIT_REPORT_RECORD_USER(5,2, "3","璁垮鎶ュ璁板綍-鍛樺伐"), @@ -1173,11 +1244,10 @@ PLATFORM_BOOK_DRIVER(9,0, "7","鐗╂祦杞﹂绾�-鍙告満"), PLATFORM_BOOK(10,2, "7","鐗╂祦杞﹂绾�-鍛樺伐"), PLATFORM_JOB_DRIVER(11,0, "8","鏈堝彴浣滀笟-鍙告満"), - PLATFORM_JOB_BOOK(12,2, "8","鏈堝彴浣滀笟-鍛樺伐"), ; // 鎴愬憳鍙橀噺 private int key; - private int type;//鐢ㄦ埛绫诲瀷 0鍙告満 1璁垮 2鍛樺伐 + private int type;//鐢ㄦ埛绫诲瀷 0鍙告満 1璁垮 2鍛樺伐 private String yw;//涓氬姟绫诲瀷 private String info;//璇存槑 @@ -1252,6 +1322,13 @@ IMPORT_TRAIMETIME(14, "瀵煎叆鍩硅鏈夋晥","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬鍏ュ煿璁湁鏁堛�戞搷浣�" ), BE_HEAD(15, "璁句负涓荤","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愯涓轰富绠°�戞搷浣�" ), NOT_HEAD(16, "鍙栨秷涓荤","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬彇娑堜富绠°�戞搷浣�" ), + MEET_BOOK_DEL(17, "鍒犻櫎浼氳瀹ょ敵璇�","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬垹闄や細璁鐢宠銆戞搷浣�,瀵硅薄淇℃伅${param3}" ), + VISIT_DEL(18, "鍒犻櫎璁垮鐢宠","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬垹闄よ瀹㈢敵璇枫��,瀵硅薄淇℃伅锛�${param3}" ), + VISIT_CAR_DEL(19, "鍒犻櫎璁垮鎶ュ","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬垹闄よ瀹㈡姤澶囥��,瀵硅薄淇℃伅锛�${param3}" ), + PLATFROM_BOOK_DEL(20, "鍒犻櫎鏈堝彴棰勭害浠诲姟","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬垹闄ゆ湀鍙伴绾︿换鍔°��,瀵硅薄淇℃伅锛�${param3}" ), + CAR_BOOK_DEL(21, "鍒犻櫎鍏溅鐢宠","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬垹闄ゅ叕杞︾敵璇枫��,瀵硅薄淇℃伅锛�${param3}"), + PLATFROM_JOB_DEL(22, "鍒犻櫎瀹夋嘲鐗╂祦浣滀笟浠诲姟","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬垹闄ゅ畨娉扮墿娴佷綔涓氫换鍔°��,瀵硅薄淇℃伅锛�${param3}" ), + HIDEN_DANGER_DEL(23, "鍒犻櫎闅愭偅闅忔墜鎷�","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬垹闄ら殣鎮i殢鎵嬫媿銆�,瀵硅薄淇℃伅锛�${param3}"), ; // 鎴愬憳鍙橀噺 @@ -1306,6 +1383,7 @@ HIDDEN_DANGER_SUBMIT(0, "闅愭偅闅忔墜鎷嶆彁鎶�", "闅愭偅闅忔墜鎷嶆彁鎶�"), HIDDEN_DANGER_DEAL_BEFORE(1, "闅愭偅闅忔墜鎷嶅鐞嗗墠", "闅愭偅闅忔墜鎷嶅鐞嗗墠"), HIDDEN_DANGER_DEAL_AFTER(2, "闅愭偅闅忔墜鎷嶅鐞嗗悗 ", "闅愭偅闅忔墜鎷嶅鐞嗗悗 "), + MEETING_BOOKS(4, "浼氳鏂囦欢 ", "浼氳鏂囦欢 "), ; // 鎴愬憳鍙橀噺 private String name; -- Gitblit v1.9.3