~liusuyi/ruoyi-api.git

			@@ -33,7 +33,9 @@
			import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
			import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
			import com.ruoyi.common.constant.CacheConstants;
			import com.ruoyi.common.core.domain.entity.SysConfig;
			import com.ruoyi.common.core.redis.RedisCache;
			import com.ruoyi.common.utils.ConfigUtils;
			import com.ruoyi.common.utils.DateUtils;
			import com.ruoyi.common.utils.DictUtils;
			import com.ruoyi.common.utils.StringUtils;
			@@ -389,20 +391,20 @@
			// globalAlarmDataList.add(globalAlarmData);
			//}
			//return globalAlarmDataList;
			//从数据库获取
			List<ArdAlarmRadarMove> ardAlarmRadarMoves = ardAlarmRadarMoveMapper.selectListAllByCommand(refreshTime);
			return ardAlarmRadarMoves.stream()
			.map(ardAlarmRadarMove -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmRadarMove.getId())
			.setName(ardAlarmRadarMove.getName())
			.setAlarmTime(ardAlarmRadarMove.getAlarmTime())
			.setLongitude(ardAlarmRadarMove.getLongitude())
			.setLatitude(ardAlarmRadarMove.getLatitude())
			.setCount(ardAlarmRadarMove.getCount())
			.setTotal(ardAlarmRadarMove.getTotal());
			return globalAlarmData;
			}).collect(Collectors.toList());
			//从数据库获取
			List<ArdAlarmRadarMove> ardAlarmRadarMoves = ardAlarmRadarMoveMapper.selectListAllByCommand(refreshTime);
			return ardAlarmRadarMoves.stream()
			.map(ardAlarmRadarMove -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmRadarMove.getId())
			.setName(ardAlarmRadarMove.getName())
			.setAlarmTime(ardAlarmRadarMove.getAlarmTime())
			.setLongitude(ardAlarmRadarMove.getLongitude())
			.setLatitude(ardAlarmRadarMove.getLatitude())
			.setCount(ardAlarmRadarMove.getCount())
			.setTotal(ardAlarmRadarMove.getTotal());
			return globalAlarmData;
			}).collect(Collectors.toList());
			case 1004:
			List<ArdAlarmRadarFire> ardAlarmRadarFires = ardAlarmRadarFireMapper.selectListAllByCommand(refreshTime);
			return ardAlarmRadarFires.stream()
			@@ -987,13 +989,13 @@
			break;
			case "radar":
			//region 处理雷达报警
			String mergeTime = ConfigUtils.getConfigValue("radarMergeTime");
			Integer radarMergeTime= mergeTime==null\|\|"".equals(mergeTime)?10:Integer.valueOf(mergeTime);
			RadarAlarmData radarAlarmData = JSONObject.parseObject(message, RadarAlarmData.class);
			List<ArdAlarmRadar> ardAlarmRadars = radarAlarmData.getArdAlarmRadars();
			List<ArdAlarmRadarMove> ardAlarmRadarMoves = new ArrayList<>();
			List<ArdAlarmRadarFire> ardAlarmRadarFires = new ArrayList<>();
			List<ArdAlarmRadarPump> ardAlarmRadarPumps = new ArrayList<>();
			for (ArdAlarmRadar ardAlarmRadar : ardAlarmRadars) {
			String uuid = IdUtils.simpleUUID();
			String radarId = radarAlarmData.getRadarId();
			String alarmpointName = ardAlarmRadar.getName();//兴趣点名称
			Double longitude = ardAlarmRadar.getLongitude();
			Double latitude = ardAlarmRadar.getLatitude();
			@@ -1009,9 +1011,31 @@
			ardAlarmRadarMove.setAlarmType("运动目标检测");
			ardAlarmRadarMove.setLongitude(longitude);
			ardAlarmRadarMove.setLatitude(latitude);
			//入库
			ardAlarmRadarMoveMapper.insertArdAlarmRadarMove(ardAlarmRadarMove);
			ardAlarmRadarMoves.add(ardAlarmRadarMove);
			ardAlarmRadarMove.setUpdateTime(radarAlarmData.getAlarmTime());
			ardAlarmRadarMove.setRadarId(radarId);
			//获取当前兴趣点当前雷达的上一条数据
			ArdAlarmRadarMove lastMoveData = ardAlarmRadarMoveMapper.selectArdAlarmRadarLastData(ardAlarmRadarMove.getName());
			if (lastMoveData == null) {
			//入库
			ardAlarmRadarMoveMapper.insertArdAlarmRadarMove(ardAlarmRadarMove);
			radarMoveGuide(ardAlarmRadarMove);//引导
			} else {
			//否则比对更新时间
			Date lastUpdateTime = lastMoveData.getUpdateTime();
			Date alarmTime = ardAlarmRadarMove.getAlarmTime();
			long secDatePoor = DateUtils.getSecDatePoor(alarmTime,lastUpdateTime);
			if (secDatePoor <= radarMergeTime) {
			//小于10秒的新数据，更新上一条
			ArdAlarmRadarMove updateData = new ArdAlarmRadarMove();
			updateData.setId(lastMoveData.getId());
			updateData.setUpdateTime(alarmTime);
			ardAlarmRadarMoveMapper.updateArdAlarmRadarMove(updateData);
			} else {
			//超过10秒的数据,入库
			ardAlarmRadarMoveMapper.insertArdAlarmRadarMove(ardAlarmRadarMove);
			radarMoveGuide(ardAlarmRadarMove);//引导
			}
			}
			//入缓存
			//String key = "radar_alarm:" + DateUtils.getDate();
			//if (redisCache.hasKey(key)) {
			@@ -1031,34 +1055,74 @@
			ardAlarmRadarFire.setAlarmType("热源检测");
			ardAlarmRadarFire.setLongitude(longitude);
			ardAlarmRadarFire.setLatitude(latitude);
			//入库
			ardAlarmRadarFireMapper.insertArdAlarmRadarFire(ardAlarmRadarFire);
			ardAlarmRadarFires.add(ardAlarmRadarFire);
			ardAlarmRadarFire.setRadarId(radarId);
			ardAlarmRadarFire.setUpdateTime(radarAlarmData.getAlarmTime());
			//
			ArdAlarmRadarFire lastFireData = ardAlarmRadarFireMapper.selectArdAlarmRadarLastData(ardAlarmRadarFire.getName());
			if (lastFireData == null) {
			//入库

			ardAlarmRadarFireMapper.insertArdAlarmRadarFire(ardAlarmRadarFire);
			radarFireGuide(ardAlarmRadarFire);//引导
			} else {
			//否则比对更新时间
			Date lastUpdateTime = lastFireData.getUpdateTime();
			Date alarmTime = ardAlarmRadarFire.getAlarmTime();
			long secDatePoor = DateUtils.getSecDatePoor(alarmTime,lastUpdateTime);
			if (secDatePoor <= radarMergeTime) {
			//小于10秒的新数据，更新上一条
			ArdAlarmRadarFire updateData = new ArdAlarmRadarFire();
			updateData.setId(lastFireData.getId());
			updateData.setUpdateTime(alarmTime);
			ardAlarmRadarFireMapper.updateArdAlarmRadarFire(updateData);
			} else {
			//超过10秒的数据,入库
			ardAlarmRadarFireMapper.insertArdAlarmRadarFire(ardAlarmRadarFire);
			radarFireGuide(ardAlarmRadarFire);//引导
			}
			}
			break;
			case "雷达抽油机停机":
			ArdAlarmRadarPump ardAlarmRadarPump = new ArdAlarmRadarPump();
			ardAlarmRadarPump.setRadarId(radarId);
			ardAlarmRadarPump.setId(uuid);
			ardAlarmRadarPump.setTargetId(targetId);
			ardAlarmRadarPump.setAlarmTime(radarAlarmData.getAlarmTime());
			ardAlarmRadarPump.setCreateTime(new Date());
			ardAlarmRadarPump.setName(ardAlarmRadar.getName() + "(" + radarAlarmData.getRadarName() + ")");
			ardAlarmRadarPump.setAlarmType("雷达抽油机停机");
			ardAlarmRadarPump.setUpdateTime(radarAlarmData.getAlarmTime());
			ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
			if (StringUtils.isNotNull(ardAlarmpointsWell)) {
			ardAlarmRadarPump.setLongitude(ardAlarmpointsWell.getLongitude());
			ardAlarmRadarPump.setLatitude(ardAlarmpointsWell.getLatitude());
			}
			//入库
			ardAlarmRadarPumpMapper.insertArdAlarmRadarPump(ardAlarmRadarPump);
			ardAlarmRadarPumps.add(ardAlarmRadarPump);

			//
			ArdAlarmRadarPump lastPumpData = ardAlarmRadarPumpMapper.selectArdAlarmRadarLastData(ardAlarmRadarPump.getName());
			if (lastPumpData == null) {
			//入库
			ardAlarmRadarPumpMapper.insertArdAlarmRadarPump(ardAlarmRadarPump);
			radarPumpGuide(ardAlarmRadarPump);//引导
			} else {
			//否则比对更新时间
			Date lastUpdateTime = lastPumpData.getUpdateTime();
			Date alarmTime = ardAlarmRadarPump.getAlarmTime();
			long secDatePoor = DateUtils.getSecDatePoor(alarmTime,lastUpdateTime);
			if (secDatePoor <= radarMergeTime) {
			//小于10秒的新数据，更新上一条
			ArdAlarmRadarPump updateData = new ArdAlarmRadarPump();
			updateData.setId(lastPumpData.getId());
			updateData.setUpdateTime(alarmTime);
			ardAlarmRadarPumpMapper.updateArdAlarmRadarPump(updateData);
			} else {
			//超过10秒的数据,入库
			ardAlarmRadarPumpMapper.insertArdAlarmRadarPump(ardAlarmRadarPump);
			radarPumpGuide(ardAlarmRadarPump);//引导
			}
			}
			break;
			}
			}
			radarMoveGuide(ardAlarmRadarMoves, radarAlarmData);
			radarFireGuide(ardAlarmRadarFires, radarAlarmData);
			radarPumpGuide(ardAlarmRadarPumps, radarAlarmData);
			//endregion
			break;
			case "external":
			@@ -1134,7 +1198,7 @@
			ArdAlarmDigitization3 ardAlarmDigitization3 = JSONObject.parseObject(message, ArdAlarmDigitization3.class);
			//获取经纬度
			ArdAlarmpointsWell Well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(ardAlarmDigitization3.getWellNo());
			if(Well!=null) {
			if (Well != null) {
			ardAlarmDigitization3.setLongitude(Well.getLongitude());
			ardAlarmDigitization3.setLatitude(Well.getLatitude());
			ardAlarmDigitization3.setAltitude(Well.getAltitude());
			@@ -1276,8 +1340,7 @@
			return minDistanceCameraId;
			}


			//雷达引导入队(获取相机)
			//雷达获取相机引导入队
			private void radarGuideToQueue(String alarmId, String radarId, String name, String alarmType, Date createTime, double[] coordinate) {
			int index = name.indexOf("(");
			String alarmpointName = name.substring(0, index);
			@@ -1304,6 +1367,7 @@
			log.debug("未获取到报警点关联的光电");
			}
			}

			//雷达移动引导
			private void radarMoveGuide(List<ArdAlarmRadarMove> ardAlarmRadarMoves, RadarAlarmData radarAlarmData) {
			//按兴趣点去重,然后按引导逻辑进行引导入队
			@@ -1357,6 +1421,16 @@
			}
			//endregion
			}
			private void radarMoveGuide(ArdAlarmRadarMove ardAlarmRadarMove) {
			if (StringUtils.isNull(ardAlarmRadarMove.getLongitude()) \|\| StringUtils.isNull(ardAlarmRadarMove.getLatitude())) {
			log.debug("坐标为空不引导");
			return;
			}
			double[] coordinate = new double[]{ardAlarmRadarMove.getLongitude(), ardAlarmRadarMove.getLatitude()};//报警坐标
			//引导入队
			radarGuideToQueue(ardAlarmRadarMove.getId(), ardAlarmRadarMove.getRadarId(), ardAlarmRadarMove.getName(), ardAlarmRadarMove.getAlarmType(), ardAlarmRadarMove.getCreateTime(), coordinate);//更新
			}

			//雷达防火引导
			private void radarFireGuide(List<ArdAlarmRadarFire> ardAlarmRadarFires, RadarAlarmData radarAlarmData) {
			//按兴趣点去重,然后按引导逻辑进行引导入队
			@@ -1409,6 +1483,15 @@
			}
			//endregion
			}
			private void radarFireGuide(ArdAlarmRadarFire ardAlarmRadarFire) {
			if (StringUtils.isNull(ardAlarmRadarFire.getLongitude()) \|\| StringUtils.isNull(ardAlarmRadarFire.getLatitude())) {
			log.debug("坐标为空不引导");
			return;
			}
			double[] coordinate = new double[]{ardAlarmRadarFire.getLongitude(), ardAlarmRadarFire.getLatitude()};//报警坐标
			//引导入队
			radarGuideToQueue(ardAlarmRadarFire.getId(), ardAlarmRadarFire.getRadarId(), ardAlarmRadarFire.getName(), ardAlarmRadarFire.getAlarmType(), ardAlarmRadarFire.getCreateTime(), coordinate);//更新
			}
			//雷达抽油机停机引导
			private void radarPumpGuide(List<ArdAlarmRadarPump> ardAlarmRadarPumps, RadarAlarmData radarAlarmData) {
			//按兴趣点去重,然后按引导逻辑进行引导入队
			@@ -1461,4 +1544,14 @@
			}
			//endregion
			}
			private void radarPumpGuide(ArdAlarmRadarPump ardAlarmRadarPump) {
			if (StringUtils.isNull(ardAlarmRadarPump.getLongitude()) \|\| StringUtils.isNull(ardAlarmRadarPump.getLatitude())) {
			//坐标为空不引导
			log.debug("坐标为空不引导");
			return;
			}
			double[] coordinate = new double[]{ardAlarmRadarPump.getLongitude(), ardAlarmRadarPump.getLatitude()};//报警坐标
			//引导入队
			radarGuideToQueue(ardAlarmRadarPump.getId(), ardAlarmRadarPump.getRadarId(), ardAlarmRadarPump.getName(), ardAlarmRadarPump.getAlarmType(), ardAlarmRadarPump.getCreateTime(), coordinate);//更新
			}
			}