From 418322636d57d26b220bffd10cbe1a223f2d153b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 17 十二月 2025 16:55:48 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index b1c60e7..d535761 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -282,12 +282,11 @@
         if(carmeraListVOList!=null && carmeraListVOList.size()>0){
             for(PageRegionInfoResponse p : allList){
                 for(CarmeraListVO c : carmeraListVOList){
-                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode())
-                            && (StringUtils.contains(c.getName(),name) ||StringUtils.isBlank(name))){
-                        if(p.getCarmeraList()==null){
-                            p.setCarmeraList(new ArrayList<>());
+                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode()) ){
+                        if(p.getDeviceList()==null){
+                            p.setDeviceList(new ArrayList<>());
                         }
-                        p.getCarmeraList().add(c);
+                        p.getDeviceList().add(c);
                     }
                 }
             }
@@ -299,12 +298,11 @@
         if(carmeraListVOList!=null && carmeraListVOList.size()>0){
             for(PageRegionInfoResponse p : allList){
                 for(CarmeraListVO c : carmeraListVOList){
-                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode())
-                            && (StringUtils.contains(c.getName(),name) ||StringUtils.isBlank(name))){
-                        if(p.getCarmeraList()==null){
-                            p.setCarmeraList(new ArrayList<>());
+                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode())){
+                        if(p.getSensorList()==null){
+                            p.setSensorList(new ArrayList<>());
                         }
-                        p.getCarmeraList().add(c);
+                        p.getSensorList().add(c);
                     }
                 }
             }
@@ -316,6 +314,7 @@
         try {
             CarmeraListVO param  =new CarmeraListVO();
             param.setWithCameras(2);
+            param.setRefresh(1);
             List<PageRegionInfoResponse>  resultTree = getRegionTree(param);
             List<PageRegionInfoResponse>  result = getAllRegionList();
             List<CarmeraListVO> carmeraListVOList = initAllReginCameralList(result);

--
Gitblit v1.9.3