From d268f82d25c25ebdc7a1ea30614f6cda6d3a9ae3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 10 十月 2024 16:31:41 +0800
Subject: [PATCH] win库+大屏考核指标查询bug
---
ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java | 54 +++++++++++++++++++-----------------------------------
1 files changed, 19 insertions(+), 35 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java
index ba700d3..a2ebda9 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java
@@ -1,15 +1,13 @@
package com.ycl.calculate;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ycl.platform.domain.entity.CheckIndexFace;
-import com.ycl.platform.domain.entity.TMonitor;
-import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult;
import com.ycl.platform.domain.result.HK.FaceDeviceSamplingResult;
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.CheckIndexFaceMapper;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexFaceService;
-import com.ycl.platform.service.ITMonitorService;
+import constant.ApiConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -30,16 +28,15 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
-public class FaceDeviceSampleCalculation extends IndexCalculationServe implements CalculationStrategy<FaceDeviceSamplingResult> {
+@Slf4j
+public class FaceDeviceSampleCalculation extends IndexCalculationServe<FaceDeviceSamplingResult, FaceDeviceSampleCalculation.AreaStats> implements CalculationStrategy<FaceDeviceSamplingResult> {
@Autowired
private CheckIndexFaceMapper checkIndexFaceMapper;
- @Autowired
- private TMonitorMapper monitorMapper;
@Autowired
private ICheckIndexFaceService checkIndexFaceService;
//鍖哄煙杞﹁締鎶芥鎸囨爣
- private static class AreaStats {
+ protected static class AreaStats {
int totalSites = 0;
//鍥剧墖鍚堟牸鐨勭偣浣嶆暟
int picQualifySites = 0;
@@ -49,27 +46,9 @@
@Override
public void calculate(List<FaceDeviceSamplingResult> list) {
- if (CollectionUtils.isEmpty(list)) {
- return;
- }
- //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
- Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(FaceDeviceSamplingResult::getExternalIndexCode).collect(Collectors.toList()))
- .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
- //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
- List<String> provinceIds = getProvince();
- Map<String, AreaStats> areaStatsMap = new HashMap<>();
- for (FaceDeviceSamplingResult result : list) {
- TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
- if (monitor == null) continue;
- String deptId = monitor.getDeptId().toString();
- updateAreaStats(areaStatsMap, deptId, result);
-
- // 澶勭悊鐪佸巺鏁版嵁
- if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
- String provinceKey = ApiConstants.Province + deptId;
- updateAreaStats(areaStatsMap, provinceKey, result);
- }
- }
+ //鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
+ Map<String, FaceDeviceSampleCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list);
+ if (areaStatsMap == null) return;
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
List<CheckIndexFace> checkIndexFaceList = checkIndexFaceMapper.selectToday(DateUtils.getDate());
@@ -89,19 +68,24 @@
/**
* 绱鎶撴媿鏁版嵁鍑嗙‘璁惧鏁板拰璁惧鎬绘暟
*/
- private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, FaceDeviceSamplingResult result) {
+ @Override
+ public void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, FaceDeviceSamplingResult result) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
FaceDeviceSamplingResult.BigUsefulness bigUseful = result.getBigUseful();
- FaceDeviceSamplingResult.FaceEligibility faceElig = result.getFaceElig();
+ FaceDeviceSamplingResult.FaceEligibility faceElig = result.getFaceEligibility();
stats.totalSites++;
//90%鍙婁互涓婃暟鎹悎鏍煎垯姝や汉鑴歌澶囪瑙嗕负鍥剧墖鍚堟牸
- if (faceElig.getFaceEligPercent() >= 0.9) {
- stats.picQualifySites++;
+ if (faceElig != null) {
+ if (faceElig.getFaceEligPercent() >= 0.9) {
+ stats.picQualifySites++;
+ }
}
//澶у浘鍙敤鐜囧ぇ浜�90%瑙嗕负鍚堟牸
- if (bigUseful.getBigUsefulPercent() >= 0.9) {
- stats.picUsabilitySites++;
+ if (bigUseful != null) {
+ if (bigUseful.getBigUsefulPercent() >= 0.9) {
+ stats.picUsabilitySites++;
+ }
}
}
--
Gitblit v1.8.0