From 1b5007fd66cb2c56e7b54b793cdd3f29785f5c04 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 20 七月 2023 15:16:31 +0800
Subject: [PATCH] 查询车模型提交

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

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 b54a8a4..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:
@@ -365,7 +373,7 @@
                     String defenseName = ardAlarmExternal.getDefenseName();
                     String alarmType = ardAlarmExternal.getAlarmType();
                     String alarmTime = fmt.format(ardAlarmExternal.getAlarmTime());
-                    ardAlarmRadarMapper.updateViewTimeByCondition(defenseName, alarmType, alarmTime, DateUtils.getTime());
+                    ardAlarmExternalMapper.updateViewTimeByCondition(defenseName, alarmType, alarmTime, DateUtils.getTime());
                     return ardAlarmExternal;
                 }
             case 1006:
@@ -717,7 +725,6 @@
         return minDistanceCameraId;
     }
 
-
     public static void main(String[] args) {
         Comparator<Obj> PriorityDescCom = Comparator.comparingInt(Obj::getPriority).reversed();
         Comparator<Obj> NumDescCom = Comparator.comparingInt(Obj::getNum).reversed();
@@ -738,8 +745,8 @@
         log.info("===================================================================");
         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();
+        while (queue.size() > 0) {
+            Obj task = (Obj) queue.poll();
             log.info("姝e湪鎺掗槦銆恜riority銆�" + task.getPriority() + "銆恘um銆�" + task.getNum() + "銆恆larmTime銆�" + task.getAlarmTime());
         }
     }

--
Gitblit v1.9.3