From 3fe886ea35cad418e1197e7e4165b79895fb06e4 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 30 十月 2023 09:23:56 +0800
Subject: [PATCH] app任务管理查询兴趣点

---
 ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java |   43 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
index e44f979..1ef2e1a 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
@@ -4,15 +4,16 @@
 import java.util.stream.Collectors;
 
 import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.constant.CameraConstants;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.device.camera.domain.CameraCmd;
 import com.ruoyi.device.channel.domain.ArdChannel;
 import com.ruoyi.device.channel.mapper.ArdChannelMapper;
-import com.ruoyi.device.hiksdk.service.IHikClientService;
 import com.ruoyi.media.service.IVtduService;
 import com.ruoyi.scheduling.domian.SchedulingParam;
 import com.ruoyi.utils.gis.GisUtil;
@@ -50,8 +51,10 @@
     @Resource
     private IVtduService vtduService;
 
+
     @PostConstruct
     public void loadCameras() {
+
         //娓呯┖鐩告満缂撳瓨
         Collection<String> cacheKeys = redisCache.keys(getCacheKey("*"));
         redisCache.deleteObject(cacheKeys);
@@ -81,7 +84,16 @@
      */
     @Override
     public ArdCameras selectArdCamerasById(String id) {
-        return ardCamerasMapper.selectArdCamerasById(id);
+        ArdCameras ardCameras = ardCamerasMapper.selectArdCamerasById(id);
+        if (ardCameras != null) {
+            ArdChannel ardChannel = new ArdChannel();
+            ardChannel.setDeviceId(ardCameras.getId());
+            List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
+            if (ardChannels != null) {
+                ardCameras.setChannelList(ardChannels);
+            }
+        }
+        return ardCameras;
     }
 
     /**
@@ -189,7 +201,15 @@
     }
 
     public List findOptions(ArdCameras ardCameras) {
-        return ardCamerasMapper.findOptions(ardCameras);
+        List<ArdCameras> options = ardCamerasMapper.findOptions(ardCameras);
+        for (ArdCameras camera :
+                options) {
+            ArdChannel ardChannel = new ArdChannel();
+            ardChannel.setDeviceId(camera.getId());
+            List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
+            camera.setChannelList(ardChannels);
+        }
+        return options;
     }
 
     /**
@@ -402,4 +422,21 @@
         return null;
     }
 
+    /**
+     * 鏍¢獙鐩告満鏄惁鍞竴
+     *
+     * @param camera 鐩告満
+     * @return 缁撴灉
+     */
+    @Override
+    public String checkCameraIpAndPortUnique(ArdCameras camera) {
+        String id = camera.getId();
+        String ip = camera.getIp();
+        Integer port = camera.getPort();
+        ArdCameras info = ardCamerasMapper.checkCameraIpAndPortUnique(ip, port);
+        if (StringUtils.isNotNull(info) && !info.getId().equals(id)) {
+            return CameraConstants.NOT_UNIQUE;
+        }
+        return CameraConstants.UNIQUE;
+    }
 }

--
Gitblit v1.9.3