增加外联报警数据接收入库和引导就近光电 增加外联报警业务功能

‘liusuyi’

2023-07-07 5f5cf5b1b4683a56fd0c85a0d89d14a4c0268cde

增加外联报警数据接收入库和引导就近光电
增加外联报警业务功能

 ard-work/src/main/java/com/ruoyi/alarm/externalAlarm/controller/ArdAlarmExternalController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,105 @@
package com.ruoyi.alarm.externalAlarm.controller;

import java.util.List;
import javax.servlet.http.HttpServletResponse;

import com.ruoyi.alarm.externalAlarm.domain.ArdAlarmExternal;
import com.ruoyi.alarm.externalAlarm.service.IArdAlarmExternalService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;

/**
 * å¤–联报警Controller
 * 
 * @author ard
 * @date 2023-07-07
 */
@RestController
@RequestMapping("/alarm/external")
public class ArdAlarmExternalController extends BaseController
{
    @Autowired
    private IArdAlarmExternalService ardAlarmExternalService;

    /**
     * æŸ¥è¯¢å¤–联报警列表
     */
    @PreAuthorize("@ss.hasPermi('alarm:external:list')")
    @GetMapping("/list")
    public TableDataInfo list(ArdAlarmExternal ardAlarmExternal)
    {
        startPage();
        List<ArdAlarmExternal> list = ardAlarmExternalService.selectArdAlarmExternalList(ardAlarmExternal);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºå¤–联报警列表
     */
    @PreAuthorize("@ss.hasPermi('alarm:external:export')")
    @Log(title = "外联报警", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ArdAlarmExternal ardAlarmExternal)
    {
        List<ArdAlarmExternal> list = ardAlarmExternalService.selectArdAlarmExternalList(ardAlarmExternal);
        ExcelUtil<ArdAlarmExternal> util = new ExcelUtil<ArdAlarmExternal>(ArdAlarmExternal.class);
        util.exportExcel(response, list, "外联报警数据");
    }

    /**
     * èŽ·å–外联报警详细信息
     */
    @PreAuthorize("@ss.hasPermi('alarm:external:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") String id)
    {
        return success(ardAlarmExternalService.selectArdAlarmExternalById(id));
    }

    /**
     * æ–°å¢žå¤–联报警
     */
    @PreAuthorize("@ss.hasPermi('alarm:external:add')")
    @Log(title = "外联报警", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ArdAlarmExternal ardAlarmExternal)
    {
        return toAjax(ardAlarmExternalService.insertArdAlarmExternal(ardAlarmExternal));
    }

    /**
     * ä¿®æ”¹å¤–联报警
     */
    @PreAuthorize("@ss.hasPermi('alarm:external:edit')")
    @Log(title = "外联报警", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ArdAlarmExternal ardAlarmExternal)
    {
        return toAjax(ardAlarmExternalService.updateArdAlarmExternal(ardAlarmExternal));
    }

    /**
     * åˆ é™¤å¤–联报警
     */
    @PreAuthorize("@ss.hasPermi('alarm:external:remove')")
    @Log(title = "外联报警", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids)
    {
        return toAjax(ardAlarmExternalService.deleteArdAlarmExternalByIds(ids));
    }
}

 ard-work/src/main/java/com/ruoyi/alarm/externalAlarm/domain/ArdAlarmExternal.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,127 @@
package com.ruoyi.alarm.externalAlarm.domain;

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;

/**
 * å¤–联报警对象 ard_alarm_external
 *
 * @author ard
 * @date 2023-07-07
 */
@Data
public class ArdAlarmExternal extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * id
     */
    private String id;

    /**
     * æŠ¥è­¦ID
     */
    @Excel(name = "报警ID")
    private String alarmId;

    /**
     * æŠ¥è­¦åç§°
     */
    @Excel(name = "报警名称")
    private String alarmName;

    /**
     * é˜²åŒºID
     */
    @Excel(name = "防区ID")
    private String defenseId;

    /**
     * é˜²åŒºåç§°
     */
    @Excel(name = "防区名称")
    private String defenseName;

    /**
     * æŠ¥è­¦ç±»åˆ«
     */
    @Excel(name = "报警类别")
    private String alarmType;

    /**
     * æŠ¥è­¦æ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "报警时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date alarmTime;
    /**
     * ç»åº¦
     */
    @Excel(name = "经度")
    private Double longitude;

    /**
     * çº¬åº¦
     */
    @Excel(name = "纬度")
    private Double latitude;

    /**
     * é«˜å±‚
     */
    @Excel(name = "高层")
    private Double altitude;

    /**
     * å¼•å¯¼å½•åƒurl
     */
    @Excel(name = "引导录像url")
    private String recordUrl;
    /**
     * å­ç³»ç»ŸID
     */
    @Excel(name = "子系统ID")
    private String subSysNo;

    /**
     * æŠ¥è­¦ä¸»æœºID
     */
    @Excel(name = "报警主机ID")
    private String alarmHostId;

    /**
     * æŸ¥çœ‹æ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "查看时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date viewTime;

    /**
     * éƒ¨é—¨ID
     */
    @Excel(name = "部门ID")
    private String deptId;

    /**
     * ç”¨æˆ·ID
     */
    @Excel(name = "用户ID")
    private String userId;

    /**
     * æŠ¥è­¦æ€»æ•°
     */
    private Integer total;
    /**
     * æœªè¯»æŠ¥è­¦æ•°é‡
     */
    private Integer count;


}

 ard-work/src/main/java/com/ruoyi/alarm/externalAlarm/mapper/ArdAlarmExternalMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,69 @@
package com.ruoyi.alarm.externalAlarm.mapper;

