From 1ccdcb4a890687d59b272f5397e8b41ae4ce2254 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期二, 07 十一月 2023 16:23:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java b/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java index 4f931ff..81e6a6d 100644 --- a/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java +++ b/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java @@ -1,11 +1,10 @@ package com.ruoyi.device.camera.mapper; import java.util.List; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.device.camera.domain.ArdCameras; +import org.apache.ibatis.annotations.Param; + /** * 鐩告満璁惧Mapper鎺ュ彛 @@ -77,4 +76,13 @@ * @return 閮ㄩ棬鍒楄〃 */ public List<ArdCameras> selectArdCamerasByDeptId(Long deptId); + + /** + * 鏍¢獙鐩告満鏄惁鍞竴 + * + * @param ip 鐩告満ip + * @param port 鐩告満绔彛 + * @return 鐩告満淇℃伅 + */ + public ArdCameras checkCameraIpAndPortUnique(@Param("ip") String ip, @Param("port")Integer port); } -- Gitblit v1.9.3