From 71dbac60afa54d2642c3471c080686da56579ca0 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 09 九月 2023 16:37:13 +0800
Subject: [PATCH] 流媒体优化

---
 ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
index cf8633c..b6c55f2 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
@@ -592,6 +592,7 @@
     @Override
     public Object updateAlarmViewTime(GlobalAlarmCondition condition) {
         SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat fmtms = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
         switch (condition.getCommand()) {
             case 1001:
                 ArdAlarmStealelec ardAlarmStealelec = ardAlarmStealelecMapper.selectByPrimaryKey(condition.getId());
@@ -662,7 +663,7 @@
                 ArdAlarmWall ardAlarmWall = ardAlarmWallMapper.selectArdAlarmWallById(condition.getId());
                 if (StringUtils.isNotNull(ardAlarmWall)) {
                     String userId = ardAlarmWall.getUserId();
-                    String alarmTime = fmt.format(ardAlarmWall.getCreateTime());
+                    String alarmTime = fmtms.format(ardAlarmWall.getAlarmTime());
                     ardAlarmWallMapper.updateViewTimeByUserId(userId, alarmTime, DateUtils.getTime());
                     return ardAlarmWall;
                 }
@@ -1024,9 +1025,13 @@
         //鑾峰彇闆疯揪鎵�鍦ㄥ涓婄殑澶у厜鐢�
         String cameraIdWithTower = ardEquipRadarMapper.getCameraByRadar(radarId);
         if (StringUtils.isNotNull(cameraIdWithTower) && StringUtils.isNotEmpty(cameraIdWithTower)) {
-            log.info("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:" + cameraIdWithTower);
+            log.debug("鑾峰彇鍒伴浄杈惧涓婄殑鍏夌數:" + cameraIdWithTower);
             //濡傛灉闆疯揪濉斾笂鏈夊厜鐢�
             messagesEnqueued(cameraIdWithTower, alarmId, alarmType, createTime, 1, 1, coordinate);
+        }
+        else
+        {
+            log.debug("鏈幏鍙栧埌闆疯揪濉斾笂鐨勫厜鐢�");
         }
         //鑾峰彇鎶ヨ鐐瑰叧鑱旂殑澶у厜鐢�
         ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
@@ -1039,6 +1044,10 @@
             //濡傛灉鎶ヨ鐐瑰叧鑱斾簡鍏夌數
             messagesEnqueued(cameraId, alarmId, alarmType, createTime, 1, 2, coordinate);
         }
+        else
+        {
+            log.debug("鏈幏鍙栧埌鎶ヨ鐐瑰叧鑱旂殑鍏夌數");
+        }
     }
 
 

--
Gitblit v1.9.3