import java.util.List;
import com.ruoyi.alarm.externalAlarm.domain.ArdAlarmExternal;
import com.ruoyi.alarm.radarAlarm.domain.ArdAlarmRadar;
import org.apache.ibatis.annotations.Param;

/**
 * å¤–联报警Mapper接口
 * 
 * @author ard
 * @date 2023-07-07
 */
public interface ArdAlarmExternalMapper 
{
    /**
     * æŸ¥è¯¢å¤–联报警
     * 
     * @param id å¤–联报警主键
     * @return å¤–联报警
     */
    public ArdAlarmExternal selectArdAlarmExternalById(String id);

    /**
     * æŸ¥è¯¢å¤–联报警列表
     * 
     * @param ardAlarmExternal å¤–联报警
     * @return å¤–联报警集合
     */
    public List<ArdAlarmExternal> selectArdAlarmExternalList(ArdAlarmExternal ardAlarmExternal);

    /**
     * æ–°å¢žå¤–联报警
     * 
     * @param ardAlarmExternal å¤–联报警
     * @return ç»“æžœ
     */
    public int insertArdAlarmExternal(ArdAlarmExternal ardAlarmExternal);

    /**
     * ä¿®æ”¹å¤–联报警
     * 
     * @param ardAlarmExternal å¤–联报警
     * @return ç»“æžœ
     */
    public int updateArdAlarmExternal(ArdAlarmExternal ardAlarmExternal);

    /**
     * åˆ é™¤å¤–联报警
     * 
     * @param id å¤–联报警主键
     * @return ç»“æžœ
     */
    public int deleteArdAlarmExternalById(String id);

    /**
     * æ‰¹é‡åˆ é™¤å¤–联报警
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteArdAlarmExternalByIds(String[] ids);

    int selectCountByAlarmTime(@Param("refreshTime") String refreshTime, @Param("alarmType") String alarmType);

    public List<ArdAlarmExternal> selectListAllByCommand(@Param("refreshTime") String refreshTime, @Param("alarmType") String alarmType);

    public int updateViewTimeByCondition(@Param("defenseName")String defenseName,@Param("alarmType")String alarmType,@Param("alarmTime") String alarmTime,@Param("viewTime") String viewTime);
}

 ard-work/src/main/java/com/ruoyi/alarm/externalAlarm/service/IArdAlarmExternalService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,62 @@
package com.ruoyi.alarm.externalAlarm.service;

import java.util.List;
import com.ruoyi.alarm.externalAlarm.domain.ArdAlarmExternal;


/**
 * å¤–联报警Service接口
 * 
 * @author ard
 * @date 2023-07-07
 */
public interface IArdAlarmExternalService 
{
    /**
     * æŸ¥è¯¢å¤–联报警
     * 
     * @param id å¤–联报警主键
     * @return å¤–联报警
     */
    public ArdAlarmExternal selectArdAlarmExternalById(String id);

    /**
     * æŸ¥è¯¢å¤–联报警列表
     * 
     * @param ardAlarmExternal å¤–联报警
     * @return å¤–联报警集合
     */
    public List<ArdAlarmExternal> selectArdAlarmExternalList(ArdAlarmExternal ardAlarmExternal);

    /**
     * æ–°å¢žå¤–联报警
     * 
     * @param ardAlarmExternal å¤–联报警
     * @return ç»“æžœ
     */
    public int insertArdAlarmExternal(ArdAlarmExternal ardAlarmExternal);

    /**
     * ä¿®æ”¹å¤–联报警
     * 
     * @param ardAlarmExternal å¤–联报警
     * @return ç»“æžœ
     */
    public int updateArdAlarmExternal(ArdAlarmExternal ardAlarmExternal);

    /**
     * æ‰¹é‡åˆ é™¤å¤–联报警
     * 
     * @param ids éœ€è¦åˆ é™¤çš„外联报警主键集合
     * @return ç»“æžœ
     */
    public int deleteArdAlarmExternalByIds(String[] ids);

    /**
     * åˆ é™¤å¤–联报警信息
     * 
     * @param id å¤–联报警主键
     * @return ç»“æžœ
     */
    public int deleteArdAlarmExternalById(String id);
}

 ard-work/src/main/java/com/ruoyi/alarm/externalAlarm/service/impl/ArdAlarmExternalServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,87 @@
package com.ruoyi.alarm.externalAlarm.service.impl;

import java.util.List;
import com.ruoyi.alarm.externalAlarm.domain.ArdAlarmExternal;
import com.ruoyi.alarm.externalAlarm.mapper.ArdAlarmExternalMapper;
import com.ruoyi.alarm.externalAlarm.service.IArdAlarmExternalService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;


/**
 * å¤–联报警Service业务层处理
 *
 * @author ard
 * @date 2023-07-07
 */
@Service
public class ArdAlarmExternalServiceImpl implements IArdAlarmExternalService {
    @Autowired
    private ArdAlarmExternalMapper ardAlarmExternalMapper;

    /**
     * æŸ¥è¯¢å¤–联报警
     *
     * @param id å¤–联报警主键
     * @return å¤–联报警
     */
    @Override
    public ArdAlarmExternal selectArdAlarmExternalById(String id) {
        return ardAlarmExternalMapper.selectArdAlarmExternalById(id);
    }

    /**
     * æŸ¥è¯¢å¤–联报警列表
     *
     * @param ardAlarmExternal å¤–联报警
     * @return å¤–联报警
     */
    @Override
    public List<ArdAlarmExternal> selectArdAlarmExternalList(ArdAlarmExternal ardAlarmExternal) {
        return ardAlarmExternalMapper.selectArdAlarmExternalList(ardAlarmExternal);
    }

