From de0a1e32231387d887e7a5299bdfd2674e6c3b3d Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Wed, 13 Sep 2023 10:49:56 +0800
Subject: [PATCH] merge code

---
 .../java/com/navinfo/omqs/db/ImportOMDBHelper.kt     | 12 +++++++-----
 vtm                                                  |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
index 11dadb44..d8b12a5a 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
@@ -624,23 +624,25 @@ class ImportOMDBHelper @AssistedInject constructor(
                                             if(renderEntity.properties.containsKey("geometry")){
                                                 renderEntity.properties.remove("geometry")
                                             }
-
+                                            Log.d("ImportOMDBHelper", "解析===1insert")
                                             Realm.getInstance(currentInstallTaskConfig).insert(renderEntity)
+                                            Log.d("ImportOMDBHelper", "解析===2insert")
+                                        }
+                                        if (currentConfig.table == "OMDB_RD_LINK") {
+                                            listResult.add(renderEntity)
                                         }
-
-                                        listResult.add(renderEntity)
-
                                     }
                                 }
                             }
 
                             // 如果当前解析的是OMDB_RD_LINK数据，将其缓存在预处理类中，以便后续处理其他要素时使用
-                            if (currentConfig.table == "OMDB_RD_LINK") {
+                            if (currentConfig.code == DataCodeEnum.OMDB_RD_LINK.code.toInt()) {
                                 importConfig.preProcess.cacheRdLink =
                                     listResult.associateBy { it.properties["linkPid"] }
                             }
                             // 1个文件发送一次flow流
                             emit("${++processIndex}/${tableNum}")
+                            Log.d("ImportOMDBHelper", "表解析===2${currentConfig.table }")
                         }
                     }
                     Realm.getInstance (currentInstallTaskConfig).commitTransaction()
diff --git a/vtm b/vtm
index d1ac330c..3ea6a7c9 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit d1ac330cf7a8727bb2065093e72d60521775ba6d
+Subproject commit 3ea6a7c90627e6e8ea10b3896004d9082167a7ff