From c6842e8498c2d9b469890b38cd9f0d714392c445 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 01 十二月 2023 13:22:02 +0800
Subject: [PATCH] 1. 修改优化日统计和风险统计的逻辑
---
src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.kt | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.kt b/src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.kt
index fb01c98..61fe986 100644
--- a/src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.kt
+++ b/src/main/java/com/flightfeather/monitor/analysis/dust/RiskAnalysisController.kt
@@ -35,6 +35,9 @@
}
}
+ /**
+ * 鏃ラ闄╃粺璁�,榛樿缁熻鏄ㄥぉ鐨勯闄╁��
+ */
fun autoRunDaily() {
val data = riskValueRep.findLatestData("day")
val yesterday = LocalDate.now().minusDays(1)
@@ -54,15 +57,21 @@
}
}
+ /**
+ * 鏈堥闄╃粺璁�,鏍规嵁鏄ㄦ棩鏈�鏂版暟鎹墍鍦ㄦ湀浠�,缁熻璇ユ湀鐨勭患鍚堥闄�,鎴嚦鏄ㄥぉ
+ */
fun autoRunMonthly() {
val data = riskValueRep.findLatestData("month")
val lastMonth = LocalDate.now().minusMonths(1).withDayOfMonth(1)
if (data == null) {
runMonthly(lastMonth)
} else {
+ // 鑾峰彇闇�瑕佺粺璁＄殑鏈�鏂版湀浠�,鏄槰澶╂墍鍦ㄧ殑鏈堜唤(鍥犱负鐩戞祴鏁版嵁鏄粖澶╄幏鍙栨槰澶╀竴鏁村ぉ鐨勬暟鎹�)
+ val thisMonth = LocalDate.now().minusDays(1)
+ // 鏈�鏂版湀缁熻璁板綍鐨勬椂闂�
val date = LocalDateTime.ofInstant(data.lst.toInstant(), ZoneId.systemDefault())
- val sT = date.plusMonths(1).toLocalDate()
- val du = DateUtil.findDurationMonth(sT, lastMonth)
+ val sT = date.toLocalDate()
+ val du = DateUtil.findDurationMonth(sT, thisMonth)
du.forEach {
runMonthly(it)
}
@@ -96,13 +105,13 @@
dustSiteStatusRep.select(listOf(DeviceStatus.ONLINE, DeviceStatus.STOP)).forEach { s ->
s?.let {
taskMonthly?.roundInit(s.mnCode, date)
- val riskValueList = riskValueRep.select(s.mnCode, date)
+ val riskValueList = riskValueRep.select(s.mnCode, date, "day")
taskMonthly?.roundCal(riskValueList)
}
}
// 鎵�鏈夊垎鏋愮粨鏋滃叆搴�
if (taskMonthly?.resultList?.isNotEmpty() == true) {
- riskValueRep.insert(taskMonthly?.resultList!!)
+ riskValueRep.insertOrUpdate(taskMonthly?.resultList!!)
}
running2 = false
}
--
Gitblit v1.9.3