    /**
     * æ–°å¢žå¤–联报警
     *
     * @param ardAlarmExternal å¤–联报警
     * @return ç»“æžœ
     */
    @Override
    public int insertArdAlarmExternal(ArdAlarmExternal ardAlarmExternal) {
            return ardAlarmExternalMapper.insertArdAlarmExternal(ardAlarmExternal);
    }

    /**
     * ä¿®æ”¹å¤–联报警
     *
     * @param ardAlarmExternal å¤–联报警
     * @return ç»“æžœ
     */
    @Override
    public int updateArdAlarmExternal(ArdAlarmExternal ardAlarmExternal) {
        return ardAlarmExternalMapper.updateArdAlarmExternal(ardAlarmExternal);
    }

    /**
     * æ‰¹é‡åˆ é™¤å¤–联报警
     *
     * @param ids éœ€è¦åˆ é™¤çš„外联报警主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteArdAlarmExternalByIds(String[] ids) {
        return ardAlarmExternalMapper.deleteArdAlarmExternalByIds(ids);
    }

    /**
     * åˆ é™¤å¤–联报警信息
     *
     * @param id å¤–联报警主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteArdAlarmExternalById(String id) {
        return ardAlarmExternalMapper.deleteArdAlarmExternalById(id);
    }
}

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

@@ -3,6 +3,8 @@
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.alarm.cameraAlarm.domain.ArdAlarmCamera;
import com.ruoyi.alarm.cameraAlarm.mapper.ArdAlarmCameraMapper;
import com.ruoyi.alarm.externalAlarm.domain.ArdAlarmExternal;
import com.ruoyi.alarm.externalAlarm.mapper.ArdAlarmExternalMapper;
import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmCondition;
import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmData;
import com.ruoyi.alarm.globalAlarm.domain.GuidePriorityQueue;
@@ -21,6 +23,7 @@
import com.ruoyi.alarmpoints.tube.mapper.ArdTubesMapper;
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -38,6 +41,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -55,6 +59,8 @@
@Slf4j(topic = "mqtt")
public class GlobalAlarmServiceImpl implements IGlobalAlarmService {
    //region ä¾èµ–注入
    @Resource
    private ArdAlarmExternalMapper ardAlarmExternalMapper;
    @Resource
    private ArdAlarmRadarMapper ardAlarmRadarMapper;
    @Resource
@@ -102,6 +108,8 @@
        countMap.put("1004", count1004);
        int count1007 = ardAlarmRadarMapper.selectCountByAlarmTime(refreshTime, "雷达抽油机停机");
        countMap.put("1007", count1007);
        int count1005 = ardAlarmExternalMapper.selectCountByAlarmTime(refreshTime, "防区报警");
        countMap.put("1005", count1005);
        int count1014 = ardAlarmTubeMapper.selectCountByAlarmTime(refreshTime);
        countMap.put("1014", count1014);
        map.put("20000", countMap);
@@ -175,6 +183,20 @@
                                    .setLatitude(ardAlarmRadar.getLatitude())
                                    .setCount(ardAlarmRadar.getCount())
                                    .setTotal(ardAlarmRadar.getTotal());
                            return globalAlarmData;
                        }).collect(Collectors.toList());
            case 1005:
                List<ArdAlarmExternal> ardAlarmExternals = ardAlarmExternalMapper.selectListAllByCommand(refreshTime, "防区报警");
                return ardAlarmExternals.stream()
                        .map(ardAlarmExternal -> {
                            GlobalAlarmData globalAlarmData = new GlobalAlarmData()
                                    .setId(ardAlarmExternal.getId())
                                    .setName(ardAlarmExternal.getAlarmName())
                                    .setAlarmTime(ardAlarmExternal.getAlarmTime())
                                    .setLongitude(ardAlarmExternal.getLongitude())
                                    .setLatitude(ardAlarmExternal.getLatitude())
                                    .setCount(ardAlarmExternal.getCount())
                                    .setTotal(ardAlarmExternal.getTotal());
                            return globalAlarmData;
                        }).collect(Collectors.toList());
            case 1007:
@@ -258,6 +280,13 @@
                aarrr.setPageSize(pageSize);
                aarrr.setAlarmType("雷达抽油机停机");
                return ardAlarmRadarMapper.selectArdAlarmRadarList(aarrr);
            case 1005:
                ArdAlarmExternal aae = new ArdAlarmExternal();
                aae.setParams(params);
                aae.setPageNum(pageNum);
                aae.setPageSize(pageSize);
                aae.setAlarmType("防区报警");
                return ardAlarmExternalMapper.selectArdAlarmExternalList(aae);
            case 1014:
                ArdAlarmTube aat = new ArdAlarmTube();
                aat.setParams(params);
@@ -294,10 +323,19 @@
                ArdAlarmRadar ardAlarmRadar = ardAlarmRadarMapper.selectArdAlarmRadarById(condition.getId());
                if (StringUtils.isNotNull(ardAlarmRadar)) {
                    String name = ardAlarmRadar.getName();
                    String alarmType=ardAlarmRadar.getAlarmType();
                    String alarmTime=fmt.format(ardAlarmRadar.getAlarmTime());
                    ardAlarmRadarMapper.updateViewTimeByCondition(name,alarmType, alarmTime,DateUtils.getTime());
                    String alarmType = ardAlarmRadar.getAlarmType();
                    String alarmTime = fmt.format(ardAlarmRadar.getAlarmTime());
                    ardAlarmRadarMapper.updateViewTimeByCondition(name, alarmType, alarmTime, DateUtils.getTime());
                    return ardAlarmRadar;
                }
            case 1005:
                ArdAlarmExternal ardAlarmExternal = ardAlarmExternalMapper.selectArdAlarmExternalById(condition.getId());
                if (StringUtils.isNotNull(ardAlarmExternal)) {
                    String defenseName = ardAlarmExternal.getDefenseName();
                    String alarmType = ardAlarmExternal.getAlarmType();
                    String alarmTime = fmt.format(ardAlarmExternal.getAlarmTime());
                    ardAlarmRadarMapper.updateViewTimeByCondition(defenseName, alarmType, alarmTime, DateUtils.getTime());
                    return ardAlarmExternal;
                }
            case 1014:
                ArdAlarmTube ardAlarmTube = ardAlarmTubeMapper.selectArdAlarmTubeById(condition.getId());
@@ -362,17 +400,18 @@
                    int aat = ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube);
                    if (aat > 0) {
                        log.debug("tube入库成功：" + ardAlarmTube);
                        //region å¼•å¯¼å½•åƒ
                        Double longitude = ardAlarmTube.getLongitude();
                        Double latitude = ardAlarmTube.getLatitude();
                        if(StringUtils.isNull(longitude)||StringUtils.isNull(latitude))
                        {
                        if (StringUtils.isNull(longitude) || StringUtils.isNull(latitude)) {
                            return;
                        }
                        double[] coordinate=new double[]{longitude,latitude};
                        double[] coordinate = new double[]{longitude, latitude};
                        String nearbyCameraId = getNearbyCamera(new double[]{ardAlarmTube.getLongitude(), ardAlarmTube.getLatitude()});
                        if (StringUtils.isNotEmpty(nearbyCameraId)) {
                            messagesEnqueued(nearbyCameraId, ardAlarmTube.getId(), "sys_tube_leak",ardAlarmTube.getCreateTime(), 1,1,coordinate);
                            messagesEnqueued(nearbyCameraId, ardAlarmTube.getId(), "sys_tube_leak", ardAlarmTube.getCreateTime(), 1, 1, coordinate);
                        }
                        //endregion
                    }
                    //endregion
                    break;
@@ -380,7 +419,6 @@
                    //region å¤„理通用光电报警
                    ArdAlarmCamera ardAlarmCamera = JSONObject.parseObject(message, ArdAlarmCamera.class);
                    ardAlarmCamera.setId(IdUtils.simpleUUID());

                    int aac = ardAlarmCameraMapper.insertArdAlarmCamera(ardAlarmCamera);
                    if (aac > 0) {
                        log.debug("camera入库成功：" + ardAlarmCamera);
@@ -410,17 +448,16 @@
                            case "雷达抽油机停机":
                                alarmType = "sys_radar_pumpshutdown";
                                ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
                               if(StringUtils.isNotNull(ardAlarmpointsWell)) {
                                   ardAlarmRadar.setLongitude(ardAlarmpointsWell.getLongitude());
                                   ardAlarmRadar.setLatitude(ardAlarmpointsWell.getLatitude());
                               }
                                if (StringUtils.isNotNull(ardAlarmpointsWell)) {
                                    ardAlarmRadar.setLongitude(ardAlarmpointsWell.getLongitude());
                                    ardAlarmRadar.setLatitude(ardAlarmpointsWell.getLatitude());
                                }
                                break;
                        }
                        if(StringUtils.isNull(ardAlarmRadar.getLongitude())||StringUtils.isNull(ardAlarmRadar.getLatitude()))
                        {
                        if (StringUtils.isNull(ardAlarmRadar.getLongitude()) || StringUtils.isNull(ardAlarmRadar.getLatitude())) {
                            continue;
                        }
                        double[] coordinate=new double[]{ardAlarmRadar.getLongitude(),ardAlarmRadar.getLatitude()};//报警坐标
                        double[] coordinate = new double[]{ardAlarmRadar.getLongitude(), ardAlarmRadar.getLatitude()};//报警坐标
                        //判断当前报警点5分钟内是否已引导
                        ardAlarmRadar.setGuideFlag(1);
                        ArdAlarmRadar AlarmRadar = ardAlarmRadarMapper.getArdAlarmRadarWithGuide(ardAlarmRadar);
@@ -430,22 +467,20 @@
                            //获取雷达所在塔上的大光电
                            String cameraIdWithTower = ardAlarmRadarMapper.getCameraByRadar(radarAlarmData.getRadarId());
                            if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
                                log.info("获取到雷达塔上的光电:"+cameraIdWithTower);
                                log.info("获取到雷达塔上的光电:" + cameraIdWithTower);
                                //如果雷达塔上有光电
                                messagesEnqueued(cameraIdWithTower, uuid, alarmType, ardAlarmRadar.getCreateTime(),1,1,coordinate);
                                messagesEnqueued(cameraIdWithTower, uuid, alarmType, ardAlarmRadar.getCreateTime(), 1, 1, coordinate);
                            }
                            //获取报警点关联的大光电
                            ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
                            if(StringUtils.isNotNull(ardAlarmpointsWell) && StringUtils.isNotEmpty(ardAlarmpointsWell.getCameraId()))
                            {
                            if (StringUtils.isNotNull(ardAlarmpointsWell) && StringUtils.isNotEmpty(ardAlarmpointsWell.getCameraId())) {
                                String cameraId = ardAlarmpointsWell.getCameraId();
                                if(cameraIdWithTower.equals(cameraId))
                                {
                                if (cameraIdWithTower.equals(cameraId)) {
                                    return;
                                }
                                log.info("获取到报警点关联的光电:"+cameraId);
                                log.info("获取到报警点关联的光电:" + cameraId);
                                //如果报警点关联了光电
                                messagesEnqueued(cameraId, uuid, alarmType,ardAlarmRadar.getCreateTime(), 1,2,coordinate);
                                messagesEnqueued(cameraId, uuid, alarmType, ardAlarmRadar.getCreateTime(), 1, 2, coordinate);
                            }
                        } else {
                            //5分钟内有引导
@@ -458,28 +493,57 @@
                                //获取雷达所在塔上的大光电
                                String cameraIdWithTower = ardAlarmRadarMapper.getCameraByRadar(radarAlarmData.getRadarId());
                                if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
                                    log.info("获取到雷达塔上的光电:"+cameraIdWithTower);
                                    log.info("获取到雷达塔上的光电:" + cameraIdWithTower);
                                    //如果雷达塔上有光电
                                    messagesEnqueued(cameraIdWithTower, uuid, alarmType,ardAlarmRadar.getCreateTime(), count,1,coordinate);
                                    messagesEnqueued(cameraIdWithTower, uuid, alarmType, ardAlarmRadar.getCreateTime(), count, 1, coordinate);
                                }
                                //获取报警点关联的大光电
                                ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
                                if(StringUtils.isNotNull(ardAlarmpointsWell) && StringUtils.isNotEmpty(ardAlarmpointsWell.getCameraId()))
                                {
                                if (StringUtils.isNotNull(ardAlarmpointsWell) && StringUtils.isNotEmpty(ardAlarmpointsWell.getCameraId())) {
                                    String cameraId = ardAlarmpointsWell.getCameraId();
                                    if(cameraIdWithTower.equals(cameraId))
                                    {
                                    if (cameraIdWithTower.equals(cameraId)) {
                                        return;
                                    }
                                    log.info("获取到报警点关联的光电:"+cameraId);
                                    log.info("获取到报警点关联的光电:" + cameraId);
                                    //如果报警点关联了光电
                                    messagesEnqueued(cameraId, uuid, alarmType,ardAlarmRadar.getCreateTime(), count,2,coordinate);
                                    messagesEnqueued(cameraId, uuid, alarmType, ardAlarmRadar.getCreateTime(), count, 2, coordinate);
                                }
                            } else {
                                //未引导未超过3次，直接入库
                                ardAlarmRadarMapper.insertArdAlarmRadar(ardAlarmRadar);
                            }
                        }
                    }
                    //endregion
                    break;
                case "external":
                    //region å¤„理外联报警
                    ArdAlarmExternal ardAlarmExternal = JSONObject.parseObject(message, ArdAlarmExternal.class);
                    ardAlarmExternal.setId(IdUtils.simpleUUID());
                    ardAlarmExternal.setCreateTime(new Date());//接收时间
                    //外联防区名称就是兴趣点，查兴趣点坐标
                    String defenseName = ardAlarmExternal.getDefenseName();
                    ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(defenseName);
                    if (StringUtils.isNotNull(ardAlarmpointsWell)) {
                        ardAlarmExternal.setLongitude(ardAlarmpointsWell.getLongitude());
                        ardAlarmExternal.setLatitude(ardAlarmpointsWell.getLatitude());
                    }
                    int aae = ardAlarmExternalMapper.insertArdAlarmExternal(ardAlarmExternal);
                    if (aae > 0) {
                        log.debug("external入库成功：" + ardAlarmExternal);
                        //region å¼•å¯¼å½•åƒ
                        if (StringUtils.isNull(ardAlarmExternal.getLongitude()) || StringUtils.isNull(ardAlarmExternal.getLatitude())) {
                            return;
                        }
                        double[] guideCoordinate = new double[]{ardAlarmExternal.getLongitude(), ardAlarmExternal.getLatitude()};//引导坐标
                        if (StringUtils.isNull(ardAlarmExternal.getLongitude()) || StringUtils.isNull(ardAlarmExternal.getLatitude())) {
                            return;
                        }
                        String nearbyCameraId = getNearbyCamera(new double[]{ardAlarmExternal.getLongitude(), ardAlarmExternal.getLatitude()});//最近相机ID
                        if (StringUtils.isNotEmpty(nearbyCameraId)) {
                            messagesEnqueued(nearbyCameraId, ardAlarmExternal.getId(), "sys_external", ardAlarmExternal.getCreateTime(), 1, 1, guideCoordinate);
                        }
                        //endregion
                    }
                    //endregion
                    break;
@@ -491,7 +555,7 @@

    /**
     * æ¶ˆæ¯å…¥é˜Ÿ
     *
     * <p>
     * cameraId ç›¸æœºID
     * alarmId  æŠ¥è­¦ID
     * alarmType æŠ¥è­¦ç±»åž‹
@@ -499,34 +563,57 @@
     * recordSn å½•åƒå­˜å‚¨ä½ç½® 1-recordUrl1 2-recordUrl2
     * targetPosition æŠ¥è­¦ç‚¹ä½ç½®åæ ‡
     */
    private void messagesEnqueued(String cameraId, String alarmId, String alarmType,Date receiveTime, Integer num, Integer recordSn,double[] targetPosition) {
        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
        GuideTask guideTask = new GuideTask();
        //相机ID
        guideTask.setCameraId(cameraId);
        //报警类型
        guideTask.setAlarmType(alarmType);
        //通道(通过日夜时间研判)
        String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
        Integer channel = ArdTool.getChannelBydayNightTime(dayNightTime);
        guideTask.setChanNum(channel);
        //报警ID
        guideTask.setAlarmId(alarmId);
        //接收时间
        guideTask.setReceiveTime(fmt.format(receiveTime));
        //报警优先级(通过优先级字典)
        Integer priority = CamPriority.priorityMap.get(alarmType);
        guideTask.setPriority(priority);
        //报警次数
        guideTask.setNum(num);
        //录像存储位置
        guideTask.setRecordSn(recordSn);
        //目标经纬度
        guideTask.setTargetPosition(targetPosition);
        //消息入队
        queueManager.addTaskToQueue(cameraId, guideTask);
        //打印队列
        GuidePriorityQueue.printPriorityQueue();
    private void messagesEnqueued(String cameraId, String alarmId, String alarmType, Date receiveTime, Integer num, Integer recordSn, double[] targetPosition) {
        try {
            if (!IsEnableGuide(cameraId)) {
                log.info("相机:" + cameraId + "未开启报警引导功能");
                return;
            }

            SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
            GuideTask guideTask = new GuideTask();
            //相机ID
            guideTask.setCameraId(cameraId);
            //报警类型
            guideTask.setAlarmType(alarmType);
            //通道(通过日夜时间研判)
            String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
            Integer channel = ArdTool.getChannelBydayNightTime(dayNightTime);
            guideTask.setChanNum(channel);
            //报警ID
            guideTask.setAlarmId(alarmId);
            //接收时间
            guideTask.setReceiveTime(fmt.format(receiveTime));
            //报警优先级(通过优先级字典)
            Integer priority = CamPriority.priorityMap.get(alarmType);
            guideTask.setPriority(priority);
            //报警次数
            guideTask.setNum(num);
            //录像存储位置
            guideTask.setRecordSn(recordSn);
            //目标经纬度
            guideTask.setTargetPosition(targetPosition);
            //消息入队
            queueManager.addTaskToQueue(cameraId, guideTask);
            //打印队列
            GuidePriorityQueue.printPriorityQueue();
        } catch (Exception ex) {
            log.error("报警入队异常:" + ex.getMessage());
        }
    }

    /**
     * å…‰ç”µæ˜¯å¦å¼€å¯æŠ¥è­¦å¼•å¯¼åŠŸèƒ½
     * åˆ˜è‹ä¹‰
     * 2023/7/7 14:03
     */
    private Boolean IsEnableGuide(String cameraId) {
        boolean enabled = false;
        ArdCameras ardCameras = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + cameraId);
        if (ardCameras.getCamAlarmGuideEnable().equals(1)) {
            enabled = true;
        }
        return enabled;
    }

