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

增加数据过滤

Browse Source
This commit is contained in:
qiji4215 2023-08-14 18:19:26 +08:00
parent 85e863c7b4
commit 4fe231cf02
3 changed files with 54 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,7 +209,7 @@ class ImportOMDBHelper @AssistedInject constructor(
} }
} }
}else if(renderEntity.table == "OMDB_RESTRICTION" && renderEntity.properties.containsKey("linkIn")){ }else if(renderEntity.code == DataCodeEnum.OMDB_RESTRICTION.code && renderEntity.properties.containsKey("linkIn")){
if (renderEntity.properties["linkIn"] != null) { if (renderEntity.properties["linkIn"] != null) {
@ -226,7 +226,7 @@ class ImportOMDBHelper @AssistedInject constructor(
} }
} }
} }
}else if(renderEntity.table == "OMDB_INTERSECTION" && renderEntity.properties.containsKey("linkList")){ }else if(renderEntity.code == DataCodeEnum.OMDB_INTERSECTION.code && renderEntity.properties.containsKey("linkList")){
if (renderEntity.properties["linkList"] != null) { if (renderEntity.properties["linkList"] != null) {
@ -266,7 +266,7 @@ class ImportOMDBHelper @AssistedInject constructor(
} }
//道路属性code编码需要特殊处理 存在多个属性值时，渲染优先级：SA>PA,存在多个属性值时，渲染优先级：FRONTAGE>MAIN_SIDE_A CCESS //道路属性code编码需要特殊处理 存在多个属性值时，渲染优先级：SA>PA,存在多个属性值时，渲染优先级：FRONTAGE>MAIN_SIDE_A CCESS
if(renderEntity.table == "OMDB_LINK_ATTRIBUTE"){ if(renderEntity.code == DataCodeEnum.OMDB_LINK_ATTRIBUTE.code){
var type = renderEntity.properties["SA"] var type = renderEntity.properties["SA"]
@ -285,12 +285,14 @@ class ImportOMDBHelper @AssistedInject constructor(
if(type!=null&&type=="1"){ if(type!=null&&type=="1"){
renderEntity.code = DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code renderEntity.code = DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code
}else{ }else{
renderEntity.enable=0
Log.e("qj","过滤不显示数据${renderEntity.table}")
continue continue
} }
} }
} }
} }
}else if(renderEntity.table == "OMDB_RAMP"){ }else if(renderEntity.code == DataCodeEnum.OMDB_RAMP.code){
/*匝道*/ /*匝道*/
var formWay = renderEntity.properties["FORM_OF_WAY"] var formWay = renderEntity.properties["FORM_OF_WAY"]
if(formWay!=null){ if(formWay!=null){
@ -304,7 +306,7 @@ class ImportOMDBHelper @AssistedInject constructor(
"104"-> renderEntity.code = DataCodeEnum.OMDB_RAMP_7.code "104"-> renderEntity.code = DataCodeEnum.OMDB_RAMP_7.code
} }
} }
}else if(renderEntity.table == "OMDB_LINK_FORM1"){ }else if(renderEntity.code == DataCodeEnum.OMDB_LINK_FORM1.code){
/*道路形态1*/ /*道路形态1*/
var formWay = renderEntity.properties["FORM_OF_WAY"] var formWay = renderEntity.properties["FORM_OF_WAY"]
if(formWay!=null){ if(formWay!=null){
@ -314,7 +316,7 @@ class ImportOMDBHelper @AssistedInject constructor(
"38"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM1_3.code "38"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM1_3.code
} }
} }
}else if(renderEntity.table == "OMDB_LINK_FORM2"){ }else if(renderEntity.code == DataCodeEnum.OMDB_LINK_FORM2.code){
/*道路形态2*/ /*道路形态2*/
var formWay = renderEntity.properties["FORM_OF_WAY"] var formWay = renderEntity.properties["FORM_OF_WAY"]
if(formWay!=null){ if(formWay!=null){
@ -334,6 +336,29 @@ class ImportOMDBHelper @AssistedInject constructor(
"85"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_13.code "85"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_13.code
} }
} }
}else if(renderEntity.code == DataCodeEnum.OMDB_LANE_MARK_BOUNDARYTYPE.code){
var boundaryType = renderEntity.properties["boundaryType"]
if(boundaryType!=null){
when (boundaryType) {
"0","1","6","8","9"->{
renderEntity.enable=0
Log.e("qj","过滤不显示数据${renderEntity.table}")
continue
}
}
}
}else if(renderEntity.code == DataCodeEnum.OMDB_RDBOUND_BOUNDARYTYPE.code){
//过滤不需要渲染的要素
var boundaryType = renderEntity.properties["boundaryType"]
if(boundaryType!=null){
when (boundaryType) {
"0","3","4","5","7","9"->{
renderEntity.enable=0
Log.e("qj","过滤不显示数据${renderEntity.table}")
continue
}
}
}
} }
listResult.add(renderEntity) listResult.add(renderEntity)

