From b0e63cbf098a4ee0fde734236bc9358f7fa3ed0e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 09 八月 2024 09:35:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
index 3322699..f26b39c 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
@@ -3,8 +3,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ycl.platform.domain.entity.CheckIndexCar;
import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.result.HK.CrossDetailResult;
import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
+import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.CheckIndexCarMapper;
+import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexCarService;
import com.ycl.platform.service.ITMonitorService;
import com.ycl.system.mapper.SysConfigMapper;
@@ -24,8 +27,8 @@
import java.util.stream.Collectors;
/**
+ * 璁＄畻杞﹁締鐐逛綅鍦ㄧ嚎鐜囥�佽鍥惧簱瀵规帴绋冲畾鎬�
* 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋滄帴鍙ｆ暟鎹�
- * 璁＄畻杞﹁締銆佷汉鑴哥偣浣嶅湪绾跨巼銆佽鍥惧簱瀵规帴绋冲畾鎬�
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 寰幆map璁＄畻鐐逛綅鍦ㄧ嚎鐜�
* 鏇存柊鎴栨柊澧�
@@ -37,14 +40,14 @@
@Autowired
private SysConfigMapper sysConfigMapper;
@Autowired
- private ITMonitorService monitorService;
+ private TMonitorMapper monitorMapper;
@Autowired
private ICheckIndexCarService checkIndexCarService;
//鍖哄煙杞﹁締鐐逛綅鍦ㄧ嚎鎸囨爣鐨勫唴閮ㄧ被
private static class AreaStats {
int totalSites = 0;
- int offlineSites = 0;
+ int onlineSites = 0;
int totalDataSum = 0;
}
@@ -55,15 +58,14 @@
}
//鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈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()));
+ Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(SnapshotDataMonitorResult::getExternalIndexCode).collect(Collectors.toList()))
+ .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
//鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
List<String> provinceIds = getProvince();
Map<String, AreaStats> areaStatsMap = new HashMap<>();
for (SnapshotDataMonitorResult result : list) {
- TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+ TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
if (monitor == null) continue;
String deptId = monitor.getDeptId().toString();
@@ -77,8 +79,8 @@
}
//鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� 鐪佸巺銆佸競灞�
- BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.City);
- BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.County);
+ BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.Car_City);
+ BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.Car_County);
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate());
@@ -102,8 +104,8 @@
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
- if (ApiConstants.HK_SnapCount_ResultType_Null == result.getResultType()) {
- stats.offlineSites++;
+ if (ApiConstants.HK_SnapCount_ResultType_Null != result.getResultType()) {
+ stats.onlineSites++;
} else {
stats.totalDataSum += result.getDataCount();
}
@@ -131,7 +133,7 @@
//璋冪敤鐐逛綅鍦ㄧ嚎璁＄畻鏂规硶
Map<String, Object> siteOnlineParam = new HashMap<>();
siteOnlineParam.put("totalSites", stats.totalSites);
- siteOnlineParam.put("offlineSites", stats.offlineSites);
+ siteOnlineParam.put("onlineSites", stats.onlineSites);
BigDecimal siteOnline = siteOnline(siteOnlineParam);
checkIndexCar.setSiteOnline(siteOnline);
//瑙嗗浘搴撳鎺ョǔ瀹氭��
--
Gitblit v1.8.0