From e28b420be49bf9f219e3b37e342a09d46bd55c03 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 17 十二月 2025 10:50:22 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 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 de372a2..cb23047 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);
}
}
}
@@ -454,6 +452,7 @@
//鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹�
SensorStatusListRequest param = new SensorStatusListRequest();
param.setRegionIndexCode("-1");
+ param.setIncludeSubNode(1);
param.setPageSize(100);
param.setPageNo(curPage);
BaseResponse<BaseListPageResponse<SensorStatusListResponse>> response = HKService.sensorStatusSearch(param);
@@ -508,6 +507,7 @@
FireDeviceStatuslListRequest param = new FireDeviceStatuslListRequest();
param.setRegionIndexCode("-1");
param.setPageSize(100);
+ param.setIncludeSubNode(1);
param.setPageNo(curPage);
BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>> response = HKService.fireDeviceStatusSearch(param);
if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
--
Gitblit v1.9.3