From b14531e3b850fe6d2fa916ba7b88b3e2bd2ff30a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 11 九月 2024 16:47:48 +0800
Subject: [PATCH] OSD加标签
---
ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java | 95 +++++++++++++++--------------------------------
1 files changed, 31 insertions(+), 64 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
index b192569..bbcbb18 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
@@ -1,29 +1,23 @@
package com.ycl.calculate;
-import com.alibaba.fastjson2.JSONArray;
import com.ycl.platform.domain.entity.CheckIndexVideo;
-import com.ycl.platform.domain.entity.TMonitor;
-import com.ycl.platform.domain.entity.YwPoint;
-import com.ycl.platform.domain.result.UY.VideoOnlineResult;
+import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
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 constant.ApiConstants;
import constant.CheckThreadConstants;
-import constant.RedisConstant;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
import utils.DateUtils;
-import utils.StringUtils;
import java.math.BigDecimal;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 璁＄畻涓�鏈轰竴妗ｆ敞鍐岀巼銆佹。妗堣�冩牳姣�
@@ -32,71 +26,47 @@
*/
@Component
@Slf4j
-public class MonitorRegistrationCalculation extends IndexCalculationServe implements CalculationStrategy<TMonitorVO> {
+public class MonitorRegistrationCalculation extends IndexCalculationServe<MonitorQualifyResult, MonitorRegistrationCalculation.AreaStats> implements CalculationStrategy<MonitorQualifyResult> {
@Autowired
private CheckIndexVideoMapper checkIndexVideoMapper;
@Autowired
private ICheckIndexVideoService checkIndexVideoService;
@Autowired
- private RedisTemplate redisTemplate;
+ private TMonitorMapper monitorMapper;
//鍖哄煙瑙嗛鍦ㄧ嚎鐜囩殑鍐呴儴绫�
- private static class AreaStats {
- //璧勪骇搴撶櫥璁板湪鐢ㄦ暟
- int totalSites = 0;
+ protected static class AreaStats {
+ //褰撴棩妗ｆ鏁�
+ int todayFiles = 0;
//鏈敞鍐岀殑鏁伴噺
int newSites = 0;
//鍏ㄥ勾鐣欏瓨鏁�
int allFiles = 0;
- //褰撴棩妗ｆ鏁帮紙鍑屾櫒璁＄畻鐨勶紝瀹為檯鍙栧緱鏄槰鏃ョ殑涓�鏈轰竴妗ｆ暟閲忥級
- int todayFiles = 0;
}
-
@Override
- public void calculate(List<TMonitorVO> list) {
- if (CollectionUtils.isEmpty(list)) {
- log.info("鏁版嵁涓虹┖");
- return;
- }
- //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
- Map<String, TMonitorVO> monitorMap = new HashMap<>();
- if (!CollectionUtils.isEmpty(list)) {
- monitorMap = list.stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
- }
- //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
- List<String> provinceIds = getProvince();
- //鏈敞鍐岃澶�
- Map<String, TMonitor> newMonitorMap = new HashMap<>();
- //Mongo涓�鏈轰竴妗ｅ悓姝ysql鏃舵斁鍏edis
- String json = (String) redisTemplate.opsForValue().get(RedisConstant.New_Monitor_Set);
- if (!StringUtils.isEmpty(json)) {
- List<TMonitor> newMonitors = JSONArray.parseArray(json, TMonitor.class);
- if (!CollectionUtils.isEmpty(newMonitors)) {
- newMonitorMap = newMonitors.stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
- }
- }
+ public void calculate(List<MonitorQualifyResult> list) {
+ //鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
+ Map<String, MonitorRegistrationCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list);
+ if (areaStatsMap == null) return;
- //鑾峰彇鏄ㄦ棩mongo涓�鏈轰竴妗ｆ暟閲�
- List<String> todayMonitor = getMonitorFromMongo();
- Map<String, AreaStats> areaStatsMap = new HashMap<>();
- for (TMonitorVO result : list) {
- TMonitorVO monitor = monitorMap.get(result.getSerialNumber());
- if (monitor == null) continue;
-
- String deptId = monitor.getDeptId().toString();
- updateAreaStats(areaStatsMap, deptId, result, newMonitorMap, todayMonitor);
- // 澶勭悊鐪佸巺鏁版嵁
- if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
- String provinceKey = ApiConstants.Province + deptId;
- updateAreaStats(areaStatsMap, provinceKey, result, newMonitorMap, todayMonitor);
+ //鏌ユ暟鎹簱琛ュ厖鍏ㄥ勾鐣欏瓨鏁�
+ List<TMonitorVO> monitorVOS = monitorMapper.selectMonitorVOList();
+ areaStatsMap.forEach((key,areaStats)->{
+ if(key.startsWith(ApiConstants.Province)){
+ long count = monitorVOS.stream().filter(vo -> ApiConstants.TRUE.equals(vo.getProvinceTag()))
+ .filter(vo -> key.split("_")[1].equals(vo.getDeptId() + "")).count();
+ areaStats.allFiles = Integer.parseInt(count+"");
+ }else {
+ long count = monitorVOS.stream().filter(vo -> key.equals(vo.getDeptId() + "")).count();
+ areaStats.allFiles = Integer.parseInt(count+"");
}
- }
+ });
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
List<CheckIndexVideo> checkIndexVideoList = checkIndexVideoMapper.selectToday(DateUtils.getDate());
List<CheckIndexVideo> checkIndexVideos = new ArrayList<>();
areaStatsMap.forEach((key, stats) -> {
- if (stats.totalSites > 0) {
+ if (stats.todayFiles > 0) {
CheckIndexVideo checkIndexVideo = createOrUpdateCheckIndexVideo(key, stats, checkIndexVideoList);
if (checkIndexVideo != null) {
checkIndexVideos.add(checkIndexVideo);
@@ -110,16 +80,13 @@
/**
* 绱鎬荤偣浣嶆暟銆佸湪绾跨偣浣嶆暟銆侀噸鐐圭偣浣嶆暟銆侀噸鐐圭偣浣嶅湪绾挎暟銆佹寚鎸ュ浘鍍忔暟銆佹寚鎸ュ浘鍍忓湪绾挎暟
*/
- private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, TMonitorVO result, Map<String, TMonitor> newMonitors, List<String> yesterdayMonitor) {
+ @Override
+ public void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, MonitorQualifyResult result) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
- stats.totalSites++;
- stats.allFiles++;
- if (newMonitors.containsKey(result.getSerialNumber())) {
+ stats.todayFiles++;
+ if (result.getNewDevice()!=null && result.getNewDevice()) {
stats.newSites++;
- }
- if (yesterdayMonitor.contains(result.getSerialNumber())) {
- stats.todayFiles++;
}
}
@@ -133,7 +100,7 @@
}
//璋冪敤涓�鏈轰竴妗ｆ敞鍐岀巼
Map<String, Object> param = new HashMap<>();
- param.put("totalSites", stats.totalSites);
+ param.put("totalSites", stats.todayFiles);
param.put("newSites", stats.newSites);
BigDecimal monitorRegistration = monitorRegistration(param);
checkIndexVideo.setMonitorRegistration(monitorRegistration);
--
Gitblit v1.8.0