From 760378730a02df5f621af5b0ce9eb2b338feaecb Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Mon, 11 Sep 2023 11:40:29 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E6=8A=A5=E8=AD=A6=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt | 7 ++-----
 .../main/java/com/common/commonlib/db/dao/WarningDao.kt    | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt
index 8fa2693..f29e215 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/WarnDataActivity.kt
@@ -50,7 +50,6 @@ class WarnDataActivity : BaseActivity() {
 
     private var startTime = -1L
     private var endTime = -1L
-    private var warnType = ""
     private val mAdapter = WarnDataAdapter()
 
     private val paramsLauncher =
@@ -60,7 +59,6 @@ class WarnDataActivity : BaseActivity() {
                 intent?.apply {
                     startTime = getLongExtra(ChooseParamsActivity.START_TIME, startTime)
                     endTime = getLongExtra(ChooseParamsActivity.END_TIME, endTime)
-                    warnType = getStringExtra(ChooseParamsActivity.WARN_TYPE) ?: warnType
                     initDefaultParamsUi()
                     queryData()
                 }
@@ -96,15 +94,14 @@ class WarnDataActivity : BaseActivity() {
         }
         val startTimeStr = DateUtils.formatHistoryTime(startTime)
         val endTimeStr = DateUtils.formatHistoryTime(endTime)
-        warnType = "温度超标"
         mBinding.tvParams.text =
-            "时间: $startTimeStr——$endTimeStr      告警类型:$warnType"
+            "时间: $startTimeStr——$endTimeStr"
     }
 
     private fun queryData() {
         lifecycleScope.launch {
             val warningDao = DBUtils.warningDao()
-            val warnings = warningDao.findAllByTime("CO", startTime, endTime)
+            val warnings = warningDao.findAllByTime(startTime, endTime)
 
             launch(Dispatchers.Main) {
                 val sortList = mutableListOf<Warning>()
diff --git a/library-common/src/main/java/com/common/commonlib/db/dao/WarningDao.kt b/library-common/src/main/java/com/common/commonlib/db/dao/WarningDao.kt
index 6c99603..b15f0ac 100644
--- a/library-common/src/main/java/com/common/commonlib/db/dao/WarningDao.kt
+++ b/library-common/src/main/java/com/common/commonlib/db/dao/WarningDao.kt
@@ -12,8 +12,8 @@ interface WarningDao {
     @Query("SELECT * FROM warning")
     suspend fun getAll(): List<Warning>?
 
-    @Query("SELECT * FROM warning WHERE gas_name IS :name AND start_time BETWEEN :startTime AND :endTime")
-    suspend fun findAllByTime(name: String, startTime: Long, endTime: Long): List<Warning>
+    @Query("SELECT * FROM warning WHERE start_time BETWEEN :startTime AND :endTime")
+    suspend fun findAllByTime(startTime: Long, endTime: Long): List<Warning>
 
     @Query("SELECT * FROM warning WHERE gas_name IS :name ORDER BY id DESC LIMIT 1")
     suspend fun findLatestByName(name: String): Warning?