diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index c48ef6b..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index d5cd614..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,12 +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
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">
+