From 4b66cd48d9e0ca8288dae11f3a895367d30a7b8a Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 19 九月 2023 10:05:49 +0800
Subject: [PATCH] 增加三场数字化报警
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java | 85 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 77 insertions(+), 8 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 70a9e07..d984130 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
@@ -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;
@@ -69,6 +70,8 @@
@Slf4j(topic = "mqtt")
public class GlobalAlarmServiceImpl implements IGlobalAlarmService {
//region 渚濊禆娉ㄥ叆
+ @Resource
+ private ArdAlarmDigitization3Mapper ardAlarmDigitization3Mapper;
@Resource
private ArdAlarmWallMapper ardAlarmWallMapper;
@Resource
@@ -148,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;
}
@@ -289,6 +294,22 @@
.setLatitude(ardAlarmWall.getLatitude())
.setCount(ardAlarmWall.getCount())
.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:
@@ -653,6 +674,24 @@
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()
.map(ardAlarmTube -> {
@@ -747,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);
@@ -842,6 +887,14 @@
String alarmTime = fmtms.format(ardAlarmWall.getAlarmTime());
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());
@@ -1006,6 +1059,7 @@
radarMoveGuide(ardAlarmRadarMoves, radarAlarmData);
radarFireGuide(ardAlarmRadarFires, radarAlarmData);
radarPumpGuide(ardAlarmRadarPumps, radarAlarmData);
+ //endregion
break;
case "external":
//region 澶勭悊澶栬仈鎶ヨ
@@ -1072,6 +1126,23 @@
int aaak = ardAlarmApponekeyMapper.insertArdAlarmApponekey(ardAlarmApponekey);
if (aaak > 0) {
log.debug("apponekey鍏ュ簱鎴愬姛锛�" + ardAlarmApponekey);
+ }
+ //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;
@@ -1205,9 +1276,8 @@
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);
@@ -1234,8 +1304,7 @@
log.debug("鏈幏鍙栧埌鎶ヨ鐐瑰叧鑱旂殑鍏夌數");
}
}
-
-
+ //闆疯揪绉诲姩寮曞
private void radarMoveGuide(List<ArdAlarmRadarMove> ardAlarmRadarMoves, RadarAlarmData radarAlarmData) {
//鎸夊叴瓒ｇ偣鍘婚噸,鐒跺悗鎸夊紩瀵奸�昏緫杩涜寮曞鍏ラ槦
ardAlarmRadarMoves = ardAlarmRadarMoves.stream()
@@ -1288,7 +1357,7 @@
}
//endregion
}
-
+ //闆疯揪闃茬伀寮曞
private void radarFireGuide(List<ArdAlarmRadarFire> ardAlarmRadarFires, RadarAlarmData radarAlarmData) {
//鎸夊叴瓒ｇ偣鍘婚噸,鐒跺悗鎸夊紩瀵奸�昏緫杩涜寮曞鍏ラ槦
ardAlarmRadarFires = ardAlarmRadarFires.stream()
@@ -1340,7 +1409,7 @@
}
//endregion
}
-
+ //闆疯揪鎶芥补鏈哄仠鏈哄紩瀵�
private void radarPumpGuide(List<ArdAlarmRadarPump> ardAlarmRadarPumps, RadarAlarmData radarAlarmData) {
//鎸夊叴瓒ｇ偣鍘婚噸,鐒跺悗鎸夊紩瀵奸�昏緫杩涜寮曞鍏ラ槦
ardAlarmRadarPumps = ardAlarmRadarPumps.stream()
--
Gitblit v1.9.3