From 359d936589ea163ed99f3df8b70054fbbdcd0fc9 Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Fri, 9 Jun 2023 11:29:14 +0800 Subject: [PATCH] desc:fix db --- app/build.gradle | 1 + .../java/com/yinuo/safetywatcher/watcher/db/AppDatabase.kt | 2 +- .../main/java/com/yinuo/safetywatcher/watcher/db/dao/GasDao.kt | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fd402d4..6d11d9b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,6 +64,7 @@ dependencies { var room_version = "2.5.0" implementation("androidx.room:room-runtime:$room_version") annotationProcessor("androidx.room:room-compiler:$room_version") + kapt("androidx.room:room-compiler:$room_version") implementation("androidx.room:room-ktx:$room_version") implementation 'com.google.android.material:material:1.5.0' diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/AppDatabase.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/db/AppDatabase.kt index 616e49f..787e009 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/AppDatabase.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/db/AppDatabase.kt @@ -9,7 +9,7 @@ import com.yinuo.safetywatcher.watcher.db.dao.WarningDao import com.yinuo.safetywatcher.watcher.db.entity.Gas import com.yinuo.safetywatcher.watcher.db.entity.Warning -@Database(entities = [Warning::class, Gas::class], version = 1) +@Database(entities = [Warning::class, Gas::class], version = 1, exportSchema = false) abstract class AppDatabase : RoomDatabase() { abstract fun warningDao(): WarningDao abstract fun gasDao(): GasDao diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/GasDao.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/GasDao.kt index ecda121..baf714d 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/GasDao.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/db/dao/GasDao.kt @@ -5,7 +5,6 @@ import androidx.room.Delete import androidx.room.Insert import androidx.room.Query import com.yinuo.safetywatcher.watcher.db.entity.Gas -import com.yinuo.safetywatcher.watcher.db.entity.Warning @Dao interface GasDao { @@ -13,7 +12,7 @@ interface GasDao { suspend fun getAll(): List @Query("SELECT * FROM gas WHERE gas_name IS :name AND time BETWEEN :startTime AND :endTime") - suspend fun findByName(name: String, startTime: Long, endTime: Long): List + suspend fun findByName(name: String, startTime: Long, endTime: Long): List @Insert suspend fun insertAll(vararg gases: Gas)