From 4bd7323a48505f15ab34b7900c871be7ca0312c6 Mon Sep 17 00:00:00 2001
From: zhangjianrock@163.com <zhangjianrock@163.com>
Date: 星期日, 28 四月 2024 14:46:27 +0800
Subject: [PATCH] 按任务id和开始时间查询
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 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 f56ed47..2b1dcfa 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;
@@ -51,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;
@@ -781,7 +783,7 @@
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
@Override
- public Object selectAlarmList(String name,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);
@@ -1086,8 +1088,12 @@
String alarmpointName = ardAlarmRadar.getName();//鍏磋叮鐐瑰悕绉�
ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
if (well == null) {
- String filePath = ARDConfig.getDownloadPath() + "noExistWell.txt";
- writeStringToFile(alarmpointName, filePath);
+ 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;
}
@@ -1152,11 +1158,17 @@
//澶栬仈闃插尯鍚嶇О灏辨槸鍏磋叮鐐癸紝鏌ュ叴瓒ｇ偣鍧愭爣
String defenseName = ardAlarmExternal.getDefenseName();
ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(defenseName);
-
- if (StringUtils.isNotNull(well)) {
- ardAlarmExternal.setLongitude(well.getLongitude());
- ardAlarmExternal.setLatitude(well.getLatitude());
+ 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;
}
+
+ ardAlarmExternal.setLongitude(well.getLongitude());
+ ardAlarmExternal.setLatitude(well.getLatitude());
int aae = ardAlarmExternalMapper.insertArdAlarmExternal(ardAlarmExternal);
if (aae > 0) {
log.debug("external鍏ュ簱鎴愬姛锛�" + ardAlarmExternal);
@@ -1281,8 +1293,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