增加雷达报警1003和1004查看报警 修改查看报警点数量只获取未读数量

‘liusuyi’

2023-07-03 b5b9378fcc0013a8b95d654f3aa09905c224182c

增加雷达报警1003和1004查看报警
修改查看报警点数量只获取未读数量

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

@@ -265,6 +265,24 @@
                    ardAlarmStealelecMapper.updateViewTimeByDescribe(describe, startTime, DateUtils.getTime());
                    return ardAlarmStealelec;
                }
            case 1003:
                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());
                    return ardAlarmRadar;
                }
            case 1004:
                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());
                    return ardAlarmRadar;
                }
            case 1014:
                ArdAlarmTube ardAlarmTube = ardAlarmTubeMapper.selectArdAlarmTubeById(condition.getId());
                if (StringUtils.isNotNull(ardAlarmTube)) {

 ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/mapper/ArdAlarmRadarMapper.java

@@ -78,4 +78,5 @@

    public int getArdAlarmRadarWithNotGuide(@Param("ardAlarmRadar") ArdAlarmRadar ardAlarmRadar, @Param("guideTime") Date guideTime);

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

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

@@ -165,5 +165,6 @@
        SELECT COUNT(DISTINCT aac.camera_name)
        FROM ard_alarm_camera aac
        WHERE aac.alarm_time >= CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE
          and aac.view_time is null
    </select>
</mapper>

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

@@ -149,6 +149,7 @@
        FROM ard_alarm_radar aar
        WHERE aar.alarm_time >= CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE
          and aar.alarm_type = #{alarmType}
          and aar.view_time is null
    </select>
    <select id="getCameraByRadar" resultType="String">
        select ac.id
@@ -174,4 +175,12 @@
          and alarm_type =#{ardAlarmRadar.alarmType}
          and name = #{ardAlarmRadar.name}
    </select>
    <update id="updateViewTimeByCondition" parameterType="String">
        update ard_alarm_radar
        set view_time=#{viewTime}
        where name = #{name}
          and alarm_type=#{alarmType}
          and alarm_time&lt;=#{alarmTime}
          and view_time is null
    </update>
</mapper>

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

@@ -97,6 +97,7 @@
        select count(DISTINCT aas."describe")
        from ard_alarm_stealelec aas
        where aas.start_time >= (CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE)
        and aas.view_time is null
    </select>
    <update id="updateViewTimeByDescribe" parameterType="String">
        update ard_alarm_stealelec

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

@@ -186,6 +186,7 @@
        SELECT COUNT(DISTINCT aat.tube_id)
        FROM ard_alarm_tube aat
        WHERE aat.alarm_time >= CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE
          and aat.view_time is null
    </select>
    <update id="updateViewTimeByTubeId" parameterType="String">
        update ard_alarm_tube