From 9c797fa0d704ef8ffb65cd1716b8eb694b4c46c3 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 04 七月 2025 17:28:00 +0800
Subject: [PATCH] 2025.7.4 1. 新增动态污染溯源新的判定逻辑
---
src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedData.kt | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedData.kt b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedData.kt
index 5661859..d9adf45 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedData.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedData.kt
@@ -6,6 +6,7 @@
import com.flightfeather.uav.common.utils.DateUtil
import com.flightfeather.uav.domain.entity.BaseRealTimeData
import com.flightfeather.uav.lightshare.bean.DataVo
+import java.util.Date
/**
* 姹℃煋鏁版嵁
@@ -40,8 +41,8 @@
subFactorName = factor.subs.map { it.des }
selectedFactor = factor
- startTime = DateUtil.instance.dateToString(start.dataTime, DateUtil.DateStyle.HH_MM_SS)
- endTime = DateUtil.instance.dateToString(end?.dataTime, DateUtil.DateStyle.HH_MM_SS) ?: startTime
+ startTime = start.dataTime
+ endTime = end?.dataTime
// startData = start.getByFactorType(factor.main)
// endData = end?.getByFactorType(factor.main) ?: startData
startData = start
@@ -73,8 +74,8 @@
var subFactorName: List<String>? = null
var selectedFactor: FactorFilter.SelectedFactor? = null
- var startTime: String? = null
- var endTime: String? = null
+ var startTime: Date? = null
+ var endTime: Date? = null
var startData: BaseRealTimeData? = null
var endData: BaseRealTimeData? = null
--
Gitblit v1.9.3