From a5e63d287b38d38ed530e71568546de447ac50f4 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 29 七月 2024 15:07:26 +0800
Subject: [PATCH] 车辆点位在线接口 TODO省厅点位集合待查询
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexCarServiceImpl.java | 207 +++++++++++++++++++++++++++------------------------
ycl-common/src/main/java/constant/CheckSnapCountConstants.java | 23 +++++
2 files changed, 131 insertions(+), 99 deletions(-)
diff --git a/ycl-common/src/main/java/constant/CheckSnapCountConstants.java b/ycl-common/src/main/java/constant/CheckSnapCountConstants.java
new file mode 100644
index 0000000..12fc795
--- /dev/null
+++ b/ycl-common/src/main/java/constant/CheckSnapCountConstants.java
@@ -0,0 +1,23 @@
+package constant;
+
+
+public class CheckSnapCountConstants {
+ /**
+ * 2022骞村悓鏈熸姄鎷嶉噺(鐪佸巺)
+ */
+ public final static String City = "check.snapCount.city";
+ /**
+ * 2022骞村悓鏈熸姄鎷嶉噺(鍖哄幙)
+ */
+ public final static String County = "check.snapCount.county";
+
+ /**
+ * 2022鎶撴媿鏁拌绠楀�嶇巼
+ */
+ public final static String Multiply = "1.2";
+
+ /**
+ * 鍖哄煙涓暟
+ */
+ public final static Integer CountyNum = 7;
+}
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..bbc61e8 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
@@ -10,10 +10,13 @@
import com.ycl.platform.mapper.CheckIndexCarMapper;
import com.ycl.platform.service.ICheckIndexCarService;
import com.ycl.platform.service.ITMonitorService;
+import com.ycl.system.domain.SysConfig;
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 constant.CheckSnapCountConstants;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -38,6 +41,8 @@
public class CheckIndexCarServiceImpl extends ServiceImpl<CheckIndexCarMapper, CheckIndexCar> implements ICheckIndexCarService {
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
+ @Autowired
+ private SysConfigMapper sysConfigMapper;
@Autowired
private ITMonitorService monitorService;
@Autowired
@@ -109,112 +114,116 @@
public int deleteCheckIndexCarById(Long id) {
return checkIndexCarMapper.deleteCheckIndexCarById(id);
}
+
/**
* 璁＄畻杞﹁締鐐逛綅鍦ㄧ嚎鐜囥�佽鍥惧簱瀵规帴绋冲畾鎬�
- * 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
- * 寰幆map璁＄畻鐐逛綅鍦ㄧ嚎鐜�
- * 鏇存柊鎴栨柊澧�
+ * 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
+ * 寰幆map璁＄畻鐐逛綅鍦ㄧ嚎鐜�
+ * 鏇存柊鎴栨柊澧�
+ *
* @param list
*/
- //TODO:瑙嗗浘搴撳鎺ョǔ瀹氭��
+ //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);
+ if (CollectionUtils.isEmpty(list)) {
+ return;
}
+
+ Map<String, AreaStats> areaStatsMap = new HashMap<>();
+ 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()));
+
+ // TODO: 鍒嗙渷鍘呭競灞� 闇�瑕佽ˉ鍏呴泦鍚堟暟鎹�
+ List<String> provinceIds = new ArrayList<>(); // 杩欓噷闇�瑕佹牴鎹偣浣嶈ˉ鍏�
+
+ for (SnapshotDataMonitorResult result : list) {
+ TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+ if (monitor == null) continue;
+
+ String deptId = monitor.getDeptId().toString();
+ updateAreaStats(areaStatsMap, deptId, result);
+
+ // 澶勭悊鐪佸巺鏁版嵁
+ if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
+ String provinceKey = "Province_" + deptId;
+ updateAreaStats(areaStatsMap, provinceKey, result);
+ }
+ }
+
+ //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� 鐪佸巺銆佸競灞�
+ BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.City);
+ BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.County);
+
+ // 鏌ヨ浠婃棩鏁版嵁
+ List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate());
+ List<CheckIndexCar> checkIndexCars = new ArrayList<>();
+ areaStatsMap.forEach((deptId, stats) -> {
+ if (stats.totalSites > 0) {
+ CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(deptId, stats, cityCountAvg, countyCountAvg, checkIndexCarList);
+ checkIndexCars.add(checkIndexCar);
+ }
+ });
+
+ saveOrUpdateBatch(checkIndexCars);
+ }
+
+ //绱鎬荤偣浣嶆暟銆佺绾挎暟銆佹�绘姄鎷嶉噺
+ private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, SnapshotDataMonitorResult result) {
+ //杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
+ AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
+ stats.totalSites++;
+ if (ApiConstants.HK_SnapCount_ResultType_Null == result.getResultType()) {
+ stats.offlineSites++;
+ } else {
+ stats.totalDataSum += result.getDataCount();
+ }
+ }
+
+ //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊�
+ private BigDecimal getAverageCount(String configKey) {
+ String count = sysConfigMapper.checkConfigKeyUnique(configKey).getConfigValue();
+ return new BigDecimal(count).multiply(new BigDecimal(CheckSnapCountConstants.Multiply))
+ .divide(new BigDecimal(CheckSnapCountConstants.CountyNum), 0, RoundingMode.HALF_UP);
+ }
+ //杞﹁締鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭��
+ private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, BigDecimal cityCountAvg, BigDecimal countyCountAvg, List<CheckIndexCar> checkIndexCarList) {
+ CheckIndexCar checkIndexCar;
+
+ // 妫�鏌ユ槸鍚﹀凡瀛樺湪浠婃棩鏁版嵁
+ Optional<CheckIndexCar> existingCar = checkIndexCarList.stream()
+ .filter(car -> key.equals(car.getDeptId().toString()) &&
+ (key.startsWith("Province_") ? CheckConstants.Examine_Tag_City.equals(car.getExamineTag())
+ : CheckConstants.Examine_Tag_County.equals(car.getExamineTag())))
+ .findFirst();
+
+ if (existingCar.isPresent()) {
+ checkIndexCar = existingCar.get();
+ } else {
+ checkIndexCar = new CheckIndexCar();
+ checkIndexCar.setDeptId(key.startsWith("Province_") ? Long.parseLong(key.split("_")[1]) : Long.parseLong(key));
+ checkIndexCar.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_City : CheckConstants.Examine_Tag_County);
+ checkIndexCar.setCreateTime(new Date());
+ }
+
+ // 鐐逛綅鍦ㄧ嚎鐜�
+ BigDecimal totalSitesBd = new BigDecimal(stats.totalSites);
+ BigDecimal offlineSitesBd = new BigDecimal(stats.offlineSites);
+ BigDecimal onlineSitesBd = totalSitesBd.subtract(offlineSitesBd);
+ checkIndexCar.setSiteOnline(onlineSitesBd.divide(totalSitesBd, 4, RoundingMode.HALF_UP));
+ //瑙嗗浘搴撳鎺ョǔ瀹氭��
+ BigDecimal avgCount = key.startsWith("Province_") ? cityCountAvg : countyCountAvg;
+ checkIndexCar.setViewConnectStability(new BigDecimal(stats.totalDataSum).divide(avgCount, 4, RoundingMode.HALF_UP));
+
+ return checkIndexCar;
+ }
+
+ //鍖哄煙杞﹁締鐐逛綅鍦ㄧ嚎鎸囨爣鐨勫唴閮ㄧ被
+ private static class AreaStats {
+ int totalSites = 0;
+ int offlineSites = 0;
+ int totalDataSum = 0;
}
}
--
Gitblit v1.8.0