From 1a4d27b2c0878c360c4f3d8f66d504f3233c7fc2 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 30 Oct 2024 11:45:06 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.2]=E6=8E=A5=E7=AE=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/eagle/core/function/takeover/TakeOverRecordProvider.kt | 2 +- .../java/com/mogo/eagle/core/function/takeover/db/RecordDb.kt | 2 +- .../java/com/mogo/eagle/core/function/takeover/db/RecordInfo.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/TakeOverRecordProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/TakeOverRecordProvider.kt index 1cd4c73d39..44174fe247 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/TakeOverRecordProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/TakeOverRecordProvider.kt @@ -44,7 +44,7 @@ class TakeOverRecordProvider: ITakeOverProvider { recordInfoList.add( TakeOverRecordInfo(it.faultStartTime,it.address,it.level1Id, it.level2Id,it.level3Id,it.level1Name,it.level2Name,it.level3Name, - it.lineName,it.reportNote,it.reportStatus,false,it.bagId) + it.lineName,it.reportNote,it.reportStatus,false,it.bagId?:0) ) } return recordInfoList diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/db/RecordDb.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/db/RecordDb.kt index 1951a81829..6dff2f13a3 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/db/RecordDb.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/db/RecordDb.kt @@ -31,7 +31,7 @@ abstract class RecordDb: RoomDatabase() { if (db == null) { db = Room.databaseBuilder(context.applicationContext, RecordDb::class.java, RECORD_DB_NAME) .addMigrations(Migration_One_Two) - .fallbackToDestructiveMigration() +// .fallbackToDestructiveMigration() .build() } return db!! diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/db/RecordInfo.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/db/RecordInfo.kt index 3c2f52cc5c..425ce229ef 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/db/RecordInfo.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/takeover/db/RecordInfo.kt @@ -44,5 +44,5 @@ data class RecordInfo( var reportStatus: Boolean, //Bag包唯一标识 key @ColumnInfo - var bagId: Long + var bagId: Long? ) \ No newline at end of file