From d0301aac95bda608758e646306bba4661aca64a9 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Mon, 4 Sep 2023 10:20:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9D=86=E7=8A=B6=E7=89=A9=E8=A6=81?=
 =?UTF-8?q?=E7=B4=A0=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5=E6=97=B6=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt   | 6 ++++++
 .../java/com/navinfo/collect/library/enums/DataCodeEnum.kt  | 6 ++++++
 2 files changed, 12 insertions(+)

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 38750fa4..e817af7a 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
@@ -454,6 +454,12 @@ class ImportOMDBHelper @AssistedInject constructor(
                                         if(startTime==null||startTime=="") {
                                             renderEntity.properties["startTime"] = "null"
                                         }
+                                    } else if(renderEntity.code == DataCodeEnum.OMDB_POLE.code){ // 杆状物
+                                        //过滤树类型的杆状物，无需导入到数据库中
+                                        val poleType = renderEntity.properties["poleType"]
+                                        if(poleType!=null&&poleType.toInt()==2){
+                                            continue
+                                        }
                                     }
 
                                     listResult.add(renderEntity)
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
index c5e41325..c7362231 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
@@ -57,6 +57,12 @@ enum class DataCodeEnum(var tableName: String, var code: String) {
     OMDB_LINK_FORM2_11("风景路线", "2206-11"),
     OMDB_LINK_FORM2_12("车辆测试路段", "2206-12"),
     OMDB_LINK_FORM2_13("驾照考试路段", "2206-13"),
+    OMDB_OBJECT_TEXT("文字", "3002"),
+    OMDB_OBJECT_SYMBOL("符号", "3003"),
+    OMDB_OBJECT_ARROW("箭头", "3004"),
+    OMDB_TRAFFIC_SIGN("交通标牌", "3005"),
+    OMDB_POLE("杆状物", "3006"),
+    OMDB_FILL_AREA("导流区", "3012"),
     OMDB_CROSS_WALK("人行横道", "3014"),
     OMDB_OBJECT_STOPLOCATION("停止位置", "3016"),
     OMDB_INTERSECTION("路口", "4001"),