|
@@ -36,6 +36,8 @@ import java.util.*
|
|
import kotlin.collections.ArrayList
|
|
import kotlin.collections.ArrayList
|
|
import kotlin.collections.HashMap
|
|
import kotlin.collections.HashMap
|
|
import com.alibaba.fastjson.JSON
|
|
import com.alibaba.fastjson.JSON
|
|
|
|
+import com.sybotan.android.demo.bean.*
|
|
|
|
+import io.reactivex.Observable
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -825,11 +827,10 @@ class GraphyVM(
|
|
viewModelScope.launch {
|
|
viewModelScope.launch {
|
|
val equipId = if (TextUtils.isEmpty(deviceId)) uuid else deviceId
|
|
val equipId = if (TextUtils.isEmpty(deviceId)) uuid else deviceId
|
|
//获取关系二级列表
|
|
//获取关系二级列表
|
|
- val configParent = ArrayList<RelConfigEntity>()
|
|
|
|
|
|
+ val configParent = ArrayList<RelConfigEntityPackClass>()
|
|
val relList = mutableListOf<List<RelationEntity>>()
|
|
val relList = mutableListOf<List<RelationEntity>>()
|
|
val fromList = repo.getRelConfigByCodeFrom(entity.code!!)
|
|
val fromList = repo.getRelConfigByCodeFrom(entity.code!!)
|
|
val toList = repo.getRelConfigByCodeTo(entity.code!!)
|
|
val toList = repo.getRelConfigByCodeTo(entity.code!!)
|
|
- configParent.addAll(fromList)
|
|
|
|
for (config in fromList) {
|
|
for (config in fromList) {
|
|
val relsFrom = repo.getRelByCodeFrom(config.graphCode!!, config.relCode!!, equipId)
|
|
val relsFrom = repo.getRelByCodeFrom(config.graphCode!!, config.relCode!!, equipId)
|
|
if (!CommonUtils.IsNull(relsFrom)) {
|
|
if (!CommonUtils.IsNull(relsFrom)) {
|
|
@@ -859,8 +860,27 @@ class GraphyVM(
|
|
} else {
|
|
} else {
|
|
relList.add(ArrayList<RelationEntity>())
|
|
relList.add(ArrayList<RelationEntity>())
|
|
}
|
|
}
|
|
|
|
+ val pack = RelConfigEntityPackClass()
|
|
|
|
+ pack.entity = config
|
|
|
|
+ if (config.objTypeFrom.equals("equipment")) {
|
|
|
|
+ val equipmentFrom = repo.getEquipByCode(config.classCodeFrom!!)
|
|
|
|
+ pack.fromName = equipmentFrom.name
|
|
|
|
+ } else {
|
|
|
|
+ val equipmentFrom = repo.getSysByCode(config.classCodeFrom!!)
|
|
|
|
+ pack.fromName = equipmentFrom.name
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ if (config.objTypeTo.equals("equipment")) {
|
|
|
|
+ val equipmentTo = repo.getEquipByCode(config.classCodeTo!!)
|
|
|
|
+ pack.toName = equipmentTo.name
|
|
|
|
+ } else {
|
|
|
|
+ val equipmentTo = repo.getSysByCode(config.classCodeTo!!)
|
|
|
|
+ pack.toName = equipmentTo.name
|
|
|
|
+ }
|
|
|
|
+ configParent.add(pack)
|
|
}
|
|
}
|
|
- configParent.addAll(toList)
|
|
|
|
|
|
+
|
|
|
|
+
|
|
for (config in toList) {
|
|
for (config in toList) {
|
|
val relsTo = repo.getRelByCodeTo(config.graphCode!!, config.relCode!!, equipId)
|
|
val relsTo = repo.getRelByCodeTo(config.graphCode!!, config.relCode!!, equipId)
|
|
if (!CommonUtils.IsNull(relsTo)) {
|
|
if (!CommonUtils.IsNull(relsTo)) {
|
|
@@ -890,6 +910,25 @@ class GraphyVM(
|
|
} else {
|
|
} else {
|
|
relList.add(ArrayList<RelationEntity>())
|
|
relList.add(ArrayList<RelationEntity>())
|
|
}
|
|
}
|
|
|
|
+ val pack = RelConfigEntityPackClass()
|
|
|
|
+ pack.entity = config
|
|
|
|
+ if (config.objTypeFrom.equals("equipment")) {
|
|
|
|
+ val equipmentFrom = repo.getEquipByCode(config.classCodeFrom!!)
|
|
|
|
+ pack.fromName = equipmentFrom.name
|
|
|
|
+ } else {
|
|
|
|
+ val equipmentFrom = repo.getSysByCode(config.classCodeFrom!!)
|
|
|
|
+ pack.fromName = equipmentFrom.name
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ if (config.objTypeTo.equals("equipment")) {
|
|
|
|
+ val equipmentTo = repo.getEquipByCode(config.classCodeTo!!)
|
|
|
|
+ pack.toName = equipmentTo.name
|
|
|
|
+ } else {
|
|
|
|
+ val equipmentTo = repo.getSysByCode(config.classCodeTo!!)
|
|
|
|
+ pack.toName = equipmentTo.name
|
|
|
|
+ }
|
|
|
|
+ configParent.add(pack)
|
|
|
|
+
|
|
}
|
|
}
|
|
val hashMap = HashMap<String, Any>()
|
|
val hashMap = HashMap<String, Any>()
|
|
hashMap.put("parent", configParent)
|
|
hashMap.put("parent", configParent)
|
|
@@ -897,12 +936,12 @@ class GraphyVM(
|
|
mEmitter.SendDircetive(EQUIP_REL, hashMap)
|
|
mEmitter.SendDircetive(EQUIP_REL, hashMap)
|
|
|
|
|
|
//获取管道二级列表
|
|
//获取管道二级列表
|
|
- val pipeParent = ArrayList<PipeConfigEntity>()
|
|
|
|
|
|
+ val pipeParent = ArrayList<PipeConfigEntityPackClass>()
|
|
val pipeChildren = mutableListOf<List<PipeEntity>>()
|
|
val pipeChildren = mutableListOf<List<PipeEntity>>()
|
|
val pipeFromList = repo.getPipeConfigByCodeFrom(entity.code!!)
|
|
val pipeFromList = repo.getPipeConfigByCodeFrom(entity.code!!)
|
|
val pipeToList = repo.getPipeConfigByCodeTo(entity.code!!)
|
|
val pipeToList = repo.getPipeConfigByCodeTo(entity.code!!)
|
|
|
|
|
|
- pipeParent.addAll(pipeFromList)
|
|
|
|
|
|
+
|
|
for (config in pipeFromList) {
|
|
for (config in pipeFromList) {
|
|
val pipeFrom =
|
|
val pipeFrom =
|
|
repo.getPipeByIdFrom(equipId, config.pipeType!!, config.pipeSubType!!)
|
|
repo.getPipeByIdFrom(equipId, config.pipeType!!, config.pipeSubType!!)
|
|
@@ -933,9 +972,16 @@ class GraphyVM(
|
|
} else {
|
|
} else {
|
|
pipeChildren.add(ArrayList<PipeEntity>())
|
|
pipeChildren.add(ArrayList<PipeEntity>())
|
|
}
|
|
}
|
|
|
|
+ val pack = PipeConfigEntityPackClass()
|
|
|
|
+ pack.entity = config
|
|
|
|
+ val equipmentFrom = repo.getEquipByCode(config.classCodeFrom!!)
|
|
|
|
+ pack.fromName = equipmentFrom.name
|
|
|
|
+ val equipmentTo = repo.getEquipByCode(config.classCodeTo!!)
|
|
|
|
+ pack.toName = equipmentTo.name
|
|
|
|
+ pipeParent.add(pack)
|
|
}
|
|
}
|
|
|
|
|
|
- pipeParent.addAll(pipeToList)
|
|
|
|
|
|
+
|
|
for (config in pipeToList) {
|
|
for (config in pipeToList) {
|
|
val pipeFrom = repo.getPipeByIdTo(equipId, config.pipeType!!, config.pipeSubType!!)
|
|
val pipeFrom = repo.getPipeByIdTo(equipId, config.pipeType!!, config.pipeSubType!!)
|
|
if (!CommonUtils.IsNull(pipeFrom)) {
|
|
if (!CommonUtils.IsNull(pipeFrom)) {
|
|
@@ -965,6 +1011,13 @@ class GraphyVM(
|
|
} else {
|
|
} else {
|
|
pipeChildren.add(ArrayList<PipeEntity>())
|
|
pipeChildren.add(ArrayList<PipeEntity>())
|
|
}
|
|
}
|
|
|
|
+ val pack = PipeConfigEntityPackClass()
|
|
|
|
+ pack.entity = config
|
|
|
|
+ val equipmentFrom = repo.getEquipByCode(config.classCodeFrom!!)
|
|
|
|
+ pack.fromName = equipmentFrom.name
|
|
|
|
+ val equipmentTo = repo.getEquipByCode(config.classCodeTo!!)
|
|
|
|
+ pack.toName = equipmentTo.name
|
|
|
|
+ pipeParent.add(pack)
|
|
}
|
|
}
|
|
val hashMap1 = HashMap<String, Any>()
|
|
val hashMap1 = HashMap<String, Any>()
|
|
hashMap1.put("parent", pipeParent)
|
|
hashMap1.put("parent", pipeParent)
|
|
@@ -1158,7 +1211,22 @@ class GraphyVM(
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ fun queryAutoUpdate() {
|
|
|
|
+ val bean = ApkVersionBean()
|
|
|
|
+ val observable = RetrofitFactory.getInstance().autoUpdateApp(getRequestBody(bean))
|
|
|
|
+ sendRequest(
|
|
|
|
+ observable,
|
|
|
|
+ object : BaseObserver<java.util.ArrayList<AutoUpDateBean.Content>>(mActivity, this) {
|
|
|
|
+ override fun onSuccess(models: ArrayList<AutoUpDateBean.Content>) {
|
|
|
|
+ mEmitter.SendDircetive(UPDATE_APP, models.get(0))
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ true
|
|
|
|
+ )
|
|
|
|
+ }
|
|
|
|
+
|
|
companion object {
|
|
companion object {
|
|
|
|
+ const val UPDATE_APP = "UPDATE_APP"
|
|
const val MAP_LOAD = "MAP_LOAD"
|
|
const val MAP_LOAD = "MAP_LOAD"
|
|
const val EQUIP_CLASS = "EQUIP_CLASS"
|
|
const val EQUIP_CLASS = "EQUIP_CLASS"
|
|
|
|
|