xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge code

Browse Source
This commit is contained in:
qiji4215 2023-09-13 10:49:56 +08:00
parent a8d88a2ada
commit de0a1e3223
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
View File

@ -624,23 +624,25 @@ class ImportOMDBHelper @AssistedInject constructor(
if(renderEntity.properties.containsKey("geometry")){ if(renderEntity.properties.containsKey("geometry")){
renderEntity.properties.remove("geometry") renderEntity.properties.remove("geometry")
} }
Log.d("ImportOMDBHelper", "解析===1insert")
Realm.getInstance(currentInstallTaskConfig).insert(renderEntity) Realm.getInstance(currentInstallTaskConfig).insert(renderEntity)
Log.d("ImportOMDBHelper", "解析===2insert")
}
if (currentConfig.table == "OMDB_RD_LINK") {
listResult.add(renderEntity)
} }
listResult.add(renderEntity)
} }
} }
} }
// 如果当前解析的是OMDB_RD_LINK数据，将其缓存在预处理类中，以便后续处理其他要素时使用 // 如果当前解析的是OMDB_RD_LINK数据，将其缓存在预处理类中，以便后续处理其他要素时使用
if (currentConfig.table == "OMDB_RD_LINK") { if (currentConfig.code == DataCodeEnum.OMDB_RD_LINK.code.toInt()) {
importConfig.preProcess.cacheRdLink = importConfig.preProcess.cacheRdLink =
listResult.associateBy { it.properties["linkPid"] } listResult.associateBy { it.properties["linkPid"] }
} }
// 1个文件发送一次flow流 // 1个文件发送一次flow流
emit("${++processIndex}/${tableNum}") emit("${++processIndex}/${tableNum}")
Log.d("ImportOMDBHelper", "表解析===2${currentConfig.table }")
} }
} }
Realm.getInstance (currentInstallTaskConfig).commitTransaction() Realm.getInstance (currentInstallTaskConfig).commitTransaction()

2
vtm

@ -1 +1 @@
Subproject commit d1ac330cf7a8727bb2065093e72d60521775ba6d Subproject commit 3ea6a7c90627e6e8ea10b3896004d9082167a7ff