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/risk/DustRiskAnalysis.kt |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/flightfeather/monitor/analysis/dust/risk/DustRiskAnalysis.kt b/src/main/java/com/flightfeather/monitor/analysis/dust/risk/DustRiskAnalysis.kt
index 3e05493..cd8748a 100644
--- a/src/main/java/com/flightfeather/monitor/analysis/dust/risk/DustRiskAnalysis.kt
+++ b/src/main/java/com/flightfeather/monitor/analysis/dust/risk/DustRiskAnalysis.kt
@@ -5,6 +5,7 @@
 import java.time.LocalDate
 import java.time.ZoneId
 import java.util.*
+import kotlin.math.round
 
 /**
  * 鎵皹鐩戞祴鏁版嵁椋庨櫓鍒嗘瀽鍩虹被
@@ -50,16 +51,16 @@
      * 鍦ㄧ嚎鐜囬闄╁��
      */
     fun riskOnlineRate(riskValue: RiskValue, data: DustStatisticsValue) {
-        val dayOnline = data.dayOnline.substring(0, data.dayOnline.lastIndex).toDouble() / 100
-        riskValue.onlineRisk = 1 - dayOnline
+        val dayOnline = data.dayOnline
+        riskValue.onlineRisk = round((1 - dayOnline) * 10000) / 10000
     }
 
     /**
      * 鏈夋晥鐜囬闄╁��
      */
     fun riskValidRate(riskValue: RiskValue, data: DustStatisticsValue) {
-        val dayValid = data.dayValid.substring(0, data.dayValid.lastIndex).toDouble() / 100
-        riskValue.validRisk = 1 - dayValid
+        val dayValid = data.dayValid
+        riskValue.validRisk = round((1 - dayValid) * 10000) / 10000
     }
 
     /**

--
Gitblit v1.9.3