[add] 接入萤石摄像头，新增子项目和摄像头预置位相关逻辑 [update] 修改geojson中方阵等重新上传逻辑

xinnengyuan/ruoyi-admin/src/main/resources/application-dev.yml

@@ -98,13 +98,13 @@ spring:
 spring.data:
   redis:
     # 地址
-    host: 192.168.110.126
+    host: 192.168.110.2
     # 端口，默认为6379
-    port: 6379
+    port: 9287
     # 数据库索引
-    database: 1
+    database: 10
     # redis 密码必须配置
-    password: 123456
+    password: syar23rdsaagdrsa
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
@@ -272,3 +272,6 @@ weather:
 # dxf转 geojson 执行文件名
 dxf2GeoJson:
   file-name: main.exe
+ys7:
+  app-key: "f01490bd5d5241b7809d8fc5fe84f7f8"
+  app-secret: "d468f270699de855fd85fe7fd6f9595f"

xinnengyuan/ruoyi-admin/src/main/resources/application-prod.yml

@@ -103,9 +103,9 @@ spring.data:
     # 地址
     host: 192.168.110.2
     # 端口，默认为6379
-    port: 6379
+    port: 63079
     # 数据库索引
-    database: 1
+    database: 5
     # redis 密码必须配置
     password: HMASKEbyhaASPZXB
     # 连接超时时间
@@ -274,3 +274,6 @@ weather:
 # dxf转 geojson 执行文件名
 dxf2GeoJson:
   file-name: main
+ys7:
+  app-key: "f01490bd5d5241b7809d8fc5fe84f7f8"
+  app-secret: "d468f270699de855fd85fe7fd6f9595f"

xinnengyuan/ruoyi-admin/src/main/resources/application.yml

@@ -228,9 +228,11 @@ springdoc:
       packages-to-scan: org.dromara.facility
     - group: 9.进度模块
       packages-to-scan: org.dromara.progress
-    - group: 10.代码生成模块
+    - group: 10.其他模块
+      packages-to-scan: org.dromara.other
+    - group: 11.代码生成模块
       packages-to-scan: org.dromara.generator
-    - group: 11.工作流模块
+    - group: 12.工作流模块
       packages-to-scan: org.dromara.workflow
 
 # 防止XSS攻击

xinnengyuan/ruoyi-admin/src/test/java/org/dromara/test/Ys7Test.java

@@ -0,0 +1,29 @@
+package org.dromara.test;
+
+import jakarta.annotation.Resource;
+import org.dromara.manager.ys7manager.Ys7Manager;
+import org.dromara.manager.ys7manager.Ys7RequestUtils;
+import org.dromara.manager.ys7manager.vo.Ys7QueryDeviceResponseVo;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+
+/**
+ * @author lcj
+ * @date 2025/6/12 17:06
+ */
+@SpringBootTest
+public class Ys7Test {
+
+    @Resource
+    private Ys7Manager ys7Manager;
+
+    @Test
+    void test() {
+        String token = ys7Manager.getToken();
+        List<Ys7QueryDeviceResponseVo> ys7QueryDeviceResponseVos = Ys7RequestUtils.queryDeviceVoList(token, 1, 20);
+        System.out.println(ys7QueryDeviceResponseVos);
+    }
+
+}