From 38d72198bfcced01ed9513b978163e5cd1d84625 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 21 七月 2025 15:31:41 +0800
Subject: [PATCH] 2025.7.21 1. 修改动态溯源异常判断逻辑
---
src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/RealTimeExceptionAnalysisController.kt | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/RealTimeExceptionAnalysisController.kt b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/RealTimeExceptionAnalysisController.kt
index 4c47d28..73f898f 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/RealTimeExceptionAnalysisController.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/RealTimeExceptionAnalysisController.kt
@@ -23,7 +23,7 @@
* @date 2025/5/8
* @author feiyu02
*/
-
+@Deprecated("2025.5.29, 閫昏緫涓庝笟鍔′笉鍖归厤锛屽悗缁垹闄�")
class RealTimeExceptionAnalysisController {
constructor(sceneInfoRep: SceneInfoRep, factorFilter: FactorFilter?) {
@@ -43,7 +43,7 @@
.withMain(FactorType.VOC)
.create()
)
- initTask(config)
+ initTask()
}
constructor(sceneInfoRep: SceneInfoRep) : this(sceneInfoRep, null)
@@ -55,7 +55,7 @@
private val taskList = mutableListOf<BaseExceptionAnalysis<RealTimeAnalysisConfig, RealTimeExceptionResult>>()
- private fun initTask(config: RealTimeAnalysisConfig) {
+ fun initTask() {
taskList.clear()
taskList.apply {
add(
@@ -139,9 +139,11 @@
// 鏇存柊涓棿鐐逛俊鎭�
ex.midData = avgData.apply {
+ dataTime = midData.dataTime
+ createTime = midData.createTime
longitude = midData.longitude
latitude = midData.latitude
- }
+ }.toDataVo()
// 鏇存柊婧簮鑼冨洿鍐呯殑姹℃煋鍦烘櫙淇℃伅
ex.relatedSceneList = result
}
@@ -164,14 +166,24 @@
val eDeg = windDir + defaultDegOffset
val distance = windSpeed * durationMin * 60
- // 宸︿晶锛堥�嗘椂閽堜晶锛夐《鐐�
- val p1 = MapUtil.getPointByLen(center, distance, sDeg * PI / 180)
- // 椋庡悜鍙嶅悜椤剁偣
- val p2 = MapUtil.getPointByLen(center, distance, windDir * PI / 180)
- // 鍙充晶锛堥『鏃堕拡渚э級椤剁偣
- val p3 = MapUtil.getPointByLen(center, distance, eDeg * PI / 180)
+ val result = mutableListOf(center)
+ var startDeg = sDeg
+ while (startDeg < eDeg) {
+ val p = MapUtil.getPointByLen(center, distance, startDeg * PI / 180)
+ result.add(p)
+ startDeg++
+ }
- return listOf(center, p1, p2, p3)
+ return result
+
+// // 宸︿晶锛堥�嗘椂閽堜晶锛夐《鐐�
+// val p1 = MapUtil.getPointByLen(center, distance, sDeg * PI / 180)
+// // 椋庡悜鍙嶅悜椤剁偣
+// val p2 = MapUtil.getPointByLen(center, distance, windDir * PI / 180)
+// // 鍙充晶锛堥『鏃堕拡渚э級椤剁偣
+// val p3 = MapUtil.getPointByLen(center, distance, eDeg * PI / 180)
+//
+// return listOf(center, p1, p2, p3)
}
}
\ No newline at end of file
--
Gitblit v1.9.3