From f8889f7364adae89e45a5ec3fcf4b38e430cf389 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 10 九月 2024 10:41:18 +0800
Subject: [PATCH] 工单详情
---
ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java | 54 +++++++++++-------------------------------------------
1 files changed, 11 insertions(+), 43 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
index 592a0e8..8a8c35c 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
@@ -1,21 +1,14 @@
package com.ycl.calculate;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ycl.platform.domain.entity.CheckIndexVideo;
-import com.ycl.platform.domain.entity.TMonitor;
-import com.ycl.platform.domain.param.UY.RecordMetaDSumParam;
-import com.ycl.platform.domain.result.UY.QueryVqdResult;
import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
-import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.CheckIndexVideoMapper;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexVideoService;
-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;
import utils.DateUtils;
import java.math.BigDecimal;
@@ -23,8 +16,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
/**
* 璁＄畻瑙嗛璁惧褰曞儚鍙敤鐜�
@@ -35,7 +26,7 @@
*/
@Component
@Slf4j
-public class VideoUsabilityCalculation extends IndexCalculationServe implements CalculationStrategy<RecordMetaDSumResult> {
+public class VideoUsabilityCalculation extends IndexCalculationServe<RecordMetaDSumResult, VideoUsabilityCalculation.AreaStats> implements CalculationStrategy<RecordMetaDSumResult> {
@Autowired
private CheckIndexVideoMapper checkIndexVideoMapper;
@Autowired
@@ -44,7 +35,7 @@
private ICheckIndexVideoService checkIndexVideoService;
//鍖哄煙瑙嗛鍦ㄧ嚎鐜囩殑鍐呴儴绫�
- private static class AreaStats {
+ protected static class AreaStats {
int totalSites = 0;
int usabilitySites = 0;
int importantSites = 0;
@@ -55,33 +46,9 @@
@Override
public void calculate(List<RecordMetaDSumResult> list) {
- if (CollectionUtils.isEmpty(list)) {
- log.info("鏁版嵁涓虹┖");
- return;
- }
-
- //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
- Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(RecordMetaDSumResult::getDeviceId).collect(Collectors.toList()))
- .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
- //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
- List<String> provinceIds = getProvince();
- //閲嶇偣鐐逛綅闆嗗悎
- List<String> important = getImportant();
- List<String> deptTag = getDeptTag();
- Map<String, AreaStats> areaStatsMap = new HashMap<>();
- for (RecordMetaDSumResult result : list) {
- TMonitorVO monitor = monitorMap.get(result.getDeviceId());
- if (monitor == null) continue;
-
- String deptId = monitor.getDeptId().toString();
- updateAreaStats(areaStatsMap, deptId, result, important,deptTag);
-
- // 澶勭悊鐪佸巺鏁版嵁
- if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
- String provinceKey = ApiConstants.Province + deptId;
- updateAreaStats(areaStatsMap, provinceKey, result, important,deptTag);
- }
- }
+ //鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
+ Map<String, VideoUsabilityCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list);
+ if (areaStatsMap == null) return;
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
List<CheckIndexVideo> checkIndexVideoList = checkIndexVideoMapper.selectToday(DateUtils.getDate());
@@ -101,22 +68,23 @@
/**
* 绱鎬荤偣浣嶆暟銆佸湪绾跨偣浣嶆暟銆侀噸鐐圭偣浣嶆暟銆侀噸鐐圭偣浣嶅湪绾挎暟
*/
- private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, RecordMetaDSumResult result, List<String> important,List<String> deptTag) {
+ @Override
+ public void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, RecordMetaDSumResult result) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
- if(important.contains(result.getDeviceId())){
+ if(result.getImportantTag()!=null && result.getImportantTag()){
stats.importantSites++;
}
- if(deptTag.contains(result.getDeviceId())){
+ if(result.getDeptTag()!=null && result.getDeptTag()){
stats.deptSite++;
}
if (ApiConstants.UY_RecordStatus_Integrity.equals(result.getRecordStatus())){
stats.usabilitySites++;
- if(important.contains(result.getDeviceId())){
+ if(result.getImportantTag()!=null && result.getImportantTag()){
stats.importantUsabilitySites++;
}
- if(deptTag.contains(result.getDeviceId())){
+ if(result.getDeptTag()!=null && result.getDeptTag()){
stats.depteUsabilitySites++;
}
}
--
Gitblit v1.8.0