productDev/dmvisit.git

			@@ -26,6 +26,7 @@
			import com.doumee.dao.business.model.*;
			import com.doumee.dao.business.model.Member;
			import com.doumee.dao.web.reqeust.SavePlatformWarnEventDTO;
			import com.doumee.dao.web.response.platformReport.CarmeraListVO;
			import com.doumee.service.business.VisitsService;
			import com.doumee.service.business.impl.JkCabinetGridServiceImpl;
			import com.doumee.service.business.impl.PlatformWarnEventServiceImpl;
			@@ -37,6 +38,7 @@
			import org.apache.commons.lang3.StringUtils;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.data.redis.core.RedisTemplate;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.util.CollectionUtils;
			@@ -156,8 +158,9 @@
			}
			if(delRetentionLis.size()>0){
			//先删除原有的在场人员(内部人员）
			//@ApiModelProperty(value = "类型 0劳务访客 1普通访客 2内部员工 3车辆信息 4相关方人员 5货运司机 ")
			retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
			// .eq(Retention::getType,Constants.memberType.internal)
			.ne(Retention::getType,Constants.THREE)
			.in(Retention::getMemberId,delRetentionLis));
			}
			if(retentionList.size()>0){
			@@ -482,7 +485,7 @@
			for(EventBaseInfoRequest request : events){
			Warning warning = warningMapper.selectOne(new QueryWrapper<Warning>().lambda()
			.eq(Warning::getIsdeleted,Constants.ZERO)
			.eq(Warning::getCode, request.getSrcType()).last("limit 1"));
			.eq(Warning::getCode, request.getEventType()).last("limit 1"));

			Constants.WarningConfig warningConfig = Constants.WarningConfig.getConfig(request.getEventType());

			@@ -497,26 +500,30 @@
			warningEvent.setEventId(request.getEventId());
			warningEvent.setEventType(request.getEventType().toString());
			warningEvent.setHappenTime(request.getHappenTime());
			warningEvent.setJsonContent(request.getData().toJSONString());
			if(Objects.nonNull(request.getData())){
			warningEvent.setJsonContent(request.getData().toJSONString());
			}
			warningEvent.setSrcIndex(request.getSrcIndex());
			warningEvent.setSrcType(request.getSrcType());
			warningEvent.setSrcName(request.getSrcName());
			warningEvent.setWarningId(warning.getId());
			warningEvent.setDeviceId(request.getSrcIndex());
			warningEvent.setRegion(this.getRegionsName(warningEvent.getSrcIndex(),warning.getType()));
			warningEventMapper.insert(warningEvent);

			if(Objects.nonNull(warningConfig)){
			List<Integer> ruleIdList = impl.processWarnFront(warningConfig);

			Boolean falg = false;

			Boolean falg = true;
			if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ruleIdList)){
			for (Integer ruleId:ruleIdList) {
			Set<Integer> ruleIdSet = new HashSet<>(ruleIdList);
			for (Integer ruleId:ruleIdSet) {
			WarningRule warningRule = warningRuleMapper.selectById(ruleId);
			if (Objects.isNull(warningRule)) {
			break;
			}
			List<Member> memberList = impl.getWarningRuleMemberList(warningRule);
			if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(memberList)) {
			break;
			}
			try {
			WarningPush warningPush = new WarningPush();
			warningPush.setCreateDate(new Date());
			@@ -527,48 +534,35 @@
			warningPush.setContent(content);
			warningPush.setStatus(Constants.ZERO);
			warningPush.setPushType(Constants.ZERO);
			//TODO 根据具体数据对比获取
			warningPush.setRegion( "未知位置");
			warningPush.setMemberIds(
			StringUtils.join(memberList.stream().map(i -> i.getId()).collect(Collectors.toList()), ",")
			);
			warningPush.setMemberIds(
			StringUtils.join(memberList.stream().map(i -> i.getId()).collect(Collectors.toList()), ",")
			);
			warningPush.setMemberNames(StringUtils.join(memberList.stream().map(i -> i.getName()).collect(Collectors.toList()), ",")
			);

			warningPush.setRegion( warningEvent.getRegion());
			if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(memberList)) {
			warningPush.setMemberIds(
			StringUtils.join(memberList.stream().map(i -> i.getId()).collect(Collectors.toList()), ",")
			);
			warningPush.setMemberNames(StringUtils.join(memberList.stream().map(i -> i.getName()).collect(Collectors.toList()), ",")
			);
			}
			if(Constants.equalsInteger(warningRule.getMemberNotice(),Constants.ONE)){
			// Boolean noticeFlag = dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
			// StringUtils.join(memberList.stream().filter(i->StringUtils.isNotBlank(i.getDdId())).map(i->i.getDdId()).collect(Collectors.toList()),","),
			// dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),warningConfig.getInfo()));
			// warningPush.setStatus(noticeFlag?Constants.ONE:Constants.TWO);
			}
			warningPushMapper.insert(warningPush);
			impl.sendDeviceNotice(warningRule);
			warningPushMapper.insert(warningPush);

			falg = true;
			}catch (Exception e){
			falg = false;
			warningEvent.setStatus(Constants.TWO);
			warningEventMapper.updateById(warningEvent);
			}
			}
			}
			if(falg){
			if(!falg){
			warningEvent.setStatus(Constants.ONE);
			warningEventMapper.updateById(warningEvent);
			}






			}




			}

			}
			@@ -579,9 +573,64 @@
			}
			saveInterfaceLog(param,"/business/hksync/push/notice",result,true);
			return null;

			}

			@Autowired
			private RedisTemplate<String,Object> stringRedisTemplate;

			public String getRegionsName(String srcIndex,Integer warningType){
			log.error("【匹配设备与区域关系信息】========开始=======："+srcIndex);
			String regionName = "未知区域";
			if(StringUtils.isBlank(srcIndex)){
			return regionName;
			}
			try{
			if(Constants.equalsInteger(warningType,Constants.ZERO)){
			List<CarmeraListVO> carmeraListVOList = (List<CarmeraListVO>) stringRedisTemplate.opsForValue().get(Constants.RedisKeys.HK_CAMERAS);//所有监控点数据
			if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(carmeraListVOList)){
			if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(carmeraListVOList)){
			for (CarmeraListVO c:carmeraListVOList) {
			if(c.getIndexCode().equals(srcIndex)){
			log.error("【监控区域匹配结果】===============："+c.getRegionName());
			return c.getRegionName();
			}
			}
			}
			}
			}else{
			List<CarmeraListVO> fireDeviceListVOList = (List<CarmeraListVO>) stringRedisTemplate.opsForValue().get(Constants.RedisKeys.HK_FIRE_DEVICE);//所有消防设备数据
			List<CarmeraListVO> sensorListVOList = (List<CarmeraListVO>) stringRedisTemplate.opsForValue().get(Constants.RedisKeys.HK_SENSOR);//所有传感器
			if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(fireDeviceListVOList)){
			if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(fireDeviceListVOList)){
			for (CarmeraListVO c:fireDeviceListVOList) {
			if(c.getIndexCode().equals(srcIndex)){
			log.error("【消防区域匹配结果】===============："+c.getRegionName());
			return c.getRegionName();
			}
			}
			}
			}

			if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(sensorListVOList)){
			if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(sensorListVOList)){
			for (CarmeraListVO c:sensorListVOList) {
			if(c.getIndexCode().equals(srcIndex)){
			log.error("【传感器区域匹配结果】==============："+c.getRegionName());
			return c.getRegionName();
			}
			}
			}
			}
			}

			}catch (Exception e){
			e.printStackTrace();
			}
			log.error("【匹配设备与区域关系信息】========结束=======："+srcIndex);
			return regionName;
			}


			/**
			* 海康访客事件推送
			* @param param