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 | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 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 99c36f5..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,17 +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.domain.Vtdu; -import com.ruoyi.media.service.IMediaService; import com.ruoyi.media.service.IVtduService; import com.ruoyi.scheduling.domian.SchedulingParam; import com.ruoyi.utils.gis.GisUtil; @@ -51,8 +50,6 @@ private ArdChannelMapper ardChannelMapper; @Resource private IVtduService vtduService; - @Resource - private IMediaService mediaService; @PostConstruct @@ -425,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