增加雷达报警和视频巡检引导类型上报

‘liusuyi’

2024-04-19 39004678a36c17fcea0674b54675a76c2d3b0528

 ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java

@@ -51,6 +51,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 +782,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,7 +1087,10 @@
                        String alarmpointName = ardAlarmRadar.getName();//兴趣点名称
                        ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
                        if (well == null) {
                            String filePath = ARDConfig.getDownloadPath() +  "noExistWell.txt";
                            Map<String, Object> map = new HashMap<>();
                            map.put("80000", alarmpointName);
                            WebSocketUtils.sendMessageAll(map);
                            String filePath = ARDConfig.getDownloadPath() + "noExistWell.txt";
                            writeStringToFile(alarmpointName, filePath);
                            continue;
                        }
@@ -1152,11 +1156,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 +1291,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();