From 10998d67dcae8239b54692caf5404857b65305c9 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 17 十二月 2025 18:05:05 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 12 +++++-------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java | 6 +++++-
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java
index 77f4730..d7a8bbf 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java
@@ -6,6 +6,7 @@
import com.doumee.core.utils.Constants;
import com.doumee.service.business.InterfaceLogService;
import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;
+import com.doumee.service.business.third.BoardService;
import com.hikvision.artemis.sdk.config.ArtemisConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -24,14 +25,17 @@
private SystemDictDataBiz systemDictDataBiz;
@Autowired
private InterfaceLogService interfaceLogService;
+ @Autowired
+ private BoardService boardService;
- @PostConstruct
+ @PostConstruct()
public int initHkConfig(){
ArtemisConfig.host = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HOST).getCode();
ArtemisConfig.appKey = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPKEY).getCode();
ArtemisConfig.appSecret = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPSECRET).getCode();
HKConstants.https = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HTTPS).getCode();
HKTools.interfaceLogService=interfaceLogService;
+ boardService.cacheRegionAndDeviceData();
return 0;
}
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 a2dc26c..7dcfc40 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, req);//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
- initReginSensorList(allList,req);//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
+ initReginFireDeviveList(allList);//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
+ initReginSensorList(allList);//鑾峰彇鍏ㄩ儴鐩戞帶鐐规暟鎹�
}
List<PageRegionInfoResponse> data = new RegionTreeVO(allList).buildTree();
//鍔犲叆缂撳瓨
@@ -276,8 +276,7 @@
return allList;
}
- private void initReginFireDeviveList(List<PageRegionInfoResponse> allList,CarmeraListVO req) {
- String name =req.getName();
+ private void initReginFireDeviveList(List<PageRegionInfoResponse> allList ) {
List<CarmeraListVO> carmeraListVOList = fireDeviceList();
if(carmeraListVOList!=null && carmeraListVOList.size()>0){
for(PageRegionInfoResponse p : allList){
@@ -292,8 +291,7 @@
}
}
}
- private void initReginSensorList(List<PageRegionInfoResponse> allList,CarmeraListVO req) {
- String name =req.getName();
+ private void initReginSensorList(List<PageRegionInfoResponse> allList) {
List<CarmeraListVO> carmeraListVOList = sensorList();
if(carmeraListVOList!=null && carmeraListVOList.size()>0){
for(PageRegionInfoResponse p : allList){
@@ -308,7 +306,7 @@
}
}
}
- @PostConstruct
+// @PostConstruct
public void cacheRegionAndDeviceData(){
log.error("===============缂撳瓨娴峰悍骞冲彴鍖哄煙璁惧淇℃伅======寮�濮�============");
try {
--
Gitblit v1.9.3