From e923f06d572c9a0e3b1eb2c54471af02c9d95bcf Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 18 十二月 2025 10:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedSource.kt | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedSource.kt b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedSource.kt
index 706622c..ab85953 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedSource.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedSource.kt
@@ -46,12 +46,12 @@
// Fixme 2025.5.14: 姹℃煋婧愮殑鍧愭爣鏄珮寰峰湴鍥惧潗鏍囩郴锛堢伀鏄熷潗鏍囩郴锛夛紝鑰岃蛋鑸暟鎹槸WGS84鍧愭爣绯�
// 鎸夌収鍖哄煙妫�绱㈠唴閮ㄦ薄鏌撴簮淇℃伅
var result = mutableListOf<SceneInfo>()
- // 1. 棣栧厛鎸夌収鍥涜嚦鑼冨洿浠庢暟鎹簱鍒濇绛涢�夋薄鏌撴簮锛屾澶勭殑鍖哄煙鍧愭爣宸茶浆鎹负鐏槦鍧愭爣绯�
val polygonTmp = pollutedArea.polygon
this.sceneList = emptyList()
if (polygonTmp != null) {
val fb = MapUtil.calFourBoundaries(polygonTmp)
+ // 1. 棣栧厛鎸夌収鍥涜嚦鑼冨洿浠庢暟鎹簱鍒濇绛涢�夋薄鏌撴簮锛屾澶勭殑鍖哄煙鍧愭爣宸茶浆鎹负鐏槦鍧愭爣绯�
val sceneList = sceneInfoRep.findByCoordinateRange(fb)
// 2. 鍐嶇簿纭垽鏂槸鍚﹀湪鍙嶅悜婧簮鍖哄煙澶氳竟褰㈠唴閮�
sceneList.forEach {
@@ -61,6 +61,7 @@
}
}
+ // 3. 鍐嶇粺涓�妫�绱㈣繎璺濈姹℃煋鍦嗗舰鍖哄煙鍐呴儴鐨勬薄鏌撴簮
val closePolygonTmp = pollutedArea.closePolygon!!
val closeFb = MapUtil.calFourBoundaries(closePolygonTmp)
val closeSceneList = sceneInfoRep.findByCoordinateRange(closeFb)
@@ -70,13 +71,12 @@
result.add(it)
}
}
- // 鍘婚噸
+ // 4. 鍘婚噸
result = result.distinctBy { it.guid }.toMutableList()
- // 鏍规嵁姹℃煋鍥犲瓙鐨勯噺绾э紝璁＄畻涓昏鐨勬薄鏌撳満鏅被鍨嬶紝绛涢�夌粨鏋�
+ // 5. 鏍规嵁姹℃煋鍥犲瓙鐨勯噺绾э紝璁＄畻涓昏鐨勬薄鏌撳満鏅被鍨嬶紝绛涢�夌粨鏋�
val mainSceneType = calSceneType(pollutedData)
if (mainSceneType != null) {
-// this.conclusion = mainSceneType.first
result = result.filter {
val r = mainSceneType.second.find { s ->
s.value == it.typeId.toInt()
@@ -107,7 +107,7 @@
// val coAvg = round(pollutedData.dataList.map { it.co!! }.average()) / 1000
val coAvg = round(pollutedData.statisticMap[FactorType.CO]?.avg ?: .0) / 1000
"姘哀鍖栧悎鐗╁亸楂橈紝CO鐨勯噺绾т负${coAvg}mg/m鲁锛屼竴鑸敱浜庢満鍔ㄨ溅灏炬皵閫犳垚锛屾薄鏌撴簮浠ユ苯淇�佸姞娌圭珯涓轰富" to
- listOf(SceneType.TYPE6, SceneType.TYPE10, SceneType.TYPE17)
+ listOf(SceneType.TYPE1, SceneType.TYPE6, SceneType.TYPE10, SceneType.TYPE17)
}
FactorType.CO -> "" to listOf(SceneType.TYPE6, SceneType.TYPE10, SceneType.TYPE17)
@@ -229,9 +229,6 @@
* @return 婧簮鎻忚堪
*/
private fun summaryTxt(pollutedData: PollutedData, sceneList: List<SceneInfoVo>): String {
-// pollutedData.exception
-// pollutedData.selectedFactor?.main
-
val st = DateUtil.instance.getTime(pollutedData.startTime)
val et = DateUtil.instance.getTime(pollutedData.endTime)
@@ -277,7 +274,7 @@
val curValue = pollutedData.dataList.last().getByFactorType(s.key)
if (preValue == null || curValue == null) return@forEach
val r = round((curValue - preValue) / preValue * 100)
- txt += "锛屼粠${preValue}渭g/m鲁蹇�熶笂鍗囪嚦${curValue}渭g/m鲁锛屽彉鍖栫巼涓�${r}%"
+ txt += "锛�${s.key.getTxt()}浠�${preValue}渭g/m鲁蹇�熶笂鍗囪嚦${curValue}渭g/m鲁锛屽彉鍖栫巼涓�${r}%"
}
}
}
--
Gitblit v1.9.3