~liusuyi/ruoyi-api.git

			@@ -7,6 +7,8 @@
			import com.ruoyi.alarm.apponekey.mapper.ArdAlarmApponekeyMapper;
			import com.ruoyi.alarm.camera.domain.ArdAlarmCamera;
			import com.ruoyi.alarm.camera.mapper.ArdAlarmCameraMapper;
			import com.ruoyi.alarm.digitization3.domain.ArdAlarmDigitization3;
			import com.ruoyi.alarm.digitization3.mapper.ArdAlarmDigitization3Mapper;
			import com.ruoyi.alarm.external.domain.ArdAlarmExternal;
			import com.ruoyi.alarm.external.mapper.ArdAlarmExternalMapper;
			import com.ruoyi.alarm.global.domain.GlobalAlarmCondition;
			@@ -16,7 +18,6 @@
			import com.ruoyi.alarm.global.service.IGlobalAlarmService;
			import com.ruoyi.alarm.radar.domain.*;
			import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarFireMapper;
			import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarMapper;
			import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarMoveMapper;
			import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarPumpMapper;
			import com.ruoyi.alarm.steal.domain.ArdAlarmStealelec;
			@@ -70,6 +71,8 @@
			public class GlobalAlarmServiceImpl implements IGlobalAlarmService {
			//region 依赖注入
			@Resource
			private ArdAlarmDigitization3Mapper ardAlarmDigitization3Mapper;
			@Resource
			private ArdAlarmWallMapper ardAlarmWallMapper;
			@Resource
			private ArdAlarmApponekeyMapper ardAlarmApponekeyMapper;
			@@ -114,6 +117,7 @@
			private Map<String, Integer> unGuideCountMapMove = new HashMap<>();
			private Map<String, Integer> unGuideCountMapFire = new HashMap<>();
			private Map<String, Integer> unGuideCountMapPump = new HashMap<>();

			/**
			* @描述查询所有报警的当前数量
			* @参数 []
			@@ -147,6 +151,8 @@
			countMap.put("1010", count1010);
			int count1014 = ardAlarmTubeMapper.selectCountByAlarmTime(refreshTime);
			countMap.put("1014", count1014);
			int count1012 = ardAlarmDigitization3Mapper.selectCountByAlarmTime(refreshTime);
			countMap.put("1012", count1012);
			map.put("20000", countMap);
			return map;
			}
			@@ -290,6 +296,22 @@
			.setTotal(ardAlarmWall.getTotal());
			return globalAlarmData;
			}).collect(Collectors.toList());
			case 1012:
			List<ArdAlarmDigitization3> ardAlarmDigitization3s = ardAlarmDigitization3Mapper.selectListAllByCommand(refreshTime);
			return ardAlarmDigitization3s.stream()
			.map(ardAlarmDigitization3 -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmDigitization3.getId())
			.setName(ardAlarmDigitization3.getWellNo())
			.setAlarmType(ardAlarmDigitization3.getAlarmType())
			.setAlarmTime(ardAlarmDigitization3.getAlarmTime())
			.setLongitude(ardAlarmDigitization3.getLongitude())
			.setLatitude(ardAlarmDigitization3.getLatitude())
			.setAltitude(ardAlarmDigitization3.getAltitude())
			.setCount(ardAlarmDigitization3.getCount())
			.setTotal(ardAlarmDigitization3.getTotal());
			return globalAlarmData;
			}).collect(Collectors.toList());
			case 1014:
			List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectListAllByCommand(refreshTime);
			return ardAlarmTubes.stream()
			@@ -309,6 +331,7 @@
			return null;
			}
			}

			/**
			* 获取热力图数据
			* 刘苏义
			@@ -348,19 +371,38 @@
			return globalAlarmData;
			}).collect(Collectors.toList());
			case 1003:
			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());
			//从缓存获取数据
			//String key = "radar_alarm:" + DateUtils.getDate();
			//List<ArdAlarmRadarMove> ardAlarmRadarMoves = redisCache.getCacheList(key);
			//Map<String, List<ArdAlarmRadarMove>> groupedData = ardAlarmRadarMoves.stream()
			// .collect(Collectors.groupingBy(ArdAlarmRadarMove::getName));
			//List<GlobalAlarmData> globalAlarmDataList = new ArrayList<>();
			//for (String name : groupedData.keySet()) {
			// List<ArdAlarmRadarMove> ardAlarmRadarMove = groupedData.get(name);
			// GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			// .setId(ardAlarmRadarMove.get(0).getId())
			// .setName(name)
			// .setAlarmTime(ardAlarmRadarMove.get(0).getAlarmTime())
			// .setLongitude(ardAlarmRadarMove.get(0).getLongitude())
			// .setLatitude(ardAlarmRadarMove.get(0).getLatitude())
			// .setTotal(ardAlarmRadarMove.size());
			// 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());
			case 1004:
			List<ArdAlarmRadarFire> ardAlarmRadarFires = ardAlarmRadarFireMapper.selectListAllByCommand(refreshTime);
			return ardAlarmRadarFires.stream()
			@@ -484,12 +526,12 @@
			.setAlarmType("1001");
			return globalAlarmData;
			}).collect(Collectors.toList());
			if(alarmData1001.size()>0) {
			if (alarmData1001.size() > 0) {
			GlobalAlarmDataList.addAll(alarmData1001);
			}

			List<ArdAlarmCamera> ardAlarmCameras = ardAlarmCameraMapper.selectListAllByCommand(refreshTime);
			List<GlobalAlarmData> alarmData1002= ardAlarmCameras.stream()
			List<GlobalAlarmData> alarmData1002 = ardAlarmCameras.stream()
			.map(ardAlarmCamera -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmCamera.getId())
			@@ -502,12 +544,12 @@
			.setAlarmType("1002");
			return globalAlarmData;
			}).collect(Collectors.toList());
			if(alarmData1002.size()>0) {
			if (alarmData1002.size() > 0) {
			GlobalAlarmDataList.addAll(alarmData1002);
			}

			List<ArdAlarmRadarMove> ardAlarmRadarMoves = ardAlarmRadarMoveMapper.selectListAllByCommand(refreshTime);
			List<GlobalAlarmData> alarmData1003= ardAlarmRadarMoves.stream()
			List<GlobalAlarmData> alarmData1003 = ardAlarmRadarMoves.stream()
			.map(ardAlarmRadarMove -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmRadarMove.getId())
			@@ -520,12 +562,12 @@
			.setAlarmType("1003");
			return globalAlarmData;
			}).collect(Collectors.toList());
			if(alarmData1003.size()>0) {
			if (alarmData1003.size() > 0) {
			GlobalAlarmDataList.addAll(alarmData1003);
			}

			List<ArdAlarmRadarFire> ardAlarmRadarFires = ardAlarmRadarFireMapper.selectListAllByCommand(refreshTime);
			List<GlobalAlarmData> alarmData1004= ardAlarmRadarFires.stream()
			List<GlobalAlarmData> alarmData1004 = ardAlarmRadarFires.stream()
			.map(ardAlarmRadarFire -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmRadarFire.getId())
			@@ -538,12 +580,12 @@
			.setAlarmType("1004");
			return globalAlarmData;
			}).collect(Collectors.toList());
			if(alarmData1004.size()>0) {
			if (alarmData1004.size() > 0) {
			GlobalAlarmDataList.addAll(alarmData1004);
			}

			List<ArdAlarmExternal> ardAlarmExternals = ardAlarmExternalMapper.selectListAllByCommand(refreshTime, "防区报警");
			List<GlobalAlarmData> alarmData1005= ardAlarmExternals.stream()
			List<GlobalAlarmData> alarmData1005 = ardAlarmExternals.stream()
			.map(ardAlarmExternal -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmExternal.getId())
			@@ -556,12 +598,12 @@
			.setAlarmType("1005");
			return globalAlarmData;
			}).collect(Collectors.toList());
			if(alarmData1005.size()>0) {
			if (alarmData1005.size() > 0) {
			GlobalAlarmDataList.addAll(alarmData1005);
			}

			List<ArdAlarmAccess> ardAlarmAccesses = ardAlarmAccessMapper.selectListAllByCommand(refreshTime);
			List<GlobalAlarmData> alarmData1006= ardAlarmAccesses.stream()
			List<GlobalAlarmData> alarmData1006 = ardAlarmAccesses.stream()
			.map(ardAlarmAccess -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmAccess.getId())
			@@ -574,12 +616,12 @@
			.setAlarmType("1006");
			return globalAlarmData;
			}).collect(Collectors.toList());
			if(alarmData1006.size()>0) {
			if (alarmData1006.size() > 0) {
			GlobalAlarmDataList.addAll(alarmData1006);
			}

			List<ArdAlarmRadarPump> ardAlarmRadarPumps = ardAlarmRadarPumpMapper.selectListAllByCommand(refreshTime);
			List<GlobalAlarmData> alarmData1007= ardAlarmRadarPumps.stream()
			List<GlobalAlarmData> alarmData1007 = ardAlarmRadarPumps.stream()
			.map(ardAlarmRadarPump -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmRadarPump.getId())
			@@ -592,12 +634,12 @@
			.setAlarmType("1007");
			return globalAlarmData;
			}).collect(Collectors.toList());
			if(alarmData1007.size()>0) {
			if (alarmData1007.size() > 0) {
			GlobalAlarmDataList.addAll(alarmData1007);
			}

			List<ArdAlarmApponekey> ardAlarmApponekeys = ardAlarmApponekeyMapper.selectListAllByCommand(refreshTime);
			List<GlobalAlarmData> alarmData1009= ardAlarmApponekeys.stream()
			List<GlobalAlarmData> alarmData1009 = ardAlarmApponekeys.stream()
			.map(ardAlarmApponekey -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmApponekey.getId())
			@@ -610,12 +652,12 @@
			.setAlarmType("1009");
			return globalAlarmData;
			}).collect(Collectors.toList());
			if(alarmData1009.size()>0) {
			if (alarmData1009.size() > 0) {
			GlobalAlarmDataList.addAll(alarmData1009);
			}

			List<ArdAlarmWall> ardAlarmWalls = ardAlarmWallMapper.selectListAllByCommand(refreshTime);
			List<GlobalAlarmData> alarmData1010= ardAlarmWalls.stream()
			List<GlobalAlarmData> alarmData1010 = ardAlarmWalls.stream()
			.map(ardAlarmWall -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmWall.getId())
			@@ -628,12 +670,30 @@
			.setAlarmType("1010");
			return globalAlarmData;
			}).collect(Collectors.toList());
			if(alarmData1010.size()>0) {
			if (alarmData1010.size() > 0) {
			GlobalAlarmDataList.addAll(alarmData1010);
			}

			List<ArdAlarmDigitization3> ardAlarmDigitization3s = ardAlarmDigitization3Mapper.selectListAllByCommand(refreshTime);
			List<GlobalAlarmData> alarmData1012 = ardAlarmDigitization3s.stream()
			.map(ardAlarmDigitization3 -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmDigitization3.getId())
			.setName(ardAlarmDigitization3.getWellNo())
			.setAlarmTime(ardAlarmDigitization3.getAlarmTime())
			.setLongitude(ardAlarmDigitization3.getLongitude())
			.setLatitude(ardAlarmDigitization3.getLatitude())
			.setAltitude(ardAlarmDigitization3.getAltitude())
			.setCount(ardAlarmDigitization3.getCount())
			.setTotal(ardAlarmDigitization3.getTotal())
			.setAlarmType("1012");
			return globalAlarmData;
			}).collect(Collectors.toList());
			if (alarmData1012.size() > 0) {
			GlobalAlarmDataList.addAll(alarmData1012);
			}
			List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectListAllByCommand(refreshTime);
			List<GlobalAlarmData> alarmData1014= ardAlarmTubes.stream()
			List<GlobalAlarmData> alarmData1014 = ardAlarmTubes.stream()
			.map(ardAlarmTube -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmTube.getId())
			@@ -647,11 +707,11 @@
			.setAlarmType("1014");
			return globalAlarmData;
			}).collect(Collectors.toList());
			if(alarmData1014.size()>0) {
			if (alarmData1014.size() > 0) {
			GlobalAlarmDataList.addAll(alarmData1014);
			}
			return GlobalAlarmDataList;
			}
			}

			/**
			* @描述历史报警查询
			@@ -726,6 +786,12 @@
			aaw.setPageNum(pageNum);
			aaw.setPageSize(pageSize);
			return ardAlarmWallMapper.selectArdAlarmWallList(aaw);
			case 1012:
			ArdAlarmDigitization3 aad3 = new ArdAlarmDigitization3();
			aad3.setParams(params);
			aad3.setPageNum(pageNum);
			aad3.setPageSize(pageSize);
			return ardAlarmDigitization3Mapper.selectArdAlarmDigitization3List(aad3);
			case 1014:
			ArdAlarmTube aat = new ArdAlarmTube();
			aat.setParams(params);
			@@ -822,6 +888,14 @@
			ardAlarmWallMapper.updateViewTimeByUserId(userId, alarmTime, DateUtils.getTime());
			return ardAlarmWall;
			}
			case 1012:
			ArdAlarmDigitization3 ardAlarmDigitization3 = ardAlarmDigitization3Mapper.selectArdAlarmDigitization3ById(condition.getId());
			if (StringUtils.isNotNull(ardAlarmDigitization3)) {
			String wellNo = ardAlarmDigitization3.getWellNo();
			String alarmTime = fmtms.format(ardAlarmDigitization3.getAlarmTime());
			ardAlarmDigitization3Mapper.updateViewTimeByWellNo(wellNo, alarmTime, DateUtils.getTime());
			return ardAlarmDigitization3;
			}
			case 1014:
			ArdAlarmTube ardAlarmTube = ardAlarmTubeMapper.selectArdAlarmTubeById(condition.getId());
			if (StringUtils.isNotNull(ardAlarmTube)) {
			@@ -915,18 +989,18 @@
			//region 处理雷达报警
			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<>();
			List<ArdAlarmRadarMove> ardAlarmRadarMoves = new ArrayList<>();
			List<ArdAlarmRadarFire> ardAlarmRadarFires = new ArrayList<>();
			List<ArdAlarmRadarPump> ardAlarmRadarPumps = new ArrayList<>();
			for (ArdAlarmRadar ardAlarmRadar : ardAlarmRadars) {
			String uuid = IdUtils.simpleUUID();
			String alarmpointName = ardAlarmRadar.getName();//兴趣点名称
			Double longitude = ardAlarmRadar.getLongitude();
			Double latitude = ardAlarmRadar.getLatitude();
			String targetId=ardAlarmRadar.getTargetId();
			String targetId = ardAlarmRadar.getTargetId();
			switch (ardAlarmRadar.getAlarmType()) {
			case "运动目标检测":
			ArdAlarmRadarMove ardAlarmRadarMove=new ArdAlarmRadarMove();
			ArdAlarmRadarMove ardAlarmRadarMove = new ArdAlarmRadarMove();
			ardAlarmRadarMove.setId(uuid);
			ardAlarmRadarMove.setTargetId(targetId);
			ardAlarmRadarMove.setAlarmTime(radarAlarmData.getAlarmTime());
			@@ -938,10 +1012,17 @@
			//入库
			ardAlarmRadarMoveMapper.insertArdAlarmRadarMove(ardAlarmRadarMove);
			ardAlarmRadarMoves.add(ardAlarmRadarMove);

			//入缓存
			//String key = "radar_alarm:" + DateUtils.getDate();
			//if (redisCache.hasKey(key)) {
			// redisCache.setCacheList(key, ardAlarmRadarMove, -1, TimeUnit.HOURS);
			//} else {
			// Integer expiryTimeInSeconds = DateUtils.getDayRemainingTime(ardAlarmRadarMove.getCreateTime());
			// redisCache.setCacheList(key, ardAlarmRadarMove, expiryTimeInSeconds, TimeUnit.SECONDS);
			//}
			break;
			case "热源检测":
			ArdAlarmRadarFire ardAlarmRadarFire=new ArdAlarmRadarFire();
			ArdAlarmRadarFire ardAlarmRadarFire = new ArdAlarmRadarFire();
			ardAlarmRadarFire.setId(uuid);
			ardAlarmRadarFire.setTargetId(targetId);
			ardAlarmRadarFire.setAlarmTime(radarAlarmData.getAlarmTime());
			@@ -956,7 +1037,7 @@

			break;
			case "雷达抽油机停机":
			ArdAlarmRadarPump ardAlarmRadarPump=new ArdAlarmRadarPump();
			ArdAlarmRadarPump ardAlarmRadarPump = new ArdAlarmRadarPump();
			ardAlarmRadarPump.setId(uuid);
			ardAlarmRadarPump.setTargetId(targetId);
			ardAlarmRadarPump.setAlarmTime(radarAlarmData.getAlarmTime());
			@@ -975,9 +1056,10 @@
			break;
			}
			}
			radarMoveGuide(ardAlarmRadarMoves,radarAlarmData);
			radarFireGuide(ardAlarmRadarFires,radarAlarmData);
			radarPumpGuide(ardAlarmRadarPumps,radarAlarmData);
			radarMoveGuide(ardAlarmRadarMoves, radarAlarmData);
			radarFireGuide(ardAlarmRadarFires, radarAlarmData);
			radarPumpGuide(ardAlarmRadarPumps, radarAlarmData);
			//endregion
			break;
			case "external":
			//region 处理外联报警
			@@ -1047,6 +1129,23 @@
			}
			//endregion
			break;
			case "digitization3":
			//region 三厂数字化报警
			ArdAlarmDigitization3 ardAlarmDigitization3 = JSONObject.parseObject(message, ArdAlarmDigitization3.class);
			//获取经纬度
			ArdAlarmpointsWell Well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(ardAlarmDigitization3.getWellNo());
			if(Well!=null) {
			ardAlarmDigitization3.setLongitude(Well.getLongitude());
			ardAlarmDigitization3.setLatitude(Well.getLatitude());
			ardAlarmDigitization3.setAltitude(Well.getAltitude());
			}
			ardAlarmDigitization3.setCreateTime(new Date());
			int aad = ardAlarmDigitization3Mapper.insertArdAlarmDigitization3(ardAlarmDigitization3);
			if (aad > 0) {
			log.debug("digitization3入库成功：" + ardAlarmDigitization3);
			}
			//endregion
			break;
			}
			} catch (Exception ex) {
			log.error("接收报警异常:" + ex.getMessage());
			@@ -1074,13 +1173,20 @@
			//相机ID
			guideTask.setCameraId(cameraId);
			//报警类型
			String aType="";
			switch (alarmType)
			{
			case "运动目标检测": aType="sys_radar_move";break;
			case "热源检测": aType="sys_radar_fire";break;
			case "雷达抽油机停机": aType="sys_radar_pump";break;
			default: aType=alarmType;break;
			String aType = "";
			switch (alarmType) {
			case "运动目标检测":
			aType = "sys_radar_move";
			break;
			case "热源检测":
			aType = "sys_radar_fire";
			break;
			case "雷达抽油机停机":
			aType = "sys_radar_pump";
			break;
			default:
			aType = alarmType;
			break;
			}
			guideTask.setAlarmType(aType);
			//通道(通过日夜时间研判)
			@@ -1171,10 +1277,8 @@
			}


			/**
			* 雷达引导入队
			*/
			private void radarGuideToQueue(String alarmId,String radarId, String name, String alarmType, Date createTime, double[] coordinate) {
			//雷达引导入队(获取相机)
			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);
			//获取雷达所在塔上的大光电
			@@ -1183,9 +1287,7 @@
			log.debug("获取到雷达塔上的光电:" + cameraIdWithTower);
			//如果雷达塔上有光电
			messagesEnqueued(cameraIdWithTower, alarmId, alarmType, createTime, 1, 1, coordinate);
			}
			else
			{
			} else {
			log.debug("未获取到雷达塔上的光电");
			}
			//获取报警点关联的大光电
			@@ -1198,20 +1300,16 @@
			log.info("获取到报警点关联的光电:" + cameraId);
			//如果报警点关联了光电
			messagesEnqueued(cameraId, alarmId, alarmType, createTime, 1, 2, coordinate);
			}
			else
			{
			} else {
			log.debug("未获取到报警点关联的光电");
			}
			}


			private void radarMoveGuide(List<ArdAlarmRadarMove> ardAlarmRadarMoves,RadarAlarmData radarAlarmData)
			{
			//雷达移动引导
			private void radarMoveGuide(List<ArdAlarmRadarMove> ardAlarmRadarMoves, RadarAlarmData radarAlarmData) {
			//按兴趣点去重,然后按引导逻辑进行引导入队
			ardAlarmRadarMoves = ardAlarmRadarMoves.stream()
			.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new java.util.TreeSet<>(java.util.Comparator.comparing(ArdAlarmRadarMove::getName))), ArrayList::new));
			if(ardAlarmRadarMoves.size()>0) {
			if (ardAlarmRadarMoves.size() > 0) {
			for (ArdAlarmRadarMove ardAlarmRadarMove : ardAlarmRadarMoves) {
			//遍历报警数据进行引导
			if (StringUtils.isNull(ardAlarmRadarMove.getLongitude()) \|\| StringUtils.isNull(ardAlarmRadarMove.getLatitude())) {
			@@ -1259,12 +1357,12 @@
			}
			//endregion
			}
			private void radarFireGuide(List<ArdAlarmRadarFire> ardAlarmRadarFires,RadarAlarmData radarAlarmData)
			{
			//雷达防火引导
			private void radarFireGuide(List<ArdAlarmRadarFire> ardAlarmRadarFires, RadarAlarmData radarAlarmData) {
			//按兴趣点去重,然后按引导逻辑进行引导入队
			ardAlarmRadarFires = ardAlarmRadarFires.stream()
			.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new java.util.TreeSet<>(java.util.Comparator.comparing(ArdAlarmRadarFire::getName))), ArrayList::new));
			if(ardAlarmRadarFires.size()>0) {
			if (ardAlarmRadarFires.size() > 0) {
			for (ArdAlarmRadarFire ardAlarmRadarFire : ardAlarmRadarFires) {
			//遍历报警数据进行引导
			if (StringUtils.isNull(ardAlarmRadarFire.getLongitude()) \|\| StringUtils.isNull(ardAlarmRadarFire.getLatitude())) {
			@@ -1311,12 +1409,12 @@
			}
			//endregion
			}
			private void radarPumpGuide(List<ArdAlarmRadarPump> ardAlarmRadarPumps,RadarAlarmData radarAlarmData)
			{
			//雷达抽油机停机引导
			private void radarPumpGuide(List<ArdAlarmRadarPump> ardAlarmRadarPumps, RadarAlarmData radarAlarmData) {
			//按兴趣点去重,然后按引导逻辑进行引导入队
			ardAlarmRadarPumps = ardAlarmRadarPumps.stream()
			.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new java.util.TreeSet<>(java.util.Comparator.comparing(ArdAlarmRadarPump::getName))), ArrayList::new));
			if(ardAlarmRadarPumps.size()>0) {
			if (ardAlarmRadarPumps.size() > 0) {
			for (ArdAlarmRadarPump ardAlarmRadarPump : ardAlarmRadarPumps) {
			//遍历报警数据进行引导
			if (StringUtils.isNull(ardAlarmRadarPump.getLongitude()) \|\| StringUtils.isNull(ardAlarmRadarPump.getLatitude())) {