16
app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt
View File

@ -63,7 +63,7 @@ class RealmOperateHelper() {
val realmList = realm.where(RenderEntity::class.java) val realmList = realm.where(RenderEntity::class.java)
.equalTo("table", "OMDB_RD_LINK") .equalTo("table", "OMDB_RD_LINK")
.and() .and()
.rawPredicate("tileX>=$xStart and tileX<=$xEnd and tileY>=$yStart and tileY<=$yEnd").and().equalTo("taskId",RealmDBParamUtils.getTaskId()) .rawPredicate("tileX>=$xStart and tileX<=$xEnd and tileY>=$yStart and tileY<=$yEnd").and().equalTo("taskId",RealmDBParamUtils.getTaskId()).and().between("enable",1,2)
.findAll() .findAll()
// 将获取到的数据和查询的polygon做相交，只返回相交的数据 // 将获取到的数据和查询的polygon做相交，只返回相交的数据
val dataList = realm.copyFromRealm(realmList) val dataList = realm.copyFromRealm(realmList)
@ -126,7 +126,7 @@ class RealmOperateHelper() {
val realmList = realm.where(RenderEntity::class.java) val realmList = realm.where(RenderEntity::class.java)
.equalTo("table", table) .equalTo("table", table)
.and() .and()
.rawPredicate("tileX>=$xStart and tileX<=$xEnd and tileY>=$yStart and tileY<=$yEnd").and().equalTo("taskId",RealmDBParamUtils.getTaskId()) .rawPredicate("tileX>=$xStart and tileX<=$xEnd and tileY>=$yStart and tileY<=$yEnd").and().equalTo("taskId",RealmDBParamUtils.getTaskId()).and().between("enable",1,2)
.findAll() .findAll()
// 将获取到的数据和查询的polygon做相交，只返回相交的数据 // 将获取到的数据和查询的polygon做相交，只返回相交的数据
val dataList = realm.copyFromRealm(realmList) val dataList = realm.copyFromRealm(realmList)
@ -165,7 +165,7 @@ class RealmOperateHelper() {
val realm = Realm.getDefaultInstance() val realm = Realm.getDefaultInstance()
val realmList = realm.where(HadLinkDvoBean::class.java) val realmList = realm.where(HadLinkDvoBean::class.java)
.equalTo("taskId",RealmDBParamUtils.getTaskId()) .equalTo("taskId",RealmDBParamUtils.getTaskId()).and().between("enable",1,2)
.findAll() .findAll()
var linkBean: HadLinkDvoBean? = null var linkBean: HadLinkDvoBean? = null
var nearLast: Double = 99999.99 var nearLast: Double = 99999.99
@ -189,7 +189,7 @@ class RealmOperateHelper() {
val realmR = realm.where(RenderEntity::class.java) val realmR = realm.where(RenderEntity::class.java)
.equalTo("table", "OMDB_RD_LINK") .equalTo("table", "OMDB_RD_LINK")
.and() .and()
.equalTo("properties['${LinkTable.linkPid}']", linkPid).and().equalTo("taskId",RealmDBParamUtils.getTaskId()) .equalTo("properties['${LinkTable.linkPid}']", linkPid).and().equalTo("taskId",RealmDBParamUtils.getTaskId()).and().between("enable",1,2)
.findFirst() .findFirst()
if (realmR != null) { if (realmR != null) {
link = realm.copyFromRealm(realmR) link = realm.copyFromRealm(realmR)
@ -207,7 +207,7 @@ class RealmOperateHelper() {
val realmR = realm.where(QsRecordBean::class.java) val realmR = realm.where(QsRecordBean::class.java)
.equalTo("table", "QsRecordBean") .equalTo("table", "QsRecordBean")
.and() .and()
.equalTo("id", markId).and().equalTo("taskId",RealmDBParamUtils.getTaskId()) .equalTo("id", markId).and().equalTo("taskId",RealmDBParamUtils.getTaskId()).and().between("enable",1,2)
.findFirst() .findFirst()
if (realmR != null) { if (realmR != null) {
qsRecordBean = realm.copyFromRealm(realmR) qsRecordBean = realm.copyFromRealm(realmR)
@ -221,7 +221,7 @@ class RealmOperateHelper() {
val realm = Realm.getDefaultInstance() val realm = Realm.getDefaultInstance()
val realmR = realm.where(RenderEntity::class.java) val realmR = realm.where(RenderEntity::class.java)
.equalTo("properties['${LinkTable.linkPid}']", linkPid).and().equalTo("taskId",RealmDBParamUtils.getTaskId()) .equalTo("properties['${LinkTable.linkPid}']", linkPid).and().equalTo("taskId",RealmDBParamUtils.getTaskId()).and().between("enable",1,2)
.findAll() .findAll()
val dataList = realm.copyFromRealm(realmR) val dataList = realm.copyFromRealm(realmR)
@ -266,7 +266,7 @@ class RealmOperateHelper() {
val realmList = realm.where(RenderEntity::class.java) val realmList = realm.where(RenderEntity::class.java)
.notEqualTo("table", "OMDB_RD_LINK") .notEqualTo("table", "OMDB_RD_LINK")
.and() .and()
.rawPredicate("tileX>=$xStart and tileX<=$xEnd and tileY>=$yStart and tileY<=$yEnd").and().equalTo("taskId",RealmDBParamUtils.getTaskId()) .rawPredicate("tileX>=$xStart and tileX<=$xEnd and tileY>=$yStart and tileY<=$yEnd").and().equalTo("taskId",RealmDBParamUtils.getTaskId()).and().between("enable",1,2)
.findAll() .findAll()
// 将获取到的数据和查询的polygon做相交，只返回相交的数据 // 将获取到的数据和查询的polygon做相交，只返回相交的数据
val queryResult = realmList?.stream()?.filter { val queryResult = realmList?.stream()?.filter {
@ -296,7 +296,7 @@ class RealmOperateHelper() {
val realmList = realm.where(RenderEntity::class.java) val realmList = realm.where(RenderEntity::class.java)
.notEqualTo("table", "OMDB_RD_LINK") .notEqualTo("table", "OMDB_RD_LINK")
.and() .and()
.equalTo("properties['${LinkTable.linkPid}']", linkPid).and().equalTo("taskId",RealmDBParamUtils.getTaskId()) .equalTo("properties['${LinkTable.linkPid}']", linkPid).and().equalTo("taskId",RealmDBParamUtils.getTaskId()).and().between("enable",1,2)
.findAll() .findAll()
result.addAll(realm.copyFromRealm(realmList)) result.addAll(realm.copyFromRealm(realmList))
return result return result

16
collect-library/src/main/java/com/navinfo/collect/library/enum/DataCodeEnum.kt
View File

@ -9,6 +9,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) {
"2001" "2001"
), ),
OMDB_RD_LINK_FUNCTION_CLASS("道路功能等级", "2002"), OMDB_RD_LINK_FUNCTION_CLASS("道路功能等级", "2002"),
OMDB_LINK_ATTRIBUTE("道路属性", "2004"),
OMDB_LINK_ATTRIBUTE_SA("道路属性-SA", "2004-1"), OMDB_LINK_ATTRIBUTE_PA( OMDB_LINK_ATTRIBUTE_SA("道路属性-SA", "2004-1"), OMDB_LINK_ATTRIBUTE_PA(
"道路属性-PA", "道路属性-PA",
"2004-2" "2004-2"
@ -32,7 +33,12 @@ enum class DataCodeEnum(var tableName: String, var code: String) {
"2020" "2020"
), ),
OMDB_LINK_SPEEDLIMIT_VAR("可变线限速", "2021"), OMDB_LINK_SPEEDLIMIT_VAR("可变线限速", "2021"),
OMDB_CON_ACCESS("全封闭", "2022"), OMDB_RAMP_1( OMDB_CON_ACCESS("全封闭", "2022"),
OMDB_RAMP(
"匝道",
"2037"
),
OMDB_RAMP_1(
"普通路连接匝道", "普通路连接匝道",
"2037-1" "2037-1"
), ),
@ -71,6 +77,10 @@ enum class DataCodeEnum(var tableName: String, var code: String) {
"环岛", "环岛",
"2204" "2204"
), ),
OMDB_LINK_FORM1(
"道路形态1",
"2205"
),
OMDB_LINK_FORM1_1( OMDB_LINK_FORM1_1(
"U-Turn", "U-Turn",
"2205-1" "2205-1"
@ -83,6 +93,10 @@ enum class DataCodeEnum(var tableName: String, var code: String) {
"提前左转", "提前左转",
"2205-3" "2205-3"
), ),
OMDB_LINK_FORM2(
"道路形态2",
"2206"
),
OMDB_LINK_FORM2_1( OMDB_LINK_FORM2_1(
"IC", "IC",
"2206-1" "2206-1"