From 636054d8d283b06802c05e0c15724c22637d8b30 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 02 九月 2023 13:27:35 +0800
Subject: [PATCH] 将雷达报警分成3个表存储
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java | 438 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 328 insertions(+), 110 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
index 5637468..ec405de 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
@@ -14,13 +14,17 @@
import com.ruoyi.alarm.global.domain.GuidePriorityQueue;
import com.ruoyi.alarm.global.domain.GuideTask;
import com.ruoyi.alarm.global.service.IGlobalAlarmService;
-import com.ruoyi.alarm.radar.domain.ArdAlarmRadar;
-import com.ruoyi.alarm.radar.domain.RadarAlarmData;
+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;
import com.ruoyi.alarm.steal.mapper.ArdAlarmStealelecMapper;
import com.ruoyi.alarm.tube.domain.ArdAlarmTube;
import com.ruoyi.alarm.tube.mapper.ArdAlarmTubeMapper;
+import com.ruoyi.alarm.wall.domain.ArdAlarmWall;
+import com.ruoyi.alarm.wall.mapper.ArdAlarmWallMapper;
import com.ruoyi.alarmpoints.tube.domain.ArdTubes;
import com.ruoyi.alarmpoints.tube.domain.ArdTubesDetails;
import com.ruoyi.alarmpoints.tube.mapper.ArdTubesDetailsMapper;
@@ -34,6 +38,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.device.external.domain.ArdEquipExternal;
import com.ruoyi.device.external.mapper.ArdEquipExternalMapper;
+import com.ruoyi.device.radar.mapper.ArdEquipRadarMapper;
import com.ruoyi.utils.gis.GisUtil;
import com.ruoyi.utils.tools.ArdTool;
import com.ruoyi.common.utils.uuid.IdUtils;
@@ -65,6 +70,8 @@
public class GlobalAlarmServiceImpl implements IGlobalAlarmService {
//region 渚濊禆娉ㄥ叆
@Resource
+ private ArdAlarmWallMapper ardAlarmWallMapper;
+ @Resource
private ArdAlarmApponekeyMapper ardAlarmApponekeyMapper;
@Resource
private ArdEquipExternalMapper ardEquipExternalMapper;
@@ -72,8 +79,14 @@
private ArdAlarmAccessMapper ardAlarmAccessMapper;
@Resource
private ArdAlarmExternalMapper ardAlarmExternalMapper;
+ //@Resource
+ //private ArdAlarmRadarMapper ardAlarmRadarMapper;
@Resource
- private ArdAlarmRadarMapper ardAlarmRadarMapper;
+ private ArdAlarmRadarMoveMapper ardAlarmRadarMoveMapper;
+ @Resource
+ private ArdAlarmRadarFireMapper ardAlarmRadarFireMapper;
+ @Resource
+ private ArdAlarmRadarPumpMapper ardAlarmRadarPumpMapper;
@Resource
private ArdAlarmStealelecMapper ardAlarmStealelecMapper;
@Resource
@@ -94,10 +107,13 @@
private RedisCache redisCache;
@Resource
private QueueManager queueManager;
+ @Resource
+ private ArdEquipRadarMapper ardEquipRadarMapper;
//endregion
//姣忎釜鐐逛綅鏈紩瀵兼鏁�
- private Map<String, Integer> unGuideCountMap = new HashMap<>();
-
+ private Map<String, Integer> unGuideCountMapMove = new HashMap<>();
+ private Map<String, Integer> unGuideCountMapFire = new HashMap<>();
+ private Map<String, Integer> unGuideCountMapPump = new HashMap<>();
/**
* @鎻忚堪 鏌ヨ鎵�鏈夋姤璀︾殑褰撳墠鏁伴噺
* @鍙傛暟 []
@@ -115,11 +131,11 @@
countMap.put("1001", count1001);
int count1002 = ardAlarmCameraMapper.selectCountByAlarmTime(refreshTime);
countMap.put("1002", count1002);
- int count1003 = ardAlarmRadarMapper.selectCountByAlarmTime(refreshTime, "杩愬姩鐩爣妫�娴�");
+ int count1003 = ardAlarmRadarMoveMapper.selectCountByAlarmTime(refreshTime);
countMap.put("1003", count1003);
- int count1004 = ardAlarmRadarMapper.selectCountByAlarmTime(refreshTime, "鐑簮妫�娴�");
+ int count1004 = ardAlarmRadarFireMapper.selectCountByAlarmTime(refreshTime);
countMap.put("1004", count1004);
- int count1007 = ardAlarmRadarMapper.selectCountByAlarmTime(refreshTime, "闆疯揪鎶芥补鏈哄仠鏈�");
+ int count1007 = ardAlarmRadarPumpMapper.selectCountByAlarmTime(refreshTime);
countMap.put("1007", count1007);
int count1005 = ardAlarmExternalMapper.selectCountByAlarmTime(refreshTime, "闃插尯鎶ヨ");
countMap.put("1005", count1005);
@@ -127,6 +143,8 @@
countMap.put("1006", count1006);
int count1009 = ardAlarmApponekeyMapper.selectCountByAlarmTime(refreshTime);
countMap.put("1009", count1009);
+ int count1010 = ardAlarmWallMapper.selectCountByAlarmTime(refreshTime);
+ countMap.put("1010", count1010);
int count1014 = ardAlarmTubeMapper.selectCountByAlarmTime(refreshTime);
countMap.put("1014", count1014);
map.put("20000", countMap);
@@ -175,8 +193,8 @@
return globalAlarmData;
}).collect(Collectors.toList());
case 1003:
- List<ArdAlarmRadar> ardAlarmRadars = ardAlarmRadarMapper.selectListAllByCommand(refreshTime, "杩愬姩鐩爣妫�娴�");
- return ardAlarmRadars.stream()
+ List<ArdAlarmRadarMove> ardAlarmRadarMoves = ardAlarmRadarMoveMapper.selectListAllByCommand(refreshTime);
+ return ardAlarmRadarMoves.stream()
.map(ardAlarmRadar -> {
GlobalAlarmData globalAlarmData = new GlobalAlarmData()
.setId(ardAlarmRadar.getId())
@@ -189,8 +207,8 @@
return globalAlarmData;
}).collect(Collectors.toList());
case 1004:
- ardAlarmRadars = ardAlarmRadarMapper.selectListAllByCommand(refreshTime, "鐑簮妫�娴�");
- return ardAlarmRadars.stream()
+ List<ArdAlarmRadarFire> ardAlarmRadarFires = ardAlarmRadarFireMapper.selectListAllByCommand(refreshTime);
+ return ardAlarmRadarFires.stream()
.map(ardAlarmRadar -> {
GlobalAlarmData globalAlarmData = new GlobalAlarmData()
.setId(ardAlarmRadar.getId())
@@ -231,8 +249,8 @@
return globalAlarmData;
}).collect(Collectors.toList());
case 1007:
- ardAlarmRadars = ardAlarmRadarMapper.selectListAllByCommand(refreshTime, "闆疯揪鎶芥补鏈哄仠鏈�");
- return ardAlarmRadars.stream()
+ List<ArdAlarmRadarPump> ardAlarmRadarPumps = ardAlarmRadarPumpMapper.selectListAllByCommand(refreshTime);
+ return ardAlarmRadarPumps.stream()
.map(ardAlarmRadar -> {
GlobalAlarmData globalAlarmData = new GlobalAlarmData()
.setId(ardAlarmRadar.getId())
@@ -256,6 +274,20 @@
.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.getCreateTime())
+ .setLongitude(ardAlarmWall.getLongitude())
+ .setLatitude(ardAlarmWall.getLatitude())
+ .setCount(ardAlarmWall.getCount())
+ .setTotal(ardAlarmWall.getTotal());
return globalAlarmData;
}).collect(Collectors.toList());
case 1014:
@@ -319,8 +351,8 @@
GlobalAlarmDataList.addAll(alarmData1002);
}
- List<ArdAlarmRadar> ardAlarmRadars = ardAlarmRadarMapper.selectListAllByCommand(refreshTime, "杩愬姩鐩爣妫�娴�");
- List<GlobalAlarmData> alarmData1003= ardAlarmRadars.stream()
+ List<ArdAlarmRadarMove> ardAlarmRadarMoves = ardAlarmRadarMoveMapper.selectListAllByCommand(refreshTime);
+ List<GlobalAlarmData> alarmData1003= ardAlarmRadarMoves.stream()
.map(ardAlarmRadar -> {
GlobalAlarmData globalAlarmData = new GlobalAlarmData()
.setId(ardAlarmRadar.getId())
@@ -337,8 +369,8 @@
GlobalAlarmDataList.addAll(alarmData1003);
}
- ardAlarmRadars = ardAlarmRadarMapper.selectListAllByCommand(refreshTime, "鐑簮妫�娴�");
- List<GlobalAlarmData> alarmData1004= ardAlarmRadars.stream()
+ List<ArdAlarmRadarFire> ardAlarmRadarFires = ardAlarmRadarFireMapper.selectListAllByCommand(refreshTime);
+ List<GlobalAlarmData> alarmData1004= ardAlarmRadarFires.stream()
.map(ardAlarmRadar -> {
GlobalAlarmData globalAlarmData = new GlobalAlarmData()
.setId(ardAlarmRadar.getId())
@@ -391,8 +423,8 @@
GlobalAlarmDataList.addAll(alarmData1006);
}
- ardAlarmRadars = ardAlarmRadarMapper.selectListAllByCommand(refreshTime, "闆疯揪鎶芥补鏈哄仠鏈�");
- List<GlobalAlarmData> alarmData1007= ardAlarmRadars.stream()
+ List<ArdAlarmRadarPump> ardAlarmRadarPumps = ardAlarmRadarPumpMapper.selectListAllByCommand(refreshTime);
+ List<GlobalAlarmData> alarmData1007= ardAlarmRadarPumps.stream()
.map(ardAlarmRadar -> {
GlobalAlarmData globalAlarmData = new GlobalAlarmData()
.setId(ardAlarmRadar.getId())
@@ -425,6 +457,24 @@
}).collect(Collectors.toList());
if(alarmData1009.size()>0) {
GlobalAlarmDataList.addAll(alarmData1009);
+ }
+
+ List<ArdAlarmWall> ardAlarmWalls = ardAlarmWallMapper.selectListAllByCommand(refreshTime);
+ List<GlobalAlarmData> alarmData1010= ardAlarmWalls.stream()
+ .map(ardAlarmWall -> {
+ GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+ .setId(ardAlarmWall.getId())
+ .setName(ardAlarmWall.getWallName())
+ .setAlarmTime(ardAlarmWall.getCreateTime())
+ .setLongitude(ardAlarmWall.getLongitude())
+ .setLatitude(ardAlarmWall.getLatitude())
+ .setCount(ardAlarmWall.getCount())
+ .setTotal(ardAlarmWall.getTotal())
+ .setAlarmType("1010");
+ return globalAlarmData;
+ }).collect(Collectors.toList());
+ if(alarmData1010.size()>0) {
+ GlobalAlarmDataList.addAll(alarmData1010);
}
List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectListAllByCommand(refreshTime);
@@ -475,26 +525,26 @@
aac.setPageSize(pageSize);
return ardAlarmCameraMapper.selectArdAlarmCameraList(aac);
case 1003:
- ArdAlarmRadar aar = new ArdAlarmRadar();
- aar.setParams(params);
- aar.setPageNum(pageNum);
- aar.setPageSize(pageSize);
- aar.setAlarmType("杩愬姩鐩爣妫�娴�");
- return ardAlarmRadarMapper.selectArdAlarmRadarList(aar);
+ ArdAlarmRadarMove aarm = new ArdAlarmRadarMove();
+ aarm.setParams(params);
+ aarm.setPageNum(pageNum);
+ aarm.setPageSize(pageSize);
+ aarm.setAlarmType("杩愬姩鐩爣妫�娴�");
+ return ardAlarmRadarMoveMapper.selectArdAlarmRadarMoveList(aarm);
case 1004:
- ArdAlarmRadar aarr = new ArdAlarmRadar();
- aarr.setParams(params);
- aarr.setPageNum(pageNum);
- aarr.setPageSize(pageSize);
- aarr.setAlarmType("鐑簮妫�娴�");
- return ardAlarmRadarMapper.selectArdAlarmRadarList(aarr);
+ ArdAlarmRadarFire aarf = new ArdAlarmRadarFire();
+ aarf.setParams(params);
+ aarf.setPageNum(pageNum);
+ aarf.setPageSize(pageSize);
+ aarf.setAlarmType("鐑簮妫�娴�");
+ return ardAlarmRadarFireMapper.selectArdAlarmRadarFireList(aarf);
case 1007:
- ArdAlarmRadar aarrr = new ArdAlarmRadar();
- aarrr.setParams(params);
- aarrr.setPageNum(pageNum);
- aarrr.setPageSize(pageSize);
- aarrr.setAlarmType("闆疯揪鎶芥补鏈哄仠鏈�");
- return ardAlarmRadarMapper.selectArdAlarmRadarList(aarrr);
+ ArdAlarmRadarPump aarp = new ArdAlarmRadarPump();
+ aarp.setParams(params);
+ aarp.setPageNum(pageNum);
+ aarp.setPageSize(pageSize);
+ aarp.setAlarmType("闆疯揪鎶芥补鏈哄仠鏈�");
+ return ardAlarmRadarPumpMapper.selectArdAlarmRadarPumpList(aarp);
case 1005:
ArdAlarmExternal aae = new ArdAlarmExternal();
aae.setParams(params);
@@ -515,6 +565,12 @@
aaak.setPageNum(pageNum);
aaak.setPageSize(pageSize);
return ardAlarmApponekeyMapper.selectArdAlarmApponekeyList(aaak);
+ case 1010:
+ ArdAlarmWall aaw = new ArdAlarmWall();
+ aaw.setParams(params);
+ aaw.setPageNum(pageNum);
+ aaw.setPageSize(pageSize);
+ return ardAlarmWallMapper.selectArdAlarmWallList(aaw);
case 1014:
ArdAlarmTube aat = new ArdAlarmTube();
aat.setParams(params);
@@ -554,15 +610,28 @@
return ardAlarmCamera;
}
case 1003:
+ ArdAlarmRadarMove ardAlarmRadarMove = ardAlarmRadarMoveMapper.selectArdAlarmRadarMoveById(condition.getId());
+ if (StringUtils.isNotNull(ardAlarmRadarMove)) {
+ String name = ardAlarmRadarMove.getName();
+ String alarmTime = fmt.format(ardAlarmRadarMove.getAlarmTime());
+ ardAlarmRadarMoveMapper.updateViewTimeByCondition(name, alarmTime, DateUtils.getTime());
+ return ardAlarmRadarMove;
+ }
case 1004:
+ ArdAlarmRadarFire ardAlarmRadarFire = ardAlarmRadarFireMapper.selectArdAlarmRadarFireById(condition.getId());
+ if (StringUtils.isNotNull(ardAlarmRadarFire)) {
+ String name = ardAlarmRadarFire.getName();
+ String alarmTime = fmt.format(ardAlarmRadarFire.getAlarmTime());
+ ardAlarmRadarFireMapper.updateViewTimeByCondition(name, alarmTime, DateUtils.getTime());
+ return ardAlarmRadarFire;
+ }
case 1007:
- ArdAlarmRadar ardAlarmRadar = ardAlarmRadarMapper.selectArdAlarmRadarById(condition.getId());
- if (StringUtils.isNotNull(ardAlarmRadar)) {
- String name = ardAlarmRadar.getName();
- String alarmType = ardAlarmRadar.getAlarmType();
- String alarmTime = fmt.format(ardAlarmRadar.getAlarmTime());
- ardAlarmRadarMapper.updateViewTimeByCondition(name, alarmType, alarmTime, DateUtils.getTime());
- return ardAlarmRadar;
+ ArdAlarmRadarPump ardAlarmRadarPump = ardAlarmRadarPumpMapper.selectArdAlarmRadarPumpById(condition.getId());
+ if (StringUtils.isNotNull(ardAlarmRadarPump)) {
+ String name = ardAlarmRadarPump.getName();
+ String alarmTime = fmt.format(ardAlarmRadarPump.getAlarmTime());
+ ardAlarmRadarPumpMapper.updateViewTimeByCondition(name, alarmTime, DateUtils.getTime());
+ return ardAlarmRadarPump;
}
case 1005:
ArdAlarmExternal ardAlarmExternal = ardAlarmExternalMapper.selectArdAlarmExternalById(condition.getId());
@@ -588,6 +657,14 @@
String alarmTime = fmt.format(ardAlarmApponekey.getCreateTime());
ardAlarmApponekeyMapper.updateViewTimeByUserId(userId, alarmTime, DateUtils.getTime());
return ardAlarmApponekey;
+ }
+ case 1010:
+ ArdAlarmWall ardAlarmWall = ardAlarmWallMapper.selectArdAlarmWallById(condition.getId());
+ if (StringUtils.isNotNull(ardAlarmWall)) {
+ String userId = ardAlarmWall.getUserId();
+ String alarmTime = fmt.format(ardAlarmWall.getCreateTime());
+ ardAlarmWallMapper.updateViewTimeByUserId(userId, alarmTime, DateUtils.getTime());
+ return ardAlarmWall;
}
case 1014:
ArdAlarmTube ardAlarmTube = ardAlarmTubeMapper.selectArdAlarmTubeById(condition.getId());
@@ -682,81 +759,69 @@
//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<>();
for (ArdAlarmRadar ardAlarmRadar : ardAlarmRadars) {
String uuid = IdUtils.simpleUUID();
- ardAlarmRadar.setId(uuid);//鎶ヨID
- ardAlarmRadar.setAlarmTime(radarAlarmData.getAlarmTime());//鎶ヨ鏃堕棿
String alarmpointName = ardAlarmRadar.getName();//鍏磋叮鐐瑰悕绉�
- ardAlarmRadar.setName(ardAlarmRadar.getName() + "(" + radarAlarmData.getRadarName() + ")");//鎶ヨ鐐瑰悕绉�
- ardAlarmRadar.setCreateTime(new Date());//鎺ユ敹鏃堕棿
-
+ Double longitude = ardAlarmRadar.getLongitude();
+ Double latitude = ardAlarmRadar.getLatitude();
+ String targetId=ardAlarmRadar.getTargetId();
switch (ardAlarmRadar.getAlarmType()) {
case "杩愬姩鐩爣妫�娴�":
- String alarmType = "sys_radar_move";
+ ArdAlarmRadarMove ardAlarmRadarMove=new ArdAlarmRadarMove();
+ ardAlarmRadarMove.setId(uuid);
+ ardAlarmRadarMove.setTargetId(targetId);
+ ardAlarmRadarMove.setAlarmTime(radarAlarmData.getAlarmTime());
+ ardAlarmRadarMove.setCreateTime(new Date());
+ ardAlarmRadarMove.setName(alarmpointName + "(" + radarAlarmData.getRadarName() + ")");
+ ardAlarmRadarMove.setAlarmType("sys_radar_move");
+ ardAlarmRadarMove.setLongitude(longitude);
+ ardAlarmRadarMove.setLatitude(latitude);
+ //鍏ュ簱
+ ardAlarmRadarMoveMapper.insertArdAlarmRadarMove(ardAlarmRadarMove);
+ ardAlarmRadarMoves.add(ardAlarmRadarMove);
+
break;
case "鐑簮妫�娴�":
- alarmType = "sys_radar_fire";
+ ArdAlarmRadarFire ardAlarmRadarFire=new ArdAlarmRadarFire();
+ ardAlarmRadarFire.setId(uuid);
+ ardAlarmRadarFire.setTargetId(targetId);
+ ardAlarmRadarFire.setAlarmTime(radarAlarmData.getAlarmTime());
+ ardAlarmRadarFire.setCreateTime(new Date());
+ ardAlarmRadarFire.setName(alarmpointName + "(" + radarAlarmData.getRadarName() + ")");
+ ardAlarmRadarFire.setAlarmType("sys_radar_fire");
+ ardAlarmRadarFire.setLongitude(longitude);
+ ardAlarmRadarFire.setLatitude(latitude);
+ //鍏ュ簱
+ ardAlarmRadarFireMapper.insertArdAlarmRadarFire(ardAlarmRadarFire);
+ ardAlarmRadarFires.add(ardAlarmRadarFire);
+
break;
case "闆疯揪鎶芥补鏈哄仠鏈�":
- alarmType = "sys_radar_pumpshutdown";
+ ArdAlarmRadarPump ardAlarmRadarPump=new ArdAlarmRadarPump();
+ ardAlarmRadarPump.setId(uuid);
+ ardAlarmRadarPump.setTargetId(targetId);
+ ardAlarmRadarPump.setAlarmTime(radarAlarmData.getAlarmTime());
+ ardAlarmRadarPump.setCreateTime(new Date());
+ ardAlarmRadarPump.setName(ardAlarmRadar.getName() + "(" + radarAlarmData.getRadarName() + ")");
+ ardAlarmRadarPump.setAlarmType("sys_radar_pump");
ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
if (StringUtils.isNotNull(ardAlarmpointsWell)) {
- ardAlarmRadar.setLongitude(ardAlarmpointsWell.getLongitude());
- ardAlarmRadar.setLatitude(ardAlarmpointsWell.getLatitude());
+ ardAlarmRadarPump.setLongitude(ardAlarmpointsWell.getLongitude());
+ ardAlarmRadarPump.setLatitude(ardAlarmpointsWell.getLatitude());
}
+ //鍏ュ簱
+ ardAlarmRadarPumpMapper.insertArdAlarmRadarPump(ardAlarmRadarPump);
+ ardAlarmRadarPumps.add(ardAlarmRadarPump);
+
break;
}
- //鍏ュ簱
- ardAlarmRadarMapper.insertArdAlarmRadar(ardAlarmRadar);
-
}
- //鎸夊叴瓒ｇ偣鍘婚噸,鐒跺悗鎸夊紩瀵奸�昏緫杩涜寮曞鍏ラ槦
- ardAlarmRadars = ardAlarmRadars.stream()
- .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new java.util.TreeSet<>(java.util.Comparator.comparing(ArdAlarmRadar::getName))), ArrayList::new));
- for (ArdAlarmRadar ardAlarmRadar : ardAlarmRadars) {
- //閬嶅巻鎶ヨ鏁版嵁杩涜寮曞
- if (StringUtils.isNull(ardAlarmRadar.getLongitude()) || StringUtils.isNull(ardAlarmRadar.getLatitude())) {
- //鍧愭爣涓虹┖涓嶅紩瀵�
- continue;
- }
- double[] coordinate = new double[]{ardAlarmRadar.getLongitude(), ardAlarmRadar.getLatitude()};//鎶ヨ鍧愭爣
- //浠巖edis涓彇鍑哄綋鍓嶆姤璀︾偣鐨�5鍒嗛挓鍐呮槸鍚︽湁寮曞
- ArdAlarmRadar AlarmRadar = redisCache.getCacheObject("global_alarm:" + ardAlarmRadar.getName());//浠巖edis涓彇鍑烘渶鏂板紩瀵肩殑鎶ヨ鏁版嵁
- if (AlarmRadar == null) {
- //5鍒嗛挓鍐卹edis涓病鏈夋暟鎹紝璇存槑5鍒嗛挓鍐呮病鏈夊紩瀵兼暟鎹�
- ardAlarmRadar.setGuideFlag(1);
- //灏嗗紩瀵兼暟鎹啓鍏edis 璁剧疆5鍒嗛挓杩囨湡
- redisCache.setCacheObject("global_alarm:" + ardAlarmRadar.getName(), ardAlarmRadar, 5, TimeUnit.MINUTES);//寮曞鏁版嵁鍐欏叆redis
- unGuideCountMap.put(ardAlarmRadar.getName(), 0);
- //寮曞鍏ラ槦
- radarGuide(radarAlarmData.getRadarId(), ardAlarmRadar.getName(), ardAlarmRadar.getAlarmType(), ardAlarmRadar.getCreateTime(), coordinate);
-
- } else {
- //5鍒嗛挓鍐卹edis涓湁鏁版嵁锛岃鏄�5鍒嗛挓鍐呮湁寮曞鏁版嵁,鑾峰彇褰撳墠鎶ヨ鐐圭殑鏈紩瀵兼鏁�
- Integer count = unGuideCountMap.get(ardAlarmRadar.getName());
- if (count != null) {
- if (count > 2) {
- //鏈紩瀵兼鏁�3娆″悗杩涜寮曞
- ardAlarmRadar.setGuideFlag(1);
- //灏嗗紩瀵兼暟鎹啓鍏edis 璁剧疆5鍒嗛挓杩囨湡
- redisCache.setCacheObject("global_alarm:" + ardAlarmRadar.getName(), ardAlarmRadar, 5, TimeUnit.MINUTES);
- count = 0;
- //寮曞鍏ラ槦
- radarGuide(radarAlarmData.getRadarId(), ardAlarmRadar.getName(), ardAlarmRadar.getAlarmType(), ardAlarmRadar.getCreateTime(), coordinate);
- } else {
- ardAlarmRadar.setGuideFlag(0);
- count++;
- }
- } else {
- ardAlarmRadar.setGuideFlag(0);
- count = 0;
- }
- unGuideCountMap.put(ardAlarmRadar.getName(), count);
- //鏇存柊
- ardAlarmRadarMapper.updateArdAlarmRadar(ardAlarmRadar);
- }
- }
- //endregion
+ radarMoveGuide(ardAlarmRadarMoves,radarAlarmData);
+ radarFireGuide(ardAlarmRadarFires,radarAlarmData);
+ radarPumpGuide(ardAlarmRadarPumps,radarAlarmData);
break;
case "external":
//region 澶勭悊澶栬仈鎶ヨ
@@ -945,14 +1010,15 @@
/**
* 闆疯揪寮曞鍏ラ槦
*/
- private void radarGuide(String radarId, String alarmpointName, String alarmType, Date createTime, double[] coordinate) {
- String uuid = IdUtils.simpleUUID();
+ 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);
//鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
- String cameraIdWithTower = ardAlarmRadarMapper.getCameraByRadar(radarId);
+ String cameraIdWithTower = ardEquipRadarMapper.getCameraByRadar(radarId);
if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
log.info("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:" + cameraIdWithTower);
//濡傛灉闆疯揪濉斾笂鏈夊厜鐢�
- messagesEnqueued(cameraIdWithTower, uuid, alarmType, createTime, 1, 1, coordinate);
+ messagesEnqueued(cameraIdWithTower, alarmId, alarmType, createTime, 1, 1, coordinate);
}
//鑾峰彇鎶ヨ鐐瑰叧鑱旂殑澶у厜鐢�
ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
@@ -963,8 +1029,160 @@
}
log.info("鑾峰彇鍒版姤璀︾偣鍏宠仈鐨勫厜鐢�:" + cameraId);
//濡傛灉鎶ヨ鐐瑰叧鑱斾簡鍏夌數
- messagesEnqueued(cameraId, uuid, alarmType, createTime, 1, 2, coordinate);
+ messagesEnqueued(cameraId, alarmId, alarmType, createTime, 1, 2, coordinate);
}
}
+
+ 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));
+ for (ArdAlarmRadarMove ardAlarmRadarMove : ardAlarmRadarMoves) {
+ //閬嶅巻鎶ヨ鏁版嵁杩涜寮曞
+ if (StringUtils.isNull(ardAlarmRadarMove.getLongitude()) || StringUtils.isNull(ardAlarmRadarMove.getLatitude())) {
+ //鍧愭爣涓虹┖涓嶅紩瀵�
+ continue;
+ }
+ double[] coordinate = new double[]{ardAlarmRadarMove.getLongitude(), ardAlarmRadarMove.getLatitude()};//鎶ヨ鍧愭爣
+ //浠巖edis涓彇鍑哄綋鍓嶆姤璀︾偣鐨�5鍒嗛挓鍐呮槸鍚︽湁寮曞
+ ArdAlarmRadarMove alarmRadarMove = redisCache.getCacheObject("global_move_alarm:" + ardAlarmRadarMove.getName());//浠巖edis涓彇鍑烘渶鏂板紩瀵肩殑鎶ヨ鏁版嵁
+ if (alarmRadarMove == null) {
+ //5鍒嗛挓鍐卹edis涓病鏈夋暟鎹紝璇存槑5鍒嗛挓鍐呮病鏈夊紩瀵兼暟鎹�
+ ardAlarmRadarMove.setGuideFlag(1);
+ //灏嗗紩瀵兼暟鎹啓鍏edis 璁剧疆5鍒嗛挓杩囨湡
+ redisCache.setCacheObject("global_move_alarm:" + ardAlarmRadarMove.getName(), ardAlarmRadarMove, 5, TimeUnit.MINUTES);//寮曞鏁版嵁鍐欏叆redis
+ unGuideCountMapMove.put(ardAlarmRadarMove.getName(), 0);
+ //寮曞鍏ラ槦
+ radarGuideToQueue(ardAlarmRadarMove.getId(),radarAlarmData.getRadarId(), ardAlarmRadarMove.getName(), ardAlarmRadarMove.getAlarmType(), ardAlarmRadarMove.getCreateTime(), coordinate);//鏇存柊
+
+ } else {
+ //5鍒嗛挓鍐卹edis涓湁鏁版嵁锛岃鏄�5鍒嗛挓鍐呮湁寮曞鏁版嵁,鑾峰彇褰撳墠鎶ヨ鐐圭殑鏈紩瀵兼鏁�
+ Integer count = unGuideCountMapMove.get(ardAlarmRadarMove.getName());
+ if (count != null) {
+ if (count > 2) {
+ //鏈紩瀵兼鏁�3娆″悗杩涜寮曞
+ ardAlarmRadarMove.setGuideFlag(1);
+ //灏嗗紩瀵兼暟鎹啓鍏edis 璁剧疆5鍒嗛挓杩囨湡
+ redisCache.setCacheObject("global_move_alarm:" + ardAlarmRadarMove.getName(), ardAlarmRadarMove, 5, TimeUnit.MINUTES);
+ count = 0;
+ //寮曞鍏ラ槦
+
+ radarGuideToQueue(ardAlarmRadarMove.getId(),radarAlarmData.getRadarId(), ardAlarmRadarMove.getName(), ardAlarmRadarMove.getAlarmType(), ardAlarmRadarMove.getCreateTime(), coordinate);
+ } else {
+ ardAlarmRadarMove.setGuideFlag(0);
+ count++;
+ }
+ } else {
+ ardAlarmRadarMove.setGuideFlag(0);
+ count = 0;
+ }
+ unGuideCountMapMove.put(ardAlarmRadarMove.getName(), count);
+ }
+ //鏇存柊
+ ardAlarmRadarMoveMapper.updateArdAlarmRadarMove(ardAlarmRadarMove);
+ }
+ //endregion
+ }
+ 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));
+ for (ArdAlarmRadarFire ardAlarmRadarFire : ardAlarmRadarFires) {
+ //閬嶅巻鎶ヨ鏁版嵁杩涜寮曞
+ if (StringUtils.isNull(ardAlarmRadarFire.getLongitude()) || StringUtils.isNull(ardAlarmRadarFire.getLatitude())) {
+ //鍧愭爣涓虹┖涓嶅紩瀵�
+ continue;
+ }
+ double[] coordinate = new double[]{ardAlarmRadarFire.getLongitude(), ardAlarmRadarFire.getLatitude()};//鎶ヨ鍧愭爣
+ //浠巖edis涓彇鍑哄綋鍓嶆姤璀︾偣鐨�5鍒嗛挓鍐呮槸鍚︽湁寮曞
+ ArdAlarmRadarFire alarmRadarFire = redisCache.getCacheObject("global_fire_alarm:" + ardAlarmRadarFire.getName());//浠巖edis涓彇鍑烘渶鏂板紩瀵肩殑鎶ヨ鏁版嵁
+ if (alarmRadarFire == null) {
+ //5鍒嗛挓鍐卹edis涓病鏈夋暟鎹紝璇存槑5鍒嗛挓鍐呮病鏈夊紩瀵兼暟鎹�
+ ardAlarmRadarFire.setGuideFlag(1);
+ //灏嗗紩瀵兼暟鎹啓鍏edis 璁剧疆5鍒嗛挓杩囨湡
+ redisCache.setCacheObject("global_fire_alarm:" + ardAlarmRadarFire.getName(), ardAlarmRadarFire, 5, TimeUnit.MINUTES);//寮曞鏁版嵁鍐欏叆redis
+ unGuideCountMapFire.put(alarmRadarFire.getName(), 0);
+ //寮曞鍏ラ槦
+ radarGuideToQueue(ardAlarmRadarFire.getId(),radarAlarmData.getRadarId(), ardAlarmRadarFire.getName(), ardAlarmRadarFire.getAlarmType(), ardAlarmRadarFire.getCreateTime(), coordinate);
+
+ } else {
+ //5鍒嗛挓鍐卹edis涓湁鏁版嵁锛岃鏄�5鍒嗛挓鍐呮湁寮曞鏁版嵁,鑾峰彇褰撳墠鎶ヨ鐐圭殑鏈紩瀵兼鏁�
+ Integer count = unGuideCountMapFire.get(alarmRadarFire.getName());
+ if (count != null) {
+ if (count > 2) {
+ //鏈紩瀵兼鏁�3娆″悗杩涜寮曞
+ ardAlarmRadarFire.setGuideFlag(1);
+ //灏嗗紩瀵兼暟鎹啓鍏edis 璁剧疆5鍒嗛挓杩囨湡
+ redisCache.setCacheObject("global_fire_alarm:" + ardAlarmRadarFire.getName(), ardAlarmRadarFire, 5, TimeUnit.MINUTES);
+ count = 0;
+ //寮曞鍏ラ槦
+ radarGuideToQueue(ardAlarmRadarFire.getId(),radarAlarmData.getRadarId(), ardAlarmRadarFire.getName(), ardAlarmRadarFire.getAlarmType(), ardAlarmRadarFire.getCreateTime(), coordinate);
+ } else {
+ ardAlarmRadarFire.setGuideFlag(0);
+ count++;
+ }
+ } else {
+ ardAlarmRadarFire.setGuideFlag(0);
+ count = 0;
+ }
+ unGuideCountMapFire.put(ardAlarmRadarFire.getName(), count);
+ }
+ //鏇存柊
+ ardAlarmRadarFireMapper.updateArdAlarmRadarFire(ardAlarmRadarFire);
+ }
+ //endregion
+ }
+ 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));
+ for (ArdAlarmRadarPump ardAlarmRadarPump : ardAlarmRadarPumps) {
+ //閬嶅巻鎶ヨ鏁版嵁杩涜寮曞
+ if (StringUtils.isNull(ardAlarmRadarPump.getLongitude()) || StringUtils.isNull(ardAlarmRadarPump.getLatitude())) {
+ //鍧愭爣涓虹┖涓嶅紩瀵�
+ continue;
+ }
+ double[] coordinate = new double[]{ardAlarmRadarPump.getLongitude(), ardAlarmRadarPump.getLatitude()};//鎶ヨ鍧愭爣
+ //浠巖edis涓彇鍑哄綋鍓嶆姤璀︾偣鐨�5鍒嗛挓鍐呮槸鍚︽湁寮曞
+ ArdAlarmRadarPump alarmRadarPump = redisCache.getCacheObject("global_pump_alarm:" + ardAlarmRadarPump.getName());//浠巖edis涓彇鍑烘渶鏂板紩瀵肩殑鎶ヨ鏁版嵁
+ if (alarmRadarPump == null) {
+ //5鍒嗛挓鍐卹edis涓病鏈夋暟鎹紝璇存槑5鍒嗛挓鍐呮病鏈夊紩瀵兼暟鎹�
+ ardAlarmRadarPump.setGuideFlag(1);
+ //灏嗗紩瀵兼暟鎹啓鍏edis 璁剧疆5鍒嗛挓杩囨湡
+ redisCache.setCacheObject("global_pump_alarm:" + ardAlarmRadarPump.getName(), ardAlarmRadarPump, 5, TimeUnit.MINUTES);//寮曞鏁版嵁鍐欏叆redis
+ unGuideCountMapPump.put(alarmRadarPump.getName(), 0);
+ //寮曞鍏ラ槦
+ radarGuideToQueue(ardAlarmRadarPump.getId(),radarAlarmData.getRadarId(), ardAlarmRadarPump.getName(), ardAlarmRadarPump.getAlarmType(), ardAlarmRadarPump.getCreateTime(), coordinate);
+
+ } else {
+ //5鍒嗛挓鍐卹edis涓湁鏁版嵁锛岃鏄�5鍒嗛挓鍐呮湁寮曞鏁版嵁,鑾峰彇褰撳墠鎶ヨ鐐圭殑鏈紩瀵兼鏁�
+ Integer count = unGuideCountMapPump.get(ardAlarmRadarPump.getName());
+ if (count != null) {
+ if (count > 2) {
+ //鏈紩瀵兼鏁�3娆″悗杩涜寮曞
+ ardAlarmRadarPump.setGuideFlag(1);
+ //灏嗗紩瀵兼暟鎹啓鍏edis 璁剧疆5鍒嗛挓杩囨湡
+ redisCache.setCacheObject("global_pump_alarm:" + ardAlarmRadarPump.getName(), ardAlarmRadarPump, 5, TimeUnit.MINUTES);
+ count = 0;
+ //寮曞鍏ラ槦
+ radarGuideToQueue(ardAlarmRadarPump.getId(),radarAlarmData.getRadarId(), ardAlarmRadarPump.getName(), ardAlarmRadarPump.getAlarmType(), ardAlarmRadarPump.getCreateTime(), coordinate);
+ } else {
+ ardAlarmRadarPump.setGuideFlag(0);
+ count++;
+ }
+ } else {
+ ardAlarmRadarPump.setGuideFlag(0);
+ count = 0;
+ }
+ unGuideCountMapPump.put(ardAlarmRadarPump.getName(), count);
+ }
+ //鏇存柊
+ ardAlarmRadarPumpMapper.updateArdAlarmRadarPump(ardAlarmRadarPump);
+ }
+ //endregion
+ }
}
--
Gitblit v1.9.3