From 917c4ee8b05e816602aa06f67f2f5447150b242f Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 17 十二月 2025 09:35:50 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
index 7be6fdf..866a8f4 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
@@ -320,15 +320,14 @@
@PostMapping("/regionList")
public ApiResponse<List<PageRegionInfoResponse> > getRegionList(HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token ){
CarmeraListVO param =new CarmeraListVO();
- param.setWithCameras(1);
+ param.setWithCameras(2);
List<PageRegionInfoResponse> result = new ArrayList<>();
try {
result = boardService.getRegionTree( param);
-
}catch (Exception e){
}
- /*if(result.size()==0){
+ /* if(result.size()==0){
//------TODO---------娴嬭瘯妯℃嫙鏁版嵁----start-----
for (int i = 0; i < 5; i++) {
PageRegionInfoResponse t = new PageRegionInfoResponse();
@@ -350,6 +349,9 @@
t1.setIndexCode(i+"_"+j+"_ChildCode");
t1.setParentIndexCode(t.getIndexCode());
t1.setCarmeraList(new ArrayList<>());
+ t1.setDeviceList(new ArrayList<>());
+ t1.setSensorList(new ArrayList<>());
+
CarmeraListVO c1= new CarmeraListVO();
c1.setName(i+"鐩戞帶鐐�111"+j);
c1.setIndexCode(i+"jkd111"+j);
@@ -358,8 +360,31 @@
c1.setName(i+"鐩戞帶鐐�112"+j);
c1.setIndexCode(i+"jkd112"+j);
t1.getCarmeraList().add(c1);
+
+
+ c1= new CarmeraListVO();
+ c1.setName(i+"浼犳劅鍣�111"+j);
+ c1.setIndexCode(i+"cgq111"+j);
+ t1.getSensorList().add(c1);
+ c1= new CarmeraListVO();
+ c1.setName(i+"浼犳劅鍣�111112"+j);
+ c1.setIndexCode(i+"cgq112"+j);
+ t1.getSensorList().add(c1);
+
+
+
+ c1= new CarmeraListVO();
+ c1.setName(i+"娑堥槻璁惧111"+j);
+ c1.setIndexCode(i+"xf111"+j);
+ t1.getDeviceList().add(c1);
+ c1= new CarmeraListVO();
+ c1.setName(i+"娑堥槻璁惧111112"+j);
+ c1.setIndexCode(i+"xf112"+j);
+ t1.getDeviceList().add(c1);
+
t.getChildList().add(t1);
}
+
result.add(t);
}
//------TODO---------娴嬭瘯妯℃嫙鏁版嵁----end-----
--
Gitblit v1.9.3