From d0dda9bbe5f4df89b8275262519c7a6878e82e96 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期日, 28 四月 2024 16:40:23 +0800
Subject: [PATCH] 取消外联报警找不到井上报
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 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 2de1c2c..b816517 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
@@ -33,6 +33,7 @@
import com.ruoyi.alarmpoints.well.domain.ArdWellGuideCamera;
import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
import com.ruoyi.alarmpoints.well.mapper.ArdWellGuideCameraMapper;
+import com.ruoyi.common.config.ARDConfig;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.ConfigUtils;
@@ -42,6 +43,7 @@
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.excel.EasyExcelUtil;
import com.ruoyi.utils.gis.GisUtil;
import com.ruoyi.utils.tools.ArdTool;
import com.ruoyi.common.utils.uuid.IdUtils;
@@ -50,6 +52,7 @@
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.utils.tube.GeoPoint;
import com.ruoyi.utils.tube.TubeTools;
+import com.ruoyi.utils.websocket.util.WebSocketUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@@ -88,8 +91,6 @@
private ArdAlarmAccessMapper ardAlarmAccessMapper;
@Resource
private ArdAlarmExternalMapper ardAlarmExternalMapper;
- //@Resource
- //private ArdAlarmRadarMapper ardAlarmRadarMapper;
@Resource
private ArdAlarmRadarMoveMapper ardAlarmRadarMoveMapper;
@Resource
@@ -782,25 +783,28 @@
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
@Override
- public Object selectAlarmList(Integer command, String beginTime, String endTime, Integer pageNum, Integer pageSize) {
+ public Object selectAlarmList(String name, Integer command, String beginTime, String endTime, Integer pageNum, Integer pageSize) {
Map<String, Object> params = new HashMap<>();
params.put("beginTime", beginTime);
params.put("endTime", endTime);
switch (command) {
case 1001:
ArdAlarmStealelec aas = new ArdAlarmStealelec();
+ aas.setName(name);
aas.setParams(params);
aas.setPageNum(pageNum);
aas.setPageSize(pageSize);
return ardAlarmStealelecMapper.selectArdAlarmStealelecList(aas);
case 1002:
ArdAlarmCamera aac = new ArdAlarmCamera();
+ aac.setCameraName(name);
aac.setParams(params);
aac.setPageNum(pageNum);
aac.setPageSize(pageSize);
return ardAlarmCameraMapper.selectArdAlarmCameraList(aac);
case 1003:
ArdAlarmRadarMove aarm = new ArdAlarmRadarMove();
+ aarm.setName(name);
aarm.setParams(params);
aarm.setPageNum(pageNum);
aarm.setPageSize(pageSize);
@@ -808,6 +812,7 @@
return ardAlarmRadarMoveMapper.selectArdAlarmRadarMoveList(aarm);
case 1004:
ArdAlarmRadarFire aarf = new ArdAlarmRadarFire();
+ aarf.setName(name);
aarf.setParams(params);
aarf.setPageNum(pageNum);
aarf.setPageSize(pageSize);
@@ -815,6 +820,7 @@
return ardAlarmRadarFireMapper.selectArdAlarmRadarFireList(aarf);
case 1007:
ArdAlarmRadarPump aarp = new ArdAlarmRadarPump();
+ aarp.setName(name);
aarp.setParams(params);
aarp.setPageNum(pageNum);
aarp.setPageSize(pageSize);
@@ -822,6 +828,7 @@
return ardAlarmRadarPumpMapper.selectArdAlarmRadarPumpList(aarp);
case 1005:
ArdAlarmExternal aae = new ArdAlarmExternal();
+ aae.setAlarmName(name);
aae.setParams(params);
aae.setPageNum(pageNum);
aae.setPageSize(pageSize);
@@ -829,6 +836,7 @@
return ardAlarmExternalMapper.selectArdAlarmExternalList(aae);
case 1006:
ArdAlarmAccess aaa = new ArdAlarmAccess();
+ aaa.setAcsName(name);
aaa.setParams(params);
aaa.setPageNum(pageNum);
aaa.setPageSize(pageSize);
@@ -836,30 +844,35 @@
return ardAlarmAccessMapper.selectArdAlarmAccessList(aaa);
case 1009:
ArdAlarmApponekey aaak = new ArdAlarmApponekey();
+ aaak.setName(name);
aaak.setParams(params);
aaak.setPageNum(pageNum);
aaak.setPageSize(pageSize);
return ardAlarmApponekeyMapper.selectArdAlarmApponekeyList(aaak);
case 1010:
ArdAlarmWall aaw = new ArdAlarmWall();
+ aaw.setWallName(name);
aaw.setParams(params);
aaw.setPageNum(pageNum);
aaw.setPageSize(pageSize);
return ardAlarmWallMapper.selectArdAlarmWallList(aaw);
case 1012:
ArdAlarmDigitization3 aad3 = new ArdAlarmDigitization3();
+ aad3.setfName(name);
aad3.setParams(params);
aad3.setPageNum(pageNum);
aad3.setPageSize(pageSize);
return ardAlarmDigitization3Mapper.selectArdAlarmDigitization3List(aad3);
case 1014:
ArdAlarmTube aat = new ArdAlarmTube();
+ aat.setTubeName(name);
aat.setParams(params);
aat.setPageNum(pageNum);
aat.setPageSize(pageSize);
return ardAlarmTubeMapper.selectArdAlarmTubeList(aat);
case 1015:
ArdAlarmSuperBrain aasb = new ArdAlarmSuperBrain();
+ aasb.setAlarmName(name);
aasb.setParams(params);
aasb.setPageNum(pageNum);
aasb.setPageSize(pageSize);
@@ -1075,8 +1088,12 @@
String alarmpointName = ardAlarmRadar.getName();//鍏磋叮鐐瑰悕绉�
ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
if (well == null) {
- String path = System.getProperty("user.dir") + File.separator + "noExistWell.txt";
- writeStringToFile(alarmpointName, path);
+ Map<String, Object> map = new HashMap<>();
+ map.put("80000", alarmpointName);
+ WebSocketUtils.sendMessageAll(map);
+ String fileName = ARDConfig.getDownloadPath() + "noExistWell.xlsx";
+ String msg = alarmpointName + "(" + radarAlarmData.getRadarName() + ")";
+ EasyExcelUtil.writeAppend(fileName, msg);
continue;
}
@@ -1141,11 +1158,12 @@
//澶栬仈闃插尯鍚嶇О灏辨槸鍏磋叮鐐癸紝鏌ュ叴瓒ｇ偣鍧愭爣
String defenseName = ardAlarmExternal.getDefenseName();
ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(defenseName);
-
- if (StringUtils.isNotNull(well)) {
- ardAlarmExternal.setLongitude(well.getLongitude());
- ardAlarmExternal.setLatitude(well.getLatitude());
+ if (well == null) {
+ return;
}
+
+ ardAlarmExternal.setLongitude(well.getLongitude());
+ ardAlarmExternal.setLatitude(well.getLatitude());
int aae = ardAlarmExternalMapper.insertArdAlarmExternal(ardAlarmExternal);
if (aae > 0) {
log.debug("external鍏ュ簱鎴愬姛锛�" + ardAlarmExternal);
@@ -1270,8 +1288,7 @@
GuideTask guideTask = new GuideTask();
guideTask.setCameraId(cameraId);//鐩告満ID
guideTask.setIsGuidePTZ(guideDataDto.getIsGuidePTZ());
- if(guideTask.getIsGuidePTZ())
- {
+ if (guideTask.getIsGuidePTZ()) {
guideTask.setTargetPTZ(guideDataDto.getGuidePTZ());
}
String alarmType = guideDataDto.getAlarmType();
--
Gitblit v1.9.3