~liusuyi/ruoyi-api.git

			@@ -283,7 +283,162 @@
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmWall.getId())
			.setName(ardAlarmWall.getWallName())
			.setAlarmTime(ardAlarmWall.getCreateTime())
			.setAlarmTime(ardAlarmWall.getAlarmTime())
			.setLongitude(ardAlarmWall.getLongitude())
			.setLatitude(ardAlarmWall.getLatitude())
			.setCount(ardAlarmWall.getCount())
			.setTotal(ardAlarmWall.getTotal());
			return globalAlarmData;
			}).collect(Collectors.toList());
			case 1014:
			List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectListAllByCommand(refreshTime);
			return ardAlarmTubes.stream()
			.map(ardAlarmTube -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmTube.getId())
			.setName(ardAlarmTube.getTubeName())
			.setAlarmTime(ardAlarmTube.getAlarmTime())
			.setLongitude(ardAlarmTube.getLongitude())
			.setLatitude(ardAlarmTube.getLatitude())
			.setAltitude(ardAlarmTube.getAltitude())
			.setCount(ardAlarmTube.getCount())
			.setTotal(ardAlarmTube.getTotal());
			return globalAlarmData;
			}).collect(Collectors.toList());
			default:
			return null;
			}
			}
			/**
			* 获取热力图数据
			* 刘苏义
			* 2023/9/16 8:38:54
			*/
			@Override
			public List<GlobalAlarmData> selectThermalMap(GlobalAlarmCondition condition) {
			String refreshTime = condition.getRefreshTime();
			switch (condition.getCommand()) {
			case 1001:
			List<ArdAlarmStealelec> ardAlarmStealelecs = ardAlarmStealelecMapper.selectListAllByCommand(refreshTime);
			return ardAlarmStealelecs.stream()
			.map(ardAlarmStealelec -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmStealelec.getId())
			.setName(ardAlarmStealelec.getDescribe())
			.setAlarmTime(ardAlarmStealelec.getStartTime())
			.setLongitude(ardAlarmStealelec.getLongitude())
			.setLatitude(ardAlarmStealelec.getLatitude())
			.setAltitude(ardAlarmStealelec.getAltitude())
			.setCount(ardAlarmStealelec.getCount())
			.setTotal(ardAlarmStealelec.getTotal());
			return globalAlarmData;
			}).collect(Collectors.toList());
			case 1002:
			List<ArdAlarmCamera> ardAlarmCameras = ardAlarmCameraMapper.selectListAllByCommand(refreshTime);
			return ardAlarmCameras.stream()
			.map(ardAlarmCamera -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmCamera.getId())
			.setName(ardAlarmCamera.getCameraName())
			.setAlarmTime(ardAlarmCamera.getAlarmTime())
			.setLongitude(ardAlarmCamera.getLongitude())
			.setLatitude(ardAlarmCamera.getLatitude())
			.setCount(ardAlarmCamera.getCount())
			.setTotal(ardAlarmCamera.getTotal());
			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());
			case 1004:
			List<ArdAlarmRadarFire> ardAlarmRadarFires = ardAlarmRadarFireMapper.selectListAllByCommand(refreshTime);
			return ardAlarmRadarFires.stream()
			.map(ardAlarmRadarFire -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmRadarFire.getId())
			.setName(ardAlarmRadarFire.getName())
			.setAlarmTime(ardAlarmRadarFire.getAlarmTime())
			.setLongitude(ardAlarmRadarFire.getLongitude())
			.setLatitude(ardAlarmRadarFire.getLatitude())
			.setCount(ardAlarmRadarFire.getCount())
			.setTotal(ardAlarmRadarFire.getTotal());
			return globalAlarmData;
			}).collect(Collectors.toList());
			case 1005:
			List<ArdAlarmExternal> ardAlarmExternals = ardAlarmExternalMapper.selectListAllByCommand(refreshTime, "防区报警");
			return ardAlarmExternals.stream()
			.map(ardAlarmExternal -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmExternal.getId())
			.setName(ardAlarmExternal.getAlarmName())
			.setAlarmTime(ardAlarmExternal.getAlarmTime())
			.setLongitude(ardAlarmExternal.getLongitude())
			.setLatitude(ardAlarmExternal.getLatitude())
			.setCount(ardAlarmExternal.getCount())
			.setTotal(ardAlarmExternal.getTotal());
			return globalAlarmData;
			}).collect(Collectors.toList());
			case 1006:
			List<ArdAlarmAccess> ardAlarmAccesses = ardAlarmAccessMapper.selectListAllByCommand(refreshTime);
			return ardAlarmAccesses.stream()
			.map(ardAlarmAccess -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmAccess.getId())
			.setName(ardAlarmAccess.getAcsName())
			.setAlarmTime(ardAlarmAccess.getAlarmTime())
			.setLongitude(ardAlarmAccess.getLongitude())
			.setLatitude(ardAlarmAccess.getLatitude())
			.setCount(ardAlarmAccess.getCount())
			.setTotal(ardAlarmAccess.getTotal());
			return globalAlarmData;
			}).collect(Collectors.toList());
			case 1007:
			List<ArdAlarmRadarPump> ardAlarmRadarPumps = ardAlarmRadarPumpMapper.selectListAllByCommand(refreshTime);
			return ardAlarmRadarPumps.stream()
			.map(ardAlarmRadarPump -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmRadarPump.getId())
			.setName(ardAlarmRadarPump.getName())
			.setAlarmTime(ardAlarmRadarPump.getAlarmTime())
			.setLongitude(ardAlarmRadarPump.getLongitude())
			.setLatitude(ardAlarmRadarPump.getLatitude())
			.setCount(ardAlarmRadarPump.getCount())
			.setTotal(ardAlarmRadarPump.getTotal());
			return globalAlarmData;
			}).collect(Collectors.toList());
			case 1009:
			List<ArdAlarmApponekey> ardAlarmApponekeys = ardAlarmApponekeyMapper.selectListAllByCommand(refreshTime);
			return ardAlarmApponekeys.stream()
			.map(ardAlarmApponekey -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmApponekey.getId())
			.setName(ardAlarmApponekey.getName())
			.setAlarmTime(ardAlarmApponekey.getCreateTime())
			.setLongitude(ardAlarmApponekey.getLongitude())
			.setLatitude(ardAlarmApponekey.getLatitude())
			.setCount(ardAlarmApponekey.getCount())
			.setTotal(ardAlarmApponekey.getTotal());
			return globalAlarmData;
			}).collect(Collectors.toList());
			case 1010:
			List<ArdAlarmWall> ardAlarmWalls = ardAlarmWallMapper.selectListAllByCommand(refreshTime);
			return ardAlarmWalls.stream()
			.map(ardAlarmWall -> {
			GlobalAlarmData globalAlarmData = new GlobalAlarmData()
			.setId(ardAlarmWall.getId())
			.setName(ardAlarmWall.getWallName())
			.setAlarmTime(ardAlarmWall.getAlarmTime())
			.setLongitude(ardAlarmWall.getLongitude())
			.setLatitude(ardAlarmWall.getLatitude())
			.setCount(ardAlarmWall.getCount())
			@@ -592,6 +747,7 @@
			@Override
			public Object updateAlarmViewTime(GlobalAlarmCondition condition) {
			SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
			SimpleDateFormat fmtms = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
			switch (condition.getCommand()) {
			case 1001:
			ArdAlarmStealelec ardAlarmStealelec = ardAlarmStealelecMapper.selectByPrimaryKey(condition.getId());
			@@ -662,7 +818,7 @@
			ArdAlarmWall ardAlarmWall = ardAlarmWallMapper.selectArdAlarmWallById(condition.getId());
			if (StringUtils.isNotNull(ardAlarmWall)) {
			String userId = ardAlarmWall.getUserId();
			String alarmTime = fmt.format(ardAlarmWall.getCreateTime());
			String alarmTime = fmtms.format(ardAlarmWall.getAlarmTime());
			ardAlarmWallMapper.updateViewTimeByUserId(userId, alarmTime, DateUtils.getTime());
			return ardAlarmWall;
			}
			@@ -924,6 +1080,7 @@
			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);
			//通道(通过日夜时间研判)
			@@ -1023,9 +1180,13 @@
			//获取雷达所在塔上的大光电
			String cameraIdWithTower = ardEquipRadarMapper.getCameraByRadar(radarId);
			if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
			log.info("获取到雷达塔上的光电:" + cameraIdWithTower);
			log.debug("获取到雷达塔上的光电:" + cameraIdWithTower);
			//如果雷达塔上有光电
			messagesEnqueued(cameraIdWithTower, alarmId, alarmType, createTime, 1, 1, coordinate);
			}
			else
			{
			log.debug("未获取到雷达塔上的光电");
			}
			//获取报警点关联的大光电
			ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
			@@ -1038,6 +1199,10 @@
			//如果报警点关联了光电
			messagesEnqueued(cameraId, alarmId, alarmType, createTime, 1, 2, coordinate);
			}
			else
			{
			log.debug("未获取到报警点关联的光电");
			}
			}