productDev/dmvisit.git

			@@ -114,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" ;
			@@ -150,6 +151,8 @@
			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;
			@@ -410,15 +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;
			int unknown = 6;
			//作业类型 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;//货运司机
			}


			@@ -565,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;//海康考勤代办
			}


			public static Integer approveTypeToNoticeType(Integer approveType){
			@@ -588,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;//海康考勤代办
			}


			public interface approveStatus{
			@@ -685,53 +718,8 @@
			// System.out.println(Constants.getVehiclePlateNo("湘B140D17").getDescription());
			// System.out.println(Constants.getVehiclePlateNo("宿AP0637").getDescription());

			System.out.println("<script> SELECT \n" +
			"t1.REALNAME `REALNAME`,\n" +
			"MAX(t1.`01`) `januaryCount`,\n" +
			"MAX(t1.`02`) `februaryCount`,\n" +
			"MAX(t1.`03`) `marchCount`,\n" +
			"MAX(t1.`04`) `aprilCount`,\n" +
			"MAX(t1.`05`) `mayCount`,\n" +
			"MAX(t1.`06`) `juneCount`,\n" +
			"MAX(t1.`07`) `julyCount`,\n" +
			"MAX(t1.`08`) `augustCount`,\n" +
			"MAX(t1.`09`) `septemberCount`,\n" +
			"MAX(t1.`10`) `octoberCount`,\n" +
			"MAX(t1.`11`) `novemberCount`,\n" +
			"MAX(t1.`12`) `decemberCount`\n" +
			"FROM(\n" +
			"SELECT \n" +
			"t.id,\n" +
			"t.REALNAME,\n" +
			"CASE WHEN t.yue='01' THEN t.c ELSE 0 END AS `01`,\n" +
			"CASE WHEN t.yue='02' THEN t.c ELSE 0 END AS `02`,\n" +
			"CASE WHEN t.yue='03' THEN t.c ELSE 0 END AS `03`,\n" +
			"CASE WHEN t.yue='04' THEN t.c ELSE 0 END AS `04`,\n" +
			"CASE WHEN t.yue='05' THEN t.c ELSE 0 END AS `05`,\n" +
			"CASE WHEN t.yue='06' THEN t.c ELSE 0 END AS `06`,\n" +
			"CASE WHEN t.yue='07' THEN t.c ELSE 0 END AS `07`,\n" +
			"CASE WHEN t.yue='08' THEN t.c ELSE 0 END AS `08`,\n" +
			"CASE WHEN t.yue='09' THEN t.c ELSE 0 END AS `09`,\n" +
			"CASE WHEN t.yue='10' THEN t.c ELSE 0 END AS `10`,\n" +
			"CASE WHEN t.yue='11' THEN t.c ELSE 0 END AS `11`,\n" +
			"CASE WHEN t.yue='12' THEN t.c ELSE 0 END AS `12` \n" +
			"FROM \n" +
			"(SELECT \n" +
			"su.id,\n" +
			"su.REALNAME,\n" +
			"DATE_FORMAT(b.START_TIME,'%m') yue,\n" +
			"SUM(" +
			"CONVERT( (UNIX_TIMESTAMP(b.END_TIME) - UNIX_TIMESTAMP(b.START_TIME))/(60*60), DECIMAL(5,1))) c\n" +
			"FROM \n" +
			"meeting_user_rel ur\n" +
			"LEFT JOIN `SYSTEM_USER` su ON ur.USER_ID = su.id \n" +
			"LEFT JOIN meeting_book b ON ur.OBJ_ID = b.id \n" +
			"WHERE DATE_FORMAT(b.START_TIME,'%Y') = #{yearNum} AND b.STATUS = 0" +
			"<if test='userId != null'>"+
			"and ur.USER_ID = #{userId}\n" +
			"</if>"+
			"GROUP BY su.id, DATE_FORMAT(b.START_TIME,'%m')) t) t1 GROUP BY t1.id" +
			"</script>");
			System.out.println( "{\"data\":{\"paramValues\":{\"accessType\":\"2\",\"certTypes\":\"111\",\"certificateNos\":\"340122199904297373\",\"defineEventType\":\"771760131\",\"eventId\":\"6eb4a18bf3744c4385adb37eecdc9d37_634acece3fcf0_3d87\",\"eventType\":\"541200060\",\"eventTypeName\":\"\",\"extEventCardNo\":\"\",\"extEventPictureURL\":\"/pic?9d9c568c1a2do-4el71-871o9=15247l9=05073607416=7147=t212*ps5=28b9=559838d9837371-b162of-5pi2dc3=88=20c\",\"extEventReaderID\":\"\",\"extEventReaderKind\":\"\",\"gateIndex\":\"fc92c663ffb9420994f2574469f35e2d\",\"gateName\":\"安泰西门\",\"happenTime\":\"2025-05-09T13:06:13.000+08:00\",\"inOrOut\":\"0\",\"invoicesIds\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"parkIndex\":\"1c4cdb8b66ed4c23bacb385c3fb6c46b\",\"parkName\":\"停车场\",\"phones\":\"19956520776\",\"plateNos\":\"皖AAA1652\",\"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\":\"18055162696\",\"mobile\":\"18055162696\",\"name\":\"朱之萌\",\"orgId\":\"d815b989-877a-40e7-8f34-a5388295a3d2\",\"orgPathName\":\"安泰物流园区/安泰物流/综合管理科\",\"personId\":\"1d8d42233bce4722a741917de4195084\",\"personNumber\":\"18055162696\",\"pinyin\":\"zhuzhimeng\",\"sex\":\"1\",\"updateTime\":\"2025-05-09T11:20:42.000+08:00\",\"userName\":\"18055162696\"},\"visitorInformationList\":[{\"appointmentCode\":\"947384\",\"cardNo\":\"6206767065588\",\"certNo\":\"340122199904297373\",\"certType\":111,\"companionPerson\":\"0\",\"createTime\":\"2025-05-09T13:04:26.740+08:00\",\"faceUrl\":\"2ffa5b542ec2448f9033e6901b326f44\",\"phone\":\"19956520776\",\"plateNo\":\"皖AAA1652\",\"sex\":1,\"unit\":\"安徽东百保安服务有限公司\",\"updateTime\":\"2025-05-09T13:05:36.472+08:00\",\"visitNum\":\"0\",\"visitorId\":\"6424f11498de48228fb2a418d3fc3bb1\",\"visitorName\":\"俞扬\"}],\"visitorInvoices\":{\"appointmentType\":\"3\",\"authIssueStatus\":\"1\",\"beginTime\":\"2025-05-09T13:01:00.000+08:00\",\"campusId\":\"root000000\",\"campusName\":\"默认园区\",\"createTime\":\"2025-05-09T13:04:26.693+08:00\",\"extendJson\":\"\",\"finishTime\":\"2025-05-09T14:01:00.000+08:00\",\"ifInfoAbnormal\":\"0\",\"invoicesId\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"invoicesNo\":\"FK20250509130002\",\"invoicesStatus\":\"1\",\"isRepast\":\"0\",\"type\":\"0\",\"updateTime\":\"2025-05-09T13:05:30.372+08:00\",\"visitReason\":\"-1\",\"visitReasonName\":\"其他\",\"visitTargetId\":\"1d8d42233bce4722a741917de4195084\",\"workflowInitiatorId\":\"6424f11498de48228fb2a418d3fc3bb1\",\"workflowInitiatorType\":\"0\",\"workflowInstanceId\":\"7010a8521de54f088331e7176b82fd10\"}},\"eventId\":\"b5024c7b6c8b4b5587baf42dc5bce025\",\"eventType\":541200060,\"happenTime\":\"2025-05-09T13:06:14+08:00\",\"srcIndex\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"srcType\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"status\":0,\"timeout\":0}");
			System.out.println("{\"data\":{\"paramValues\":{\"accessType\":\"2\",\"certTypes\":\"111\",\"certificateNos\":\"340122199904297373\",\"defineEventType\":\"771760134\",\"eventId\":\"6cf8a9b5cb614bddb74f338701975ade_634ad693b6b33_3db4\",\"eventType\":\"541200060\",\"eventTypeName\":\"\",\"extEventCardNo\":\"\",\"extEventPictureURL\":\"/pic?9d9c568c1a2do-4el81-8919o3=55634l0=0206706794t6=318ps==515b=5698*8d9835393-b9667f-1pi1dco=852c2=083\",\"extEventReaderID\":\"\",\"extEventReaderKind\":\"\",\"gateIndex\":\"fc92c663ffb9420994f2574469f35e2d\",\"gateName\":\"安泰西门\",\"happenTime\":\"2025-05-09T13:40:59.000+08:00\",\"inOrOut\":\"1\",\"invoicesIds\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"parkIndex\":\"1c4cdb8b66ed4c23bacb385c3fb6c46b\",\"parkName\":\"停车场\",\"phones\":\"19956520776\",\"plateNos\":\"皖AAA1652\",\"srcIndex\":\"6cf8a9b5cb614bddb74f338701975ade\",\"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\":\"18055162696\",\"mobile\":\"18055162696\",\"name\":\"朱之萌\",\"orgId\":\"d815b989-877a-40e7-8f34-a5388295a3d2\",\"orgPathName\":\"安泰物流园区/安泰物流/综合管理科\",\"personId\":\"1d8d42233bce4722a741917de4195084\",\"personNumber\":\"18055162696\",\"pinyin\":\"zhuzhimeng\",\"sex\":\"1\",\"updateTime\":\"2025-05-09T11:20:42.000+08:00\",\"userName\":\"18055162696\"},\"visitorInformationList\":[{\"appointmentCode\":\"947384\",\"cardNo\":\"6206767065588\",\"certNo\":\"340122199904297373\",\"certType\":111,\"companionPerson\":\"0\",\"createTime\":\"2025-05-09T13:04:26.740+08:00\",\"faceUrl\":\"2ffa5b542ec2448f9033e6901b326f44\",\"phone\":\"19956520776\",\"plateNo\":\"皖AAA1652\",\"sex\":1,\"unit\":\"安徽东百保安服务有限公司\",\"updateTime\":\"2025-05-09T13:05:36.472+08:00\",\"visitNum\":\"0\",\"visitorId\":\"6424f11498de48228fb2a418d3fc3bb1\",\"visitorName\":\"俞扬\"}],\"visitorInvoices\":{\"appointmentType\":\"3\",\"authIssueStatus\":\"1\",\"beginTime\":\"2025-05-09T13:01:00.000+08:00\",\"campusId\":\"root000000\",\"campusName\":\"默认园区\",\"createTime\":\"2025-05-09T13:04:26.693+08:00\",\"extendJson\":\"\",\"finishTime\":\"2025-05-09T14:01:00.000+08:00\",\"ifInfoAbnormal\":\"0\",\"invoicesId\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"invoicesNo\":\"FK20250509130002\",\"invoicesStatus\":\"5\",\"isRepast\":\"0\",\"type\":\"0\",\"updateTime\":\"2025-05-09T13:41:00.369+08:00\",\"visitReason\":\"-1\",\"visitReasonName\":\"其他\",\"visitTargetId\":\"1d8d42233bce4722a741917de4195084\",\"workflowInitiatorId\":\"6424f11498de48228fb2a418d3fc3bb1\",\"workflowInitiatorType\":\"0\",\"workflowInstanceId\":\"7010a8521de54f088331e7176b82fd10\"}},\"eventId\":\"2bb6700a9e4f48849227100243f470b2\",\"eventType\":541200060,\"happenTime\":\"2025-05-09T13:41:00+08:00\",\"srcIndex\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"srcType\":\"9857A54DAD5947EDB032575ECDD9EA4Bf4ebb8b61e344cd09118bfbdb5ff285c\",\"status\":0,\"timeout\":0}");
			}


			@@ -751,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,"出"),
			@@ -1391,6 +1383,7 @@
			HIDDEN_DANGER_SUBMIT(0, "隐患随手拍提报", "隐患随手拍提报"),
			HIDDEN_DANGER_DEAL_BEFORE(1, "隐患随手拍处理前", "隐患随手拍处理前"),
			HIDDEN_DANGER_DEAL_AFTER(2, "隐患随手拍处理后 ", "隐患随手拍处理后 "),
			MEETING_BOOKS(4, "会议文件 ", "会议文件 "),
			;
			// 成员变量
			private String name;