增加通用光电报警查看

‘liusuyi’

2023-07-12 18fa1385119350cebf6fb55a33a31fda263dba95

增加通用光电报警查看

 ard-work/src/main/java/com/ruoyi/alarm/cameraAlarm/mapper/ArdAlarmCameraMapper.java

@@ -65,4 +65,6 @@
    public List<ArdAlarmCamera> selectListAllByCommand(@Param("refreshTime")String refreshTime);

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

    int updateViewTimeByCameraName(@Param("cameraName")String cameraName,@Param("alarmTime") String alarmTime,@Param("viewTime") String viewTime);
}

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

@@ -348,6 +348,14 @@
                    ardAlarmStealelecMapper.updateViewTimeByDescribe(describe, startTime, DateUtils.getTime());
                    return ardAlarmStealelec;
                }
            case 1002:
                ArdAlarmCamera ardAlarmCamera = ardAlarmCameraMapper.selectArdAlarmCameraById(condition.getId());
                if (StringUtils.isNotNull(ardAlarmCamera)) {
                    String cameraName = ardAlarmCamera.getCameraName();
                    String alarmTime = fmt.format(ardAlarmCamera.getAlarmTime());
                    ardAlarmCameraMapper.updateViewTimeByCameraName(cameraName, alarmTime, DateUtils.getTime());
                    return ardAlarmCamera;
                }
            case 1003:
            case 1004:
            case 1007:
@@ -738,7 +746,7 @@
        priorityQueue.add(new Obj(999, 5, "2023-07-01 16:00:01"));
        PriorityBlockingQueue queue = new PriorityBlockingQueue<>(priorityQueue);
        while (queue.size() > 0) {
            Obj task = (Obj)queue.poll();
            Obj task = (Obj) queue.poll();
            log.info("正在排队【priority】" + task.getPriority() + "【num】" + task.getNum() + "【alarmTime】" + task.getAlarmTime());
        }
    }

 ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java

@@ -38,8 +38,7 @@
        log.info("MQTT连接断开，发起重连......");
        while (!client.isConnected()) {
            try {

                Thread.sleep(5000);
                Thread.sleep(10000);
                if (null != client && !client.isConnected()) {
                    client.reconnect();
                    log.error("尝试重新连接");

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

@@ -159,4 +159,11 @@
        WHERE aac.alarm_time >= CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE
          and aac.view_time is null
    </select>
    <update id="updateViewTimeByCameraName" parameterType="String">
        update ard_alarm_camera
        set view_time=#{viewTime}
        where camera_name = #{cameraName}
          and alarm_time&lt;=#{alarmTime}
          and view_time is null
    </update>
</mapper>