From d1883c9da86e3e36e0c997554ad79b44a8f35494 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 01 八月 2024 18:05:13 +0800
Subject: [PATCH] 数据上传及时性
---
ycl-server/src/main/java/com/ycl/calculate/FaceSiteOnlineCalculation.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceSiteOnlineCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceSiteOnlineCalculation.java
index 524a2b4..0058832 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSiteOnlineCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSiteOnlineCalculation.java
@@ -1,18 +1,13 @@
package com.ycl.calculate;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ycl.platform.domain.entity.CheckIndexCar;
import com.ycl.platform.domain.entity.CheckIndexFace;
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
-import com.ycl.platform.mapper.CheckIndexCarMapper;
import com.ycl.platform.mapper.CheckIndexFaceMapper;
-import com.ycl.platform.service.ICheckIndexCarService;
import com.ycl.platform.service.ICheckIndexFaceService;
import com.ycl.platform.service.ITMonitorService;
-import com.ycl.platform.service.impl.CheckIndexFaceServiceImpl;
import com.ycl.system.mapper.SysConfigMapper;
-import com.ycl.system.mapper.SysDeptMapper;
import constant.ApiConstants;
import constant.CheckConstants;
import constant.CheckSnapCountConstants;
@@ -35,7 +30,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
-public class FaceSiteOnlineCalculation implements CalculationStrategy<SnapshotDataMonitorResult> {
+public class FaceSiteOnlineCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDataMonitorResult> {
@Autowired
private CheckIndexFaceMapper checkIndexFaceMapper;
@Autowired
@@ -57,14 +52,14 @@
if (CollectionUtils.isEmpty(list)) {
return;
}
-
- Map<String, AreaStats> areaStatsMap = new HashMap<>();
+ //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
.in("serial_number", list.stream().map(SnapshotDataMonitorResult::getExternalIndexCode).collect(Collectors.toList())))
.stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+ //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
+ List<String> provinceIds = getProvince();
- // TODO: 鍒嗙渷鍘呭競灞� 闇�瑕佽ˉ鍏呴泦鍚堟暟鎹�
- List<String> provinceIds = new ArrayList<>(); // 杩欓噷闇�瑕佹牴鎹偣浣嶈ˉ鍏�
+ Map<String, AreaStats> areaStatsMap = new HashMap<>();
for (SnapshotDataMonitorResult result : list) {
TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
@@ -138,15 +133,19 @@
checkIndexFace.setCreateTime(new Date());
}
- // 鐐逛綅鍦ㄧ嚎鐜�
- BigDecimal totalSitesBd = new BigDecimal(stats.totalSites);
- BigDecimal offlineSitesBd = new BigDecimal(stats.offlineSites);
- BigDecimal onlineSitesBd = totalSitesBd.subtract(offlineSitesBd);
- checkIndexFace.setSiteOnline(onlineSitesBd.divide(totalSitesBd, 4, RoundingMode.HALF_UP));
+ //璋冪敤鐐逛綅鍦ㄧ嚎璁＄畻鏂规硶
+ Map<String, Object> siteOnlineParam = new HashMap<>();
+ siteOnlineParam.put("totalSites", stats.totalSites);
+ siteOnlineParam.put("offlineSites", stats.offlineSites);
+ BigDecimal siteOnline = siteOnline(siteOnlineParam);
+ checkIndexFace.setSiteOnline(siteOnline);
//瑙嗗浘搴撳鎺ョǔ瀹氭��
BigDecimal avgCount = key.startsWith("Province_") ? cityCountAvg : countyCountAvg;
- checkIndexFace.setViewConnectStability(new BigDecimal(stats.totalDataSum).divide(avgCount, 4, RoundingMode.HALF_UP));
-
+ Map<String, Object> viewConnectParam = new HashMap<>();
+ viewConnectParam.put("totalDataSum", stats.totalDataSum);
+ viewConnectParam.put("avgCount", avgCount);
+ BigDecimal viewConnectStability = viewConnectStability(viewConnectParam);
+ checkIndexFace.setViewConnectStability(viewConnectStability);
return checkIndexFace;
}
}
--
Gitblit v1.8.0