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