From 6bc1206774770deb0b2df12ab24b4628e1f399eb Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期一, 22 七月 2024 10:56:36 +0800 Subject: [PATCH] 电磁锁状态查询修改及若依生成文件提交 --- ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java | 24 +++++++++++++++--------- 1 files changed, 15 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..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; @@ -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,12 @@ //澶栬仈闃插尯鍚嶇О灏辨槸鍏磋叮鐐癸紝鏌ュ叴瓒g偣鍧愭爣 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); @@ -1281,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