Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS

Conflicts: vtm
2023-09-04 10:23:17 +08:00
parent 827fe1bf77 9a486bde52
commit 6d0880b3a9
2 changed files with 12 additions and 1 deletions
--- 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)