From f284c5ef6a1aa6e9ba5d4e94e4b2abe83b6ea18c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 31 七月 2024 14:54:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexCarServiceImpl.java | 97 ++++--------------------------------------------
1 files changed, 9 insertions(+), 88 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 5741332..45313ed 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,26 +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.calculate.IndexCalculationUtils;
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.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 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.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
+import java.util.*;
/**
* 杞﹁締鎸囨爣姒傜巼鏁版嵁Service涓氬姟灞傚鐞�
@@ -29,14 +22,16 @@
* @date 2024-04-29
*/
@Service
-public class CheckIndexCarServiceImpl implements ICheckIndexCarService {
+@Slf4j
+public class CheckIndexCarServiceImpl extends ServiceImpl<CheckIndexCarMapper, CheckIndexCar> implements ICheckIndexCarService {
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
+ @Autowired
+ private SysConfigMapper sysConfigMapper;
@Autowired
private ITMonitorService monitorService;
@Autowired
private SysDeptMapper deptMapper;
-
/**
* 鏌ヨ杞﹁締鎸囨爣姒傜巼鏁版嵁
*
@@ -102,79 +97,5 @@
@Override
public int deleteCheckIndexCarById(Long id) {
return checkIndexCarMapper.deleteCheckIndexCarById(id);
- }
-
- /**
- * 璁＄畻杞﹁締鐐逛綅鍦ㄧ嚎鐜囥�佽鍥惧簱瀵规帴绋冲畾鎬�
- *
- * @param list
- */
- @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.totalSites += result.getDataCount();
- }
- //鍖哄煙鐐逛綅鎬绘暟
- provinceStats.totalDataSum++;
- areaStatsMap.put("Province_" + monitor.getDeptId(), areaStats);
- }
- }
- areaStatsMap.put(monitor.getDeptId() + "", areaStats);
- }
-
- areaStatsMap.forEach((k, v) -> {
- if (k.startsWith("Province_")) {
-
- }
- });
- CheckIndexCar checkIndexCar = new CheckIndexCar();
-
- }
}
}
--
Gitblit v1.8.0