    /**
@@ -563,35 +650,36 @@
        return minDistanceCameraId;
    }


    public static void main(String[] args) {
        Comparator<Obj> PriorityDescCom = Comparator.comparingInt(Obj::getPriority).reversed();
        Comparator<Obj> NumDescCom = Comparator.comparingInt(Obj::getNum).reversed();
        Comparator<Obj> receiveTimeAscCom = Comparator.comparing(Obj::getAlarmTime);
        Comparator<Obj> comparator = PriorityDescCom.thenComparing(NumDescCom).thenComparing(receiveTimeAscCom);

        PriorityBlockingQueue<Obj> priorityQueue = new PriorityBlockingQueue<>(1000,comparator);
        PriorityBlockingQueue<Obj> priorityQueue = new PriorityBlockingQueue<>(1000, comparator);

        priorityQueue.add(new Obj(999,1,"2023-07-01 16:00:01"));
        priorityQueue.add(new Obj(999,2,"2023-07-01 16:00:01"));
        priorityQueue.add(new Obj(999,3,"2023-07-01 16:00:01"));
        priorityQueue.add(new Obj(999, 1, "2023-07-01 16:00:01"));
        priorityQueue.add(new Obj(999, 2, "2023-07-01 16:00:01"));
        priorityQueue.add(new Obj(999, 3, "2023-07-01 16:00:01"));

        List<Obj> elements = new ArrayList<>(priorityQueue);
        elements.sort(priorityQueue.comparator());  // ä½¿ç”¨é˜Ÿåˆ—的比较器进行排序
        for (Obj task : elements) {
            log.info("正在排队【priority】" + task.getPriority()+"【num】" + task.getNum() + "【alarmTime】" + task.getAlarmTime());
            log.info("正在排队【priority】" + task.getPriority() + "【num】" + task.getNum() + "【alarmTime】" + task.getAlarmTime());
        }
        log.info("===================================================================");
        priorityQueue.add(new Obj(999,5,"2023-07-01 16:00:01"));
        priorityQueue.add(new Obj(999, 5, "2023-07-01 16:00:01"));
        PriorityBlockingQueue queue = new PriorityBlockingQueue<>(priorityQueue);
        while (priorityQueue.size() > 0) {
            Obj task = priorityQueue.poll();
            log.info("正在排队【priority】" + task.getPriority()+"【num】" + task.getNum() + "【alarmTime】" + task.getAlarmTime());
            log.info("正在排队【priority】" + task.getPriority() + "【num】" + task.getNum() + "【alarmTime】" + task.getAlarmTime());
        }
    }

    @Data
    @AllArgsConstructor
    static class Obj
    {
    static class Obj {
        Integer priority;
        Integer num;
        String alarmTime;

 ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueManager.java

@@ -64,7 +64,8 @@
        PriorityBlockingQueue<GuideTask> guideTaskQueue = GuidePriorityQueue.cameraQueueMap.get(cameraId);
        if(StringUtils.isNull(guideTaskQueue))
        {
            log.info("相机未登录，没有队列");
            log.info("相机未登录,没有队列,无法入队引导");
            return;
        }
        log.debug("新任务入队:"+task.getAlarmId());
        guideTaskQueue.add(task);

 ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java

@@ -1,5 +1,7 @@
package com.ruoyi.alarm.globalAlarm.service.impl;

import com.ruoyi.alarm.externalAlarm.domain.ArdAlarmExternal;
import com.ruoyi.alarm.externalAlarm.service.IArdAlarmExternalService;
import com.ruoyi.alarm.globalAlarm.domain.GuideTask;
import com.ruoyi.alarm.radarAlarm.domain.ArdAlarmRadar;
import com.ruoyi.alarm.radarAlarm.service.IArdAlarmRadarService;
@@ -10,6 +12,7 @@
import com.ruoyi.device.hiksdk.service.IHikClientService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;

/**
@@ -29,6 +32,8 @@
    IArdAlarmTubeService ardAlarmTubeService;
    @Resource
    IArdAlarmRadarService ardAlarmRadarService;
    @Resource
    IArdAlarmExternalService ardAlarmExternalService;

    public void processTask(GuideTask guideTask) {
        try {
@@ -39,7 +44,7 @@
            cmd.setOperator(guideTask.getAlarmType());
            cmd.setExpired(30);
            cmd.setRecordBucketName("record");
            cmd.setRecordObjectName("alarm_"+guideTask.getAlarmId());
            cmd.setRecordObjectName("alarm_" + guideTask.getAlarmId());
            log.debug("开始引导");
            boolean guideRes = hikClientService.guideTargetPosition(cmd);
            if (guideRes) {
@@ -49,7 +54,7 @@
                try {
                    Thread.sleep(30000);
                } catch (InterruptedException e) {
                    log.info("当前任务ID"+guideTask.getAlarmId()+"线程被终止");
                    log.info("当前任务ID" + guideTask.getAlarmId() + "线程被终止");
                }
                String url = hikClientService.recordStopToMinio(cmd);//停止录像返回url
                if (StringUtils.isNotEmpty(url)) {
@@ -72,6 +77,12 @@
                            }
                            ardAlarmRadarService.updateArdAlarmRadar(ardAlarmRadar);
                            break;
                        case "sys_external":
                            ArdAlarmExternal ardAlarmExternal = new ArdAlarmExternal();
                            ardAlarmExternal.setId(guideTask.getAlarmId());
                            ardAlarmExternal.setRecordUrl(url);
                            ardAlarmExternalService.updateArdAlarmExternal(ardAlarmExternal);
                            break;
                    }
                }
            }

 ard-work/src/main/java/com/ruoyi/constant/CamPriority.java

@@ -21,6 +21,7 @@
        priorityMap.put("sys_radar_move", 900);//雷达移动报警
        priorityMap.put("sys_tube_leak", 800);//管线泄露报警
        priorityMap.put("sys_radar_pumpshutdown", 800);//雷达抽油机停机
        priorityMap.put("sys_external", 700);//外联报警
        priorityMap.put("sys_patrol_inspect", 1);//巡检
    }
}

 ard-work/src/main/resources/mapper/alarm/ArdAlarmExternalMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,185 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.alarm.externalAlarm.mapper.ArdAlarmExternalMapper">

    <resultMap type="ArdAlarmExternal" id="ArdAlarmExternalResult">
        <result property="id"    column="id"    />
        <result property="alarmId"    column="alarm_id"    />
        <result property="alarmName"    column="alarm_name"    />
        <result property="defenseId"    column="defense_id"    />
        <result property="defenseName"    column="defense_name"    />
        <result property="alarmType"    column="alarm_type"    />
        <result property="alarmTime"    column="alarm_time"    />
        <result property="subSysNo"    column="sub_sys_no"    />
        <result property="alarmHostId"    column="alarm_host_id"    />
        <result property="longitude"    column="longitude"    />
        <result property="latitude"    column="latitude"    />
        <result property="altitude"    column="altitude"    />
        <result property="recordUrl"    column="record_url"    />
        <result property="viewTime"    column="view_time"    />
        <result property="deptId"    column="dept_id"    />
        <result property="userId"    column="user_id"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
    </resultMap>

    <sql id="selectArdAlarmExternalVo">
        select id, alarm_id, alarm_name, defense_id, defense_name, alarm_type, alarm_time, sub_sys_no, alarm_host_id, longitude, latitude, altitude, record_url, view_time, dept_id, user_id, create_by, create_time from ard_alarm_external
    </sql>

    <select id="selectArdAlarmExternalList" parameterType="ArdAlarmExternal" resultMap="ArdAlarmExternalResult">
        <include refid="selectArdAlarmExternalVo"/>
        <where>
            <if test="alarmId != null  and alarmId != ''"> and alarm_id = #{alarmId}</if>
            <if test="alarmName != null  and alarmName != ''"> and alarm_name like '%'||#{alarmName}||'%'</if>
            <if test="defenseId != null  and defenseId != ''"> and defense_id = #{defenseId}</if>
            <if test="defenseName != null  and defenseName != ''"> and defense_name like '%'||#{defenseName}||'%'</if>
            <if test="alarmType != null  and alarmType != ''"> and alarm_type = #{alarmType}</if>
            <if test="subSysNo != null  and subSysNo != ''"> and sub_sys_no = #{subSysNo}</if>
            <if test="alarmHostId != null  and alarmHostId != ''"> and alarm_host_id = #{alarmHostId}</if>
            <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
            <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
            <if test="altitude != null  and altitude != ''"> and altitude = #{altitude}</if>
            <if test="recordUrl != null  and recordUrl != ''"> and record_url = #{recordUrl}</if>
            <if test="viewTime != null "> and view_time = #{viewTime}</if>
            <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
            <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
            <if test="params.beginTime != null and params.beginTime != ''"><!-- å¼€å§‹æ—¶é—´æ£€ç´¢ -->
                AND alarm_time &gt;= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
            </if>
            <if test="params.endTime != null and params.endTime != ''"><!-- ç»“束时间检索 -->
                AND alarm_time &lt;= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
            </if>
        </where>
    </select>

    <select id="selectArdAlarmExternalById" parameterType="String" resultMap="ArdAlarmExternalResult">
        <include refid="selectArdAlarmExternalVo"/>
        where id = #{id}
    </select>

    <insert id="insertArdAlarmExternal" parameterType="ArdAlarmExternal">
        insert into ard_alarm_external
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,</if>
            <if test="alarmId != null">alarm_id,</if>
            <if test="alarmName != null">alarm_name,</if>
            <if test="defenseId != null">defense_id,</if>
            <if test="defenseName != null">defense_name,</if>
            <if test="alarmType != null">alarm_type,</if>
            <if test="alarmTime != null">alarm_time,</if>
            <if test="subSysNo != null">sub_sys_no,</if>
            <if test="alarmHostId != null">alarm_host_id,</if>
            <if test="longitude != null">longitude,</if>
            <if test="latitude != null">latitude,</if>
            <if test="altitude != null">altitude,</if>
            <if test="recordUrl != null">record_url,</if>
            <if test="viewTime != null">view_time,</if>
            <if test="deptId != null">dept_id,</if>
            <if test="userId != null">user_id,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
            <if test="alarmId != null">#{alarmId},</if>
            <if test="alarmName != null">#{alarmName},</if>
            <if test="defenseId != null">#{defenseId},</if>
            <if test="defenseName != null">#{defenseName},</if>
            <if test="alarmType != null">#{alarmType},</if>
            <if test="alarmTime != null">#{alarmTime},</if>
            <if test="subSysNo != null">#{subSysNo},</if>
            <if test="alarmHostId != null">#{alarmHostId},</if>
            <if test="longitude != null">#{longitude},</if>
            <if test="latitude != null">#{latitude},</if>
            <if test="altitude != null">#{altitude},</if>
            <if test="recordUrl != null">#{recordUrl},</if>
            <if test="viewTime != null">#{viewTime},</if>
            <if test="deptId != null">#{deptId},</if>
            <if test="userId != null">#{userId},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
        </trim>
    </insert>

    <update id="updateArdAlarmExternal" parameterType="ArdAlarmExternal">
        update ard_alarm_external
        <trim prefix="SET" suffixOverrides=",">
            <if test="alarmId != null">alarm_id = #{alarmId},</if>
            <if test="alarmName != null">alarm_name = #{alarmName},</if>
            <if test="defenseId != null">defense_id = #{defenseId},</if>
            <if test="defenseName != null">defense_name = #{defenseName},</if>
            <if test="alarmType != null">alarm_type = #{alarmType},</if>
            <if test="alarmTime != null">alarm_time = #{alarmTime},</if>
            <if test="subSysNo != null">sub_sys_no = #{subSysNo},</if>
            <if test="alarmHostId != null">alarm_host_id = #{alarmHostId},</if>
            <if test="longitude != null">longitude = #{longitude},</if>
            <if test="latitude != null">latitude = #{latitude},</if>
            <if test="altitude != null">altitude = #{altitude},</if>
            <if test="recordUrl != null">record_url = #{recordUrl},</if>
            <if test="viewTime != null">view_time = #{viewTime},</if>
            <if test="deptId != null">dept_id = #{deptId},</if>
            <if test="userId != null">user_id = #{userId},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteArdAlarmExternalById" parameterType="String">
        delete from ard_alarm_external where id = #{id}
    </delete>

    <delete id="deleteArdAlarmExternalByIds" parameterType="String">
        delete from ard_alarm_external where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
    <select id="selectCountByAlarmTime" resultType="Integer">
        SELECT COUNT(DISTINCT aae.defense_name)
        FROM ard_alarm_external aae
        WHERE aae.alarm_time >= CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE
          and aae.alarm_type = #{alarmType}
          and aae.view_time is null
    </select>
    <select id="selectListAllByCommand" resultMap="ArdAlarmExternalResult">
        SELECT T
                   .*
        FROM
            (
                SELECT
                    aae.ID,
                    aae.alarm_id,
                    aae.alarm_name,
                    aae.defense_id,
                    aae.defense_name,
                    aae.alarm_type,
                    aae.alarm_time,
                    aae.longitude,
                    aae.latitude,
                    ROW_NUMBER () OVER ( PARTITION BY aae.defense_name ORDER BY aae.alarm_time DESC ) AS rn,
                        COUNT ( CASE WHEN aae.view_time IS NULL THEN 1 END ) OVER ( PARTITION BY aae.defense_name ) AS COUNT,
        COUNT ( aae.alarm_time ) OVER ( PARTITION BY aae.defense_name ) AS total
                FROM
                    ard_alarm_external aae
                WHERE
                    aae.alarm_time >= ( CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE )
                  AND aae.alarm_type = #{ alarmType }
                ORDER BY
                    aae.alarm_time DESC
            ) T
        WHERE
            T.rn = 1
    </select>
    <update id="updateViewTimeByCondition" parameterType="String">
        update ard_alarm_external
        set view_time=#{viewTime}
        where defense_name = #{defenseName}
          and alarm_type=#{alarmType}
          and alarm_time&lt;=#{alarmTime}
          and view_time is null
    </update>
</mapper>

 ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml

@@ -44,6 +44,12 @@
            <if test="name != null  and name != ''">and name like '%'||#{name}||'%'</if>
            <if test="alarmType != null  and alarmType != ''">and alarm_type = #{alarmType}</if>
            <if test="deptId != null ">and dept_id = #{deptId}</if>
            <if test="params.beginTime != null and params.beginTime != ''"><!-- å¼€å§‹æ—¶é—´æ£€ç´¢ -->
                AND alarm_time &gt;= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
            </if>
            <if test="params.endTime != null and params.endTime != ''"><!-- ç»“束时间检索 -->
                AND alarm_time &lt;= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
            </if>
        </where>
        order by alarm_time desc
    </select>