productDev/dmvisit.git

			@@ -39,13 +39,19 @@
			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" ;
			@@ -104,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" ;
			@@ -133,6 +140,11 @@
			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 WMS_TOTAL_STOCK_NUM ="WMS_TOTAL_STOCK_NUM" ;
			public static boolean DEALING_HK_SYNCPRIVILEGE= false;
			public static boolean DEALING_HK_SYNCDEVICE = false;
			public static boolean DEALING_HK_SYNCPLATFORM = false;
			@@ -145,6 +157,7 @@
			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_HK_NOTICE_LIST = false;
			public static boolean DEALING_FROM_HK_VISIT = false;
			public static boolean DEALING_HK_EMPOWER = false;
			public static boolean DEALING_HK_EMPOWER_DETAIL = false;
			@@ -240,6 +253,7 @@
			return null;
			}


			/**
			* 判断是否为有效车牌号
			*/
			@@ -297,10 +311,10 @@
			}
			int l = s.length();
			if(Constants.equalsInteger(l,7)){
			return s.substring(0,3)+"***"+s.substring(l-1,l);
			return s.substring(0,3)+"**"+s.substring(l-2,l);
			}
			if(l <= 8){
			return s.substring(0,3)+"****"+s.substring(l-1,l);
			return s.substring(0,3)+"***"+s.substring(l-2,l);
			}
			return s;
			}
			@@ -371,6 +385,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任务下载已结束
			@@ -421,7 +445,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;

			@@ -447,6 +473,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;
			}

			@@ -522,6 +564,7 @@
			int logisticsCarUse = 4;//物流车审批
			int system = 5;//系统消息
			int reason = 6;//入园原因
			int hknotice = 7;//海康考勤代办
			}


			@@ -603,8 +646,8 @@
			}

			public static void main(String[] args) {
			System.out.println(Constants.carCodeTuominStr("皖A10991"));
			System.out.println(Constants.carCodeTuominStr("皖AA10991"));
			System.out.println(Constants.checkCarNo("皖A10991"));
			System.out.println(Constants.checkCarNo("皖AA10991"));
			// System.out.println(Constants.getVehiclePlateNo("湘B140D17").getDescription());
			// System.out.println(Constants.getVehiclePlateNo("宿AP0637").getDescription());

			@@ -862,7 +905,7 @@
			CALLING(1, "叫号中","${param}请前往${param2}等待作业"),
			DONE(2, "作业完成","${param}作业完成，请尽快驶离" ),
			WRONG_IN(3, "错误停靠","${param}月台停靠错误，请尽快驶离" ),
			TIMEOUT_IN(4, "超时停靠","${param}月台停靠超时，请尽快驶离请尽快驶离" ),
			TIMEOUT_IN(4, "超时停靠","${param}月台停靠超时，请尽快驶离" ),
			TIMEOUT_WORK(5, "作业超时","${param}作业超时" ),
			;

			@@ -877,6 +920,7 @@
			this.info = info;
			this.name = name;
			}

			public static String getName(int index) {
			for (PlatformBroadcastContent c : PlatformBroadcastContent.values()) {
			if (c.getKey() == index) {
			@@ -913,7 +957,7 @@

			/**
			* 月台作业状态
			* 0待确认 1待签到 2等待叫号 3入园等待 4已叫号 5作业中 6作业完成 7转移中 8异常挂起 9已授权离园 10已离园 11 已过号
			* 0待确认 1待签到 2等待叫号 3入园等待 4已叫号 5作业中 6作业完成 7转移中 8异常挂起 9已授权离园 10已离园 11 已过号 12已取消
			*/
			public enum PlatformJobStatus {
			WAIT_CONFIRM(0, "待确认","待确认" ),