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 | 11 ++++-------
1 files changed, 4 insertions(+), 7 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 1b0fdff..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
@@ -43,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;
@@ -1090,8 +1091,9 @@
Map<String, Object> map = new HashMap<>();
map.put("80000", alarmpointName);
WebSocketUtils.sendMessageAll(map);
- String filePath = ARDConfig.getDownloadPath() + "noExistWell.txt";
- writeStringToFile(alarmpointName, filePath);
+ String fileName = ARDConfig.getDownloadPath() + "noExistWell.xlsx";
+ String msg = alarmpointName + "(" + radarAlarmData.getRadarName() + ")";
+ EasyExcelUtil.writeAppend(fileName, msg);
continue;
}
@@ -1157,11 +1159,6 @@
String defenseName = ardAlarmExternal.getDefenseName();
ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(defenseName);
if (well == null) {
- Map<String, Object> map = new HashMap<>();
- map.put("80000", defenseName);
- WebSocketUtils.sendMessageAll(map);
- String filePath = ARDConfig.getDownloadPath() + "noExistWell.txt";
- writeStringToFile(defenseName, filePath);
return;
}
--
Gitblit v1.9.3