From 4ae28e580d31fac3cc9709f2d7c1608586c35d80 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 10:01:37 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 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 7dcfc40..de372a2 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
@@ -237,8 +237,8 @@
initReginCameralList(allList,req );//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
}else if(Constants.equalsInteger(req.getWithCameras(),Constants.TWO)){
initReginCameralList(allList,req );//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
- initReginFireDeviveList(allList);//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
- initReginSensorList(allList);//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
+ initReginFireDeviveList(allList, req);//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
+ initReginSensorList(allList,req);//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
}
List<PageRegionInfoResponse> data = new RegionTreeVO(allList).buildTree();
//鍔犲叆缂撳瓨
@@ -276,43 +276,46 @@
return allList;
}
- private void initReginFireDeviveList(List<PageRegionInfoResponse> allList ) {
+ private void initReginFireDeviveList(List<PageRegionInfoResponse> allList,CarmeraListVO req) {
+ String name =req.getName();
List<CarmeraListVO> carmeraListVOList = fireDeviceList();
if(carmeraListVOList!=null && carmeraListVOList.size()>0){
for(PageRegionInfoResponse p : allList){
for(CarmeraListVO c : carmeraListVOList){
- if(StringUtils.equals(p.getIndexCode(),c.getReginCode()) ){
- if(p.getDeviceList()==null){
- p.setDeviceList(new ArrayList<>());
+ if(StringUtils.equals(p.getIndexCode(),c.getReginCode())
+ && (StringUtils.contains(c.getName(),name) ||StringUtils.isBlank(name))){
+ if(p.getCarmeraList()==null){
+ p.setCarmeraList(new ArrayList<>());
}
- p.getDeviceList().add(c);
+ p.getCarmeraList().add(c);
}
}
}
}
}
- private void initReginSensorList(List<PageRegionInfoResponse> allList) {
+ private void initReginSensorList(List<PageRegionInfoResponse> allList,CarmeraListVO req) {
+ String name =req.getName();
List<CarmeraListVO> carmeraListVOList = sensorList();
if(carmeraListVOList!=null && carmeraListVOList.size()>0){
for(PageRegionInfoResponse p : allList){
for(CarmeraListVO c : carmeraListVOList){
- if(StringUtils.equals(p.getIndexCode(),c.getReginCode())){
- if(p.getSensorList()==null){
- p.setSensorList(new ArrayList<>());
+ if(StringUtils.equals(p.getIndexCode(),c.getReginCode())
+ && (StringUtils.contains(c.getName(),name) ||StringUtils.isBlank(name))){
+ if(p.getCarmeraList()==null){
+ p.setCarmeraList(new ArrayList<>());
}
- p.getSensorList().add(c);
+ p.getCarmeraList().add(c);
}
}
}
}
}
-// @PostConstruct
+ @PostConstruct
public void cacheRegionAndDeviceData(){
log.error("===============缂撳瓨娴峰悍骞冲彴鍖哄煙璁惧淇℃伅======寮�濮�============");
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);
@@ -325,7 +328,6 @@
stringRedisTemplate.opsForValue().set(Constants.RedisKeys.HK_SENSOR,sensorList);//鎵�鏈変紶鎰熷櫒
log.error("===============缂撳瓨娴峰悍骞冲彴鍖哄煙璁惧淇℃伅======鎴愬姛============");
}catch (Exception e){
- e.printStackTrace();
log.error("===============缂撳瓨娴峰悍骞冲彴鍖哄煙璁惧淇℃伅澶辫触==================");
}
}
@@ -338,7 +340,7 @@
for(PageRegionInfoResponse p : allList){
for(CarmeraListVO c : carmeraListVOList){
if(StringUtils.equals(p.getIndexCode(),c.getReginCode())
- && (StringUtils.isBlank(name) || StringUtils.contains(c.getName(),name))){
+ && (StringUtils.contains(c.getName(),name) ||StringUtils.isBlank(name))){
if(p.getCarmeraList()==null){
p.setCarmeraList(new ArrayList<>());
}
@@ -452,7 +454,6 @@
//鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹�
SensorStatusListRequest param = new SensorStatusListRequest();
param.setRegionIndexCode("-1");
- param.setIncludeSubNode(1);
param.setPageSize(100);
param.setPageNo(curPage);
BaseResponse<BaseListPageResponse<SensorStatusListResponse>> response = HKService.sensorStatusSearch(param);
@@ -507,7 +508,6 @@
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