productDev/dmvisit.git

			@@ -17,6 +17,7 @@
			import com.doumee.core.utils.Constants;
			import com.doumee.core.utils.DESUtil;
			import com.doumee.core.utils.DateUtil;
			import com.doumee.core.utils.Utils;
			import com.doumee.dao.business.*;
			import com.doumee.dao.business.join.VisitsJoinMapper;
			import com.doumee.dao.business.model.*;
			@@ -43,6 +44,8 @@
			@Slf4j
			public class HkSyncPushServiceImpl extends HkSyncBaseServiceImpl {

			@Autowired
			private InoutDayCountMapper inoutDayCountMapper;
			@Autowired
			private InterfaceLogMapper interfaceLogMapper;
			@Autowired
			@@ -102,13 +105,14 @@
			List<DeviceEvent> list = new ArrayList<>();
			List<Integer> delRetentionLis = new ArrayList<>();
			List<Retention> retentionList = new ArrayList<>();
			InoutDayCount inoutDayCount = new InoutDayCount();
			for(EventAcsInfoRequest request : events){
			EventDeviceDataRequest model = request.getData();
			if(model ==null){
			continue;
			}
			//根据推送人员编码，处理在场、离场人员数据记录
			dealMemberDataByRequest(request,delRetentionLis,retentionList);
			dealMemberDataByRequest(request,delRetentionLis,retentionList,inoutDayCount);
			//封装门禁事件信息表对象
			list.add(getDeviceEventModelByRequest(request));
			}
			@@ -126,6 +130,7 @@
			//再插入最新的在厂人员
			retentionMapper.insert(retentionList);
			}
			dealInoutDayCountBiz(inoutDayCount);
			log.info("【海康门禁事件推送】========成功=======");
			}catch (Exception e) {
			log.error("【海康门禁事件推送】========失败=======：\n" + e.getMessage());
			@@ -136,6 +141,37 @@

			}

			private void dealInoutDayCountBiz(InoutDayCount param) {
			param.setTimeInfo(Utils.Date.getStart(new Date()));
			InoutDayCount model = inoutDayCountMapper.selectOne(new QueryWrapper<InoutDayCount>().lambda()
			.eq(InoutDayCount::getTimeInfo,param.getTimeInfo())
			.eq(InoutDayCount::getIsdeleted,Constants.ZERO)
			.last("limit 1"));
			if(model == null){
			param.setIsdeleted(Constants.ZERO);
			param.setCreateDate(new Date());
			param.setEditDate(new Date());
			inoutDayCountMapper.insert(param);
			}else{
			inoutDayCountMapper.update(null,new UpdateWrapper<InoutDayCount>().lambda()
			.eq(InoutDayCount::getId,model.getId() )
			.set(InoutDayCount::getEditDate,new Date() )
			.setSql(param.getInCarNum()!=null,"IN_CAR_NUM = ifnull(IN_CAR_NUM)"+param.getInCarNum() )
			.setSql(param.getOutCarNum()!=null,"OUT_CAR_NUM = ifnull(OUT_CAR_NUM)"+param.getOutCarNum() )
			.setSql(param.getInMemberNum()!=null,"IN_MEMBER_NUM = ifnull(IN_MEMBER_NUM)"+param.getInMemberNum() )
			.setSql(param.getOutMemberNum()!=null,"OUT_MEMBER_NUM = ifnull(OUT_MEMBER_NUM)"+param.getOutMemberNum() )
			.setSql(param.getInVisitorNum()!=null,"IN_VISITOR_NUM = ifnull(IN_VISITOR_NUM)"+param.getInVisitorNum() )
			.setSql(param.getOutVisitorNum()!=null,"OUT_VISITOR_NUM = ifnull(OUT_VISITOR_NUM)"+param.getOutVisitorNum() )
			.setSql(param.getSigninVisitorNum()!=null,"SIGNIN_VISITOR_NUM = ifnull(SIGNIN_VISITOR_NUM)"+param.getSigninVisitorNum() )
			.setSql(param.getLeaveVisitorNum()!=null,"LEAVE_VISITOR_NUM = ifnull(LEAVE_VISITOR_NUM)"+param.getLeaveVisitorNum() )
			.setSql(param.getInOtherMemberNum()!=null,"IN_OTHER_MEMBER_NUM = ifnull(IN_OTHER_MEMBER_NUM)"+param.getInOtherMemberNum() )
			.setSql(param.getOutOtherMemberNum()!=null,"OUT_OTHER_MEMBER_NUM = ifnull(OUT_OTHER_MEMBER_NUM)"+param.getOutOtherMemberNum() )
			.setSql(param.getInSelfMemberNum()!=null,"IN_SELF_MEMBER_NUM = ifnull(IN_SELF_MEMBER_NUM)"+param.getInSelfMemberNum() )
			.setSql(param.getOutSelfMemberNum()!=null,"OUT_SELF_MEMBER_NUM = ifnull(OUT_SELF_MEMBER_NUM)"+param.getOutSelfMemberNum() )
			);
			}
			}

			/**
			* 根据推送人员编码，处理在场、离场人员数据记录
			* @param request

	server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/InoutDayCount.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -74,7 +74,7 @@

			@ApiModelProperty(value = "访客登记人次", example = "1")
			@ExcelColumn(name="访客登记人次")
			private Integer singinVisitorNum;
			private Integer signinVisitorNum;

			@ApiModelProperty(value = "访客签离人次", example = "1")
			@ExcelColumn(name="访客签离人次")
			@@ -82,11 +82,11 @@

			@ApiModelProperty(value = "相关方入园人次", example = "1")
			@ExcelColumn(name="相关方入园人次")
			private Integer inOrtherMemberNum;
			private Integer inOtherMemberNum;

			@ApiModelProperty(value = "相关方出园人次", example = "1")
			@ExcelColumn(name="相关方出园人次")
			private Integer outOrtherMemberNum;
			private Integer outOtherMemberNum;

			@ApiModelProperty(value = "内部人员入园人次", example = "1")
			@ExcelColumn(name="内部人员入园人次")