From dd0cae7da0a525d61af39a08266fedd2ea0f9a0a Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Tue, 21 Nov 2023 15:41:51 +0800 Subject: [PATCH] =?UTF-8?q?desc:=E4=BC=A0=E6=84=9F=E5=99=A8=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E5=85=B3=E8=81=94=E7=BC=96=E5=8F=B7=EF=BC=8C=E4=B8=BA?= =?UTF-8?q?=E5=90=8E=E7=BB=AD=E6=A0=87=E5=AE=9A=E5=81=9A=E5=87=86=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/common/commonlib/db/dao/GasTypeDao.kt | 2 +- .../src/main/java/com/common/commonlib/db/entity/GasType.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library-common/src/main/java/com/common/commonlib/db/dao/GasTypeDao.kt b/library-common/src/main/java/com/common/commonlib/db/dao/GasTypeDao.kt index 3b076df..58073a1 100644 --- a/library-common/src/main/java/com/common/commonlib/db/dao/GasTypeDao.kt +++ b/library-common/src/main/java/com/common/commonlib/db/dao/GasTypeDao.kt @@ -9,7 +9,7 @@ import com.common.commonlib.db.entity.GasType @Dao interface GasTypeDao { - @Query("SELECT * FROM gas_type") + @Query("SELECT * FROM gas_type ORDER BY sensor_index") suspend fun getAll(): List @Query("SELECT * FROM gas_type WHERE gas_name IS :name") diff --git a/library-common/src/main/java/com/common/commonlib/db/entity/GasType.kt b/library-common/src/main/java/com/common/commonlib/db/entity/GasType.kt index c97a88b..b66f722 100644 --- a/library-common/src/main/java/com/common/commonlib/db/entity/GasType.kt +++ b/library-common/src/main/java/com/common/commonlib/db/entity/GasType.kt @@ -6,8 +6,8 @@ import androidx.room.PrimaryKey @Entity(tableName = "gas_type") data class GasType( - @PrimaryKey @ColumnInfo(name = "gas_name") var type: String, + @ColumnInfo(name = "gas_name") var type: String, @ColumnInfo(name = "status") var status: Int = 3, - @ColumnInfo(name = "sensor_index") var sensorIndex: Int = -1, + @PrimaryKey @ColumnInfo(name = "sensor_index") var sensorIndex: Int = -1, @ColumnInfo(name = "nick_name") var nickName: String? = null, )