From 18fa1385119350cebf6fb55a33a31fda263dba95 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 12 七月 2023 10:47:36 +0800
Subject: [PATCH] 增加通用光电报警查看
---
ard-work/src/main/java/com/ruoyi/alarm/cameraAlarm/mapper/ArdAlarmCameraMapper.java | 2 ++
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 10 +++++++++-
ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml | 7 +++++++
ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java | 3 +--
4 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/cameraAlarm/mapper/ArdAlarmCameraMapper.java b/ard-work/src/main/java/com/ruoyi/alarm/cameraAlarm/mapper/ArdAlarmCameraMapper.java
index 646843d..88aaa06 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/cameraAlarm/mapper/ArdAlarmCameraMapper.java
+++ b/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);
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
index 2288d4f..0cb90b3 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
+++ b/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("姝ｅ湪鎺掗槦銆恜riority銆�" + task.getPriority() + "銆恘um銆�" + task.getNum() + "銆恆larmTime銆�" + task.getAlarmTime());
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java b/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java
index f7bdf58..01f7ada 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java
+++ b/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("灏濊瘯閲嶆柊杩炴帴");
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml
index 702bd6d..5beed74 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml
+++ b/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<=#{alarmTime}
+ and view_time is null
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3