From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexCarServiceImpl.java | 128 ++----------------------------------------
1 files changed, 7 insertions(+), 121 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexCarServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexCarServiceImpl.java
index 8fa5174..e460f24 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexCarServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexCarServiceImpl.java
@@ -1,31 +1,19 @@
package com.ycl.platform.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.entity.CalculateReport;
import com.ycl.platform.domain.entity.CheckIndexCar;
-import com.ycl.platform.domain.entity.TMonitor;
-import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
-import com.ycl.platform.mapper.CalculateReportMapper;
+import com.ycl.platform.domain.query.DashboardQuery;
import com.ycl.platform.mapper.CheckIndexCarMapper;
import com.ycl.platform.service.ICheckIndexCarService;
import com.ycl.platform.service.ITMonitorService;
-import com.ycl.system.entity.SysDept;
+import com.ycl.system.mapper.SysConfigMapper;
import com.ycl.system.mapper.SysDeptMapper;
-import constant.ApiConstants;
-import constant.CheckConstants;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
import utils.DateUtils;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
/**
* 杞﹁締鎸囨爣姒傜巼鏁版嵁Service涓氬姟灞傚鐞�
@@ -39,10 +27,11 @@
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
@Autowired
+ private SysConfigMapper sysConfigMapper;
+ @Autowired
private ITMonitorService monitorService;
@Autowired
private SysDeptMapper deptMapper;
-
/**
* 鏌ヨ杞﹁締鎸囨爣姒傜巼鏁版嵁
*
@@ -109,112 +98,9 @@
public int deleteCheckIndexCarById(Long id) {
return checkIndexCarMapper.deleteCheckIndexCarById(id);
}
- /**
- * 璁＄畻杞﹁締鐐逛綅鍦ㄧ嚎鐜囥�佽鍥惧簱瀵规帴绋冲畾鎬�
- * 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
- * 寰幆map璁＄畻鐐逛綅鍦ㄧ嚎鐜�
- * 鏇存柊鎴栨柊澧�
- * @param list
- */
- //TODO:瑙嗗浘搴撳鎺ョǔ瀹氭��
+
@Override
- public void siteOnline(List<SnapshotDataMonitorResult> list) {
- //璁惧id
- List<String> deviceIds = list.stream().map(SnapshotDataMonitorResult::getExternalIndexCode).collect(Collectors.toList());
- if (!CollectionUtils.isEmpty(deviceIds)) {
- // 鐢ㄤ簬瀛樺偍姣忎釜鍖哄煙缁熻淇℃伅鐨勮緟鍔╃被
- class AreaStats {
- //鐐逛綅鎬绘暟
- int totalSites = 0;
- //绂荤嚎鐐逛綅鏁�
- int offlineSites = 0;
- //鎬绘姄鎷嶉噺
- int totalDataSum = 0;
- }
- List<TMonitor> monitors = monitorService.list(new QueryWrapper<TMonitor>().in("serial_number", deviceIds));
- Map<String, AreaStats> areaStatsMap = new HashMap<>();
- //鑾峰緱鎵�鏈夊尯鍘縟eptId
- List<Long> deptIds = deptMapper.selectByParentId(207L);
- deptIds.forEach(deptId -> areaStatsMap.put(deptId + "", new AreaStats()));
-
- //杞崲涓簃ap
- //TODO锛氬垎鐪佸巺甯傚眬 闇�瑕佽ˉ鍏呴泦鍚堟暟鎹�
- List<String> provinceIds = new ArrayList<>();
- Map<String, TMonitor> monitorMap = monitors.stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
- for (SnapshotDataMonitorResult result : list) {
- TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
- AreaStats areaStats = areaStatsMap.get(monitor.getDeptId() + "");
- String serialNumber = monitor.getSerialNumber();
- //鏃犳暟鎹�
- if (ApiConstants.HK_SnapCount_ResultType_Null == result.getResultType()) {
- //鍖哄煙绂荤嚎鐐逛綅鏁�
- areaStats.offlineSites++;
- } else {
- //鍖哄煙鎬绘姄鎷嶉噺
- areaStats.totalSites += result.getDataCount();
- }
- //鍖哄煙鐐逛綅鎬绘暟
- areaStats.totalDataSum++;
- //鏄惁鏄渷鍘呮暟鎹�
- if (!CollectionUtils.isEmpty(provinceIds)) {
- if (provinceIds.contains(serialNumber)) {
- //鐪佸巺鏁版嵁
- AreaStats provinceStats = areaStatsMap.get("Province_" + monitor.getDeptId());
- //鏃犳暟鎹�
- if (ApiConstants.HK_SnapCount_ResultType_Null == result.getResultType()) {
- //鍖哄煙绂荤嚎鐐逛綅鏁�
- provinceStats.offlineSites++;
- } else {
- //鍖哄煙鎬绘姄鎷嶉噺
- provinceStats.totalDataSum += result.getDataCount();
- }
- //鍖哄煙鐐逛綅鎬绘暟
- provinceStats.totalSites++;
- areaStatsMap.put("Province_" + monitor.getDeptId(), areaStats);
- }
- }
- areaStatsMap.put(monitor.getDeptId() + "", areaStats);
- }
- List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate());
- List<CheckIndexCar> checkIndexCars = new ArrayList<>();
- areaStatsMap.forEach((k, v) -> {
- if (v.totalSites == 0) {
- log.info("閮ㄩ棬id涓簕}鎬荤偣浣嶆暟涓�0", k);
- } else {
- CheckIndexCar checkIndexCar = new CheckIndexCar();
- //鎵炬槸鍚﹀凡缁忓瓨鍦ㄦ暟鎹�
- Optional<CheckIndexCar> first;
- if (k.startsWith("Province_")) {
- //鐪佸巺
- String[] idArray = k.split("_");
- first = checkIndexCarList.stream().filter(item -> idArray[1].equals(item.getDeptId() + "") && CheckConstants.Examine_Tag_City.equals(item.getExamineTag()))
- .findFirst();
- checkIndexCar.setExamineTag(CheckConstants.Examine_Tag_City);
- checkIndexCar.setDeptId(Long.parseLong(idArray[1]));
- } else {
- //鍖哄幙
- first = checkIndexCarList.stream().filter(item -> k.equals(item.getDeptId() + "") && CheckConstants.Examine_Tag_County.equals(item.getExamineTag()))
- .findFirst();
- checkIndexCar.setExamineTag(CheckConstants.Examine_Tag_County);
- checkIndexCar.setDeptId(Long.parseLong(k));
- }
- checkIndexCar.setCreateTime(new Date());
- if (first.isPresent()) {
- checkIndexCar = first.get();
- }
- // 灏嗘暣鏁拌浆鎹负BigDecimal
- BigDecimal totalSitesBd = new BigDecimal(v.totalSites);
- BigDecimal offlineSitesBd = new BigDecimal(v.offlineSites);
- // 鎵ц璁＄畻锛屼繚鐣欏洓浣嶅皬鏁板苟鍥涜垗浜斿叆
- BigDecimal onlineSitesBd = totalSitesBd.subtract(offlineSitesBd);
- BigDecimal siteOnline = onlineSitesBd.divide(totalSitesBd, 4, RoundingMode.HALF_UP);
- checkIndexCar.setSiteOnline(siteOnline);
- checkIndexCars.add(checkIndexCar);
- }
- });
-
- saveOrUpdateBatch(checkIndexCars);
- }
+ public CheckIndexCar dashboard(DashboardQuery dashboardQuery) {
+ return checkIndexCarMapper.dashboard(dashboardQuery);
}
-
}
--
Gitblit v1.8.0