From c06211a691e1a8ba46f3a3b9fbd1d6ec627f0422 Mon Sep 17 00:00:00 2001 From: blankk <2649084208@qq.com> Date: Tue, 28 Jun 2022 16:18:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=AB=99=E7=82=B9=20=E6=91=84=E5=83=8F?= =?UTF-8?q?=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 3 ++- .idea/encodings.xml | 2 ++ .idea/jarRepositories.xml | 20 +++++++++++++++++++ .idea/libraries/examples.xml | 12 +++++++++++ .idea/misc.xml | 5 +++++ .../camera/controller/CameraController.java | 9 +++++++++ .../code/camera/mapper/CameraMapper.java | 3 +++ .../code/camera/service/ICameraService.java | 3 +++ .../service/impl/CameraServiceImpl.java | 5 +++++ .../camera}/CameraMapper.xml | 5 +++++ 10 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 .idea/libraries/examples.xml rename ruoyi-code/src/main/resources/{mapper.camera => mapper/camera}/CameraMapper.xml (51%) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index a52ddf9..f634552 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -8,10 +8,11 @@ + - + diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 868fd1c..1c0fb5d 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -3,6 +3,8 @@ + + diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index c48ef6b..c62adbb 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -11,11 +11,31 @@ + + + \ No newline at end of file diff --git a/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/CameraController.java b/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/CameraController.java index 1595be4..adb06c7 100644 --- a/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/CameraController.java +++ b/ruoyi-code/src/main/java/com/ruoyi/code/camera/controller/CameraController.java @@ -133,4 +133,13 @@ public class CameraController extends BaseController window.showVideo(new NativeLong(Long.parseLong(c.getLoginId()))); } + /** + * 查询摄像头未绑定站点的 + */ + @RequestMapping("/cameraNoList") + public R getCameraList(){ + return R.ok().put("data",cameraService.getCameraList()); + } + + } diff --git a/ruoyi-code/src/main/java/com/ruoyi/code/camera/mapper/CameraMapper.java b/ruoyi-code/src/main/java/com/ruoyi/code/camera/mapper/CameraMapper.java index 01e3530..d107453 100644 --- a/ruoyi-code/src/main/java/com/ruoyi/code/camera/mapper/CameraMapper.java +++ b/ruoyi-code/src/main/java/com/ruoyi/code/camera/mapper/CameraMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.code.camera.domain.Camera; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * Mapper接口 * @@ -14,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper; public interface CameraMapper extends BaseMapper { + List queryCameraList(); } diff --git a/ruoyi-code/src/main/java/com/ruoyi/code/camera/service/ICameraService.java b/ruoyi-code/src/main/java/com/ruoyi/code/camera/service/ICameraService.java index 3ecf969..c5b1346 100644 --- a/ruoyi-code/src/main/java/com/ruoyi/code/camera/service/ICameraService.java +++ b/ruoyi-code/src/main/java/com/ruoyi/code/camera/service/ICameraService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.page.R; import com.ruoyi.code.camera.domain.Camera; +import java.util.List; import java.util.Map; /** @@ -24,4 +25,6 @@ public interface ICameraService extends IService void online(String ip,int port,String username,String password,String devsn,String loginID); void outline(String loginID); + + List getCameraList(); } diff --git a/ruoyi-code/src/main/java/com/ruoyi/code/camera/service/impl/CameraServiceImpl.java b/ruoyi-code/src/main/java/com/ruoyi/code/camera/service/impl/CameraServiceImpl.java index ca86bde..8fc8d57 100644 --- a/ruoyi-code/src/main/java/com/ruoyi/code/camera/service/impl/CameraServiceImpl.java +++ b/ruoyi-code/src/main/java/com/ruoyi/code/camera/service/impl/CameraServiceImpl.java @@ -91,4 +91,9 @@ public class CameraServiceImpl extends ServiceImpl impleme updateById(c); } } + + @Override + public List getCameraList() { + return baseMapper.queryCameraList(); + } } diff --git a/ruoyi-code/src/main/resources/mapper.camera/CameraMapper.xml b/ruoyi-code/src/main/resources/mapper/camera/CameraMapper.xml similarity index 51% rename from ruoyi-code/src/main/resources/mapper.camera/CameraMapper.xml rename to ruoyi-code/src/main/resources/mapper/camera/CameraMapper.xml index 62489d6..c38d671 100644 --- a/ruoyi-code/src/main/resources/mapper.camera/CameraMapper.xml +++ b/ruoyi-code/src/main/resources/mapper/camera/CameraMapper.xml @@ -4,4 +4,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + From 6b22c7b6835f4b64c9c7370adf4572c523a98305 Mon Sep 17 00:00:00 2001 From: 4670101279 Date: Tue, 28 Jun 2022 16:25:32 +0800 Subject: [PATCH 2/2] delete idea --- .idea/.gitignore | 8 ---- .idea/compiler.xml | 20 --------- .idea/encodings.xml | 21 --------- .idea/inspectionProfiles/Project_Default.xml | 6 --- .idea/jarRepositories.xml | 45 -------------------- .idea/libraries/examples.xml | 12 ------ .idea/misc.xml | 17 -------- .idea/vcs.xml | 6 --- 8 files changed, 135 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/libraries/examples.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index f634552..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 1c0fb5d..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 03d9549..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index c62adbb..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/examples.xml b/.idea/libraries/examples.xml deleted file mode 100644 index 3caaac0..0000000 --- a/.idea/libraries/examples.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 296fbb6..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file