From 41f40e898a7ebdbefc8a02b472d58d4689b3e88e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 19:05:05 +0800
Subject: [PATCH] BaseResult替换localDate
---
ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
index fef8088..64a724b 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
@@ -5,7 +5,9 @@
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.result.HK.SnapshotDelayMonitorResult;
import com.ycl.platform.domain.result.UY.QueryVqdResult;
+import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.CheckIndexVideoMapper;
+import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexFaceService;
import com.ycl.platform.service.ICheckIndexVideoService;
import com.ycl.platform.service.ITMonitorService;
@@ -36,7 +38,7 @@
@Autowired
private CheckIndexVideoMapper checkIndexVideoMapper;
@Autowired
- private ITMonitorService monitorService;
+ private TMonitorMapper monitorMapper;
@Autowired
private ICheckIndexVideoService checkIndexVideoService;
@@ -55,9 +57,8 @@
}
//鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
- Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
- .in("serial_number", list.stream().map(QueryVqdResult::getDeviceId).collect(Collectors.toList())))
- .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+ Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(QueryVqdResult::getDeviceId).collect(Collectors.toList()))
+ .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
//鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
List<String> provinceIds = getProvince();
//閲嶇偣鐐逛綅闆嗗悎
@@ -65,7 +66,7 @@
Map<String, AreaStats> areaStatsMap = new HashMap<>();
for (QueryVqdResult result : list) {
- TMonitor monitor = monitorMap.get(result.getDeviceId());
+ TMonitorVO monitor = monitorMap.get(result.getDeviceId());
if (monitor == null) continue;
String deptId = monitor.getDeptId().toString();
@@ -115,8 +116,8 @@
* 瑙嗛鐐逛綅鍦ㄧ嚎鐜�
*/
private CheckIndexVideo createOrUpdateCheckIndexFace(String key, AreaStats stats, List<CheckIndexVideo> checkIndexVideoList) {
- CheckIndexVideo CheckIndexVideo = getCheckIndex(key, checkIndexVideoList, CheckIndexVideo.class);
- if (CheckIndexVideo == null) {
+ CheckIndexVideo checkIndexVideo = getCheckIndex(key, checkIndexVideoList, CheckIndexVideo.class);
+ if (checkIndexVideo == null) {
return null;
}
//璋冪敤鐐逛綅鍦ㄧ嚎鐜囪绠楁柟娉�
@@ -124,13 +125,13 @@
param.put("totalSites", stats.totalSites);
param.put("onlineSites", stats.onlineSites);
BigDecimal siteOnline = siteOnline(param);
- CheckIndexVideo.setSiteOnline(siteOnline);
+ checkIndexVideo.setSiteOnline(siteOnline);
//璋冪敤鐐逛綅鍦ㄧ嚎鐜囪绠楁柟娉� 璁＄畻閲嶇偣鐐逛綅鍦ㄧ嚎鐜�
Map<String, Object> importantParam = new HashMap<>();
param.put("totalSites", stats.importantSites);
param.put("onlineSites", stats.importantOnlineSites);
BigDecimal importantSiteOnline = siteOnline(importantParam);
- CheckIndexVideo.setKeySiteOnline(importantSiteOnline);
- return CheckIndexVideo;
+ checkIndexVideo.setKeySiteOnline(importantSiteOnline);
+ return checkIndexVideo;
}
}
--
Gitblit v1.8.0