|
@@ -485,7 +485,7 @@ class GraphyVM(
|
|
|
val spaceModel = SpaceEqModel()
|
|
|
spaceModel.type = equip.classCode
|
|
|
var equipEntity = repo.getEquipByCode(equip.classCode)
|
|
|
- spaceModel.typeName = equipEntity.name
|
|
|
+ spaceModel.typeName = equipEntity?.name
|
|
|
val child = Children()
|
|
|
child.deviceId = equip.id
|
|
|
child.name = equip.name
|
|
@@ -568,59 +568,47 @@ class GraphyVM(
|
|
|
* 查询楼层下的管道数据
|
|
|
*/
|
|
|
fun floorPipe() {
|
|
|
- viewModelScope.launch {
|
|
|
- val pipeModels = ArrayList<SpacePipeModel>()
|
|
|
- val pipes = repo.getPipeByFloorId(floorId)
|
|
|
- for (pipe in pipes) {
|
|
|
- var hasParent = false
|
|
|
- for (model in pipeModels) {
|
|
|
- if (model.type!!.equals(pipe.pipeType)) {
|
|
|
- val child = ChildrenZ()
|
|
|
- val objFrom = repo.getObject(pipe.objFrom!!)
|
|
|
- val objTo = repo.getObject(pipe.objTo!!)
|
|
|
- val strInfoFrom =
|
|
|
- gson.fromJson(objFrom!!.strInfos, StrInfosforEquip::class.java)
|
|
|
- child.position.add(PointF(strInfoFrom.location.x, strInfoFrom.location.y))
|
|
|
-
|
|
|
- val strInfoTo =
|
|
|
- gson.fromJson(objTo!!.strInfos, StrInfosforEquip::class.java)
|
|
|
- child.position.add(PointF(strInfoTo.location.x, strInfoTo.location.y))
|
|
|
- model.children.add(child)
|
|
|
- hasParent = true
|
|
|
- }
|
|
|
- }
|
|
|
- if (!hasParent) {
|
|
|
- val pipeModel = SpacePipeModel()
|
|
|
- pipeModel.typeName = pipe.pipeSubType + "--" + pipe.pipeType
|
|
|
- pipeModel.type = pipe.pipeType
|
|
|
- val child = ChildrenZ()
|
|
|
- val objFrom = repo.getObject(pipe.objFrom!!)
|
|
|
- val objTo = repo.getObject(pipe.objTo!!)
|
|
|
- val strInfoFrom =
|
|
|
- gson.fromJson(objFrom!!.strInfos, StrInfosforEquip::class.java)
|
|
|
- child.position.add(PointF(strInfoFrom.location.x, strInfoFrom.location.y))
|
|
|
-
|
|
|
- val strInfoTo = gson.fromJson(objTo!!.strInfos, StrInfosforEquip::class.java)
|
|
|
- child.position.add(PointF(strInfoTo.location.x, strInfoTo.location.y))
|
|
|
- pipeModel.children.add(child)
|
|
|
- pipeModels.add(pipeModel)
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- mEmitter.SendDircetive(SPACE_PIPE, pipeModels)
|
|
|
- }
|
|
|
-// val bean = ReqFloorPipe()
|
|
|
-// bean.floorId = floorId
|
|
|
-// val observable = RetrofitFactory.getInstance().floorPipe(getRequestBody(bean))
|
|
|
-// sendRequest(
|
|
|
-// observable,
|
|
|
-// object : BaseObserver<ArrayList<SpacePipeModel>>(mActivity, this) {
|
|
|
-// override fun onSuccess(models: java.util.ArrayList<SpacePipeModel>) {
|
|
|
-// mEmitter.SendDircetive(SPACE_PIPE, models)
|
|
|
+// viewModelScope.launch {
|
|
|
+// val pipeModels = ArrayList<SpacePipeModel>()
|
|
|
+// val pipes = repo.getPipeByFloorId(floorId)
|
|
|
+// for (pipe in pipes) {
|
|
|
+// var hasParent = false
|
|
|
+// for (model in pipeModels) {
|
|
|
+// if (model.type!!.equals(pipe.pipeType)) {
|
|
|
+// val child = ChildrenZ()
|
|
|
+// val objFrom = repo.getObject(pipe.objFrom!!)
|
|
|
+// val objTo = repo.getObject(pipe.objTo!!)
|
|
|
+// val strInfoFrom =
|
|
|
+// gson.fromJson(objFrom!!.strInfos, StrInfosforEquip::class.java)
|
|
|
+// child.position.add(PointF(strInfoFrom.location.x, strInfoFrom.location.y))
|
|
|
+//
|
|
|
+// val strInfoTo =
|
|
|
+// gson.fromJson(objTo!!.strInfos, StrInfosforEquip::class.java)
|
|
|
+// child.position.add(PointF(strInfoTo.location.x, strInfoTo.location.y))
|
|
|
+// model.children.add(child)
|
|
|
+// hasParent = true
|
|
|
+// }
|
|
|
// }
|
|
|
-// },
|
|
|
-// true
|
|
|
-// )
|
|
|
+// if (!hasParent) {
|
|
|
+// val pipeModel = SpacePipeModel()
|
|
|
+// pipeModel.typeName = pipe.pipeSubType + "--" + pipe.pipeType
|
|
|
+// pipeModel.type = pipe.pipeType
|
|
|
+// val child = ChildrenZ()
|
|
|
+// val objFrom = repo.getObject(pipe.objFrom!!)
|
|
|
+// val objTo = repo.getObject(pipe.objTo!!)
|
|
|
+// val strInfoFrom =
|
|
|
+// gson.fromJson(objFrom!!.strInfos, StrInfosforEquip::class.java)
|
|
|
+// child.position.add(PointF(strInfoFrom.location.x, strInfoFrom.location.y))
|
|
|
+//
|
|
|
+// val strInfoTo = gson.fromJson(objTo!!.strInfos, StrInfosforEquip::class.java)
|
|
|
+// child.position.add(PointF(strInfoTo.location.x, strInfoTo.location.y))
|
|
|
+// pipeModel.children.add(child)
|
|
|
+// pipeModels.add(pipeModel)
|
|
|
+// }
|
|
|
+//
|
|
|
+// }
|
|
|
+// mEmitter.SendDircetive(SPACE_PIPE, pipeModels)
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
fun getInfosConfig(spaceId: String) {
|
|
@@ -680,7 +668,7 @@ class GraphyVM(
|
|
|
for (equip in equips) {
|
|
|
if (!TextUtils.isEmpty(equip.systemCode)) {
|
|
|
val systemEntity = repo.getSysByCode(equip.systemCode!!)
|
|
|
- equip.systemName = systemEntity.name
|
|
|
+ equip.systemName = systemEntity?.name
|
|
|
}
|
|
|
}
|
|
|
mEmitter.SendDircetive(EQUIP_CLASS, equips)
|
|
@@ -771,7 +759,9 @@ class GraphyVM(
|
|
|
} else {
|
|
|
val equip = repo.getObject(deviceId!!)
|
|
|
// equip!!.infos = JSONObject(hashMap as Map<*, *>)
|
|
|
- equip!!.strInfos = gson.toJson(hashMap)
|
|
|
+ equip!!.classCode = equipEntity.code!!
|
|
|
+ equip.localId = localId
|
|
|
+ equip.strInfos = gson.toJson(hashMap)
|
|
|
repo.insObject(equip)
|
|
|
}
|
|
|
//插入文件数据
|
|
@@ -848,13 +838,16 @@ class GraphyVM(
|
|
|
if (!CommonUtils.IsNull(relsFrom)) {
|
|
|
var relRealFrom = ArrayList<RelationEntity>()
|
|
|
relRealFrom.addAll(relsFrom)
|
|
|
- for (rel in relRealFrom) {
|
|
|
+ val iterator = relRealFrom.iterator()
|
|
|
+ while (iterator.hasNext()) {
|
|
|
+ val rel = iterator.next()
|
|
|
val objFrom = repo.getObject(rel.objFrom!!)
|
|
|
val objTo = repo.getObject(rel.objTo!!)
|
|
|
if (objFrom == null) {
|
|
|
rel.objFromLocalId = "该设备"
|
|
|
if (!entity.code.equals(config.classCodeFrom)) {
|
|
|
- relRealFrom.remove(rel)
|
|
|
+// relRealFrom.remove(rel)
|
|
|
+ iterator.remove()
|
|
|
continue
|
|
|
}
|
|
|
} else {
|
|
@@ -864,14 +857,16 @@ class GraphyVM(
|
|
|
rel.objFromLocalId = objFrom.localId
|
|
|
}
|
|
|
if (!objFrom.classCode.equals(config.classCodeFrom)) {
|
|
|
- relRealFrom.remove(rel)
|
|
|
+// relRealFrom.remove(rel)
|
|
|
+ iterator.remove()
|
|
|
continue
|
|
|
}
|
|
|
}
|
|
|
if (objTo == null) {
|
|
|
rel.objToLocalId = "该设备"
|
|
|
if (!entity.code.equals(config.classCodeTo)) {
|
|
|
- relRealFrom.remove(rel)
|
|
|
+// relRealFrom.remove(rel)
|
|
|
+ iterator.remove()
|
|
|
continue
|
|
|
}
|
|
|
} else {
|
|
@@ -881,11 +876,15 @@ class GraphyVM(
|
|
|
rel.objToLocalId = objTo.localId
|
|
|
}
|
|
|
if (!objTo.classCode.equals(config.classCodeTo)) {
|
|
|
- relRealFrom.remove(rel)
|
|
|
+// relRealFrom.remove(rel)
|
|
|
+ iterator.remove()
|
|
|
continue
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ for (rel in relRealFrom) {
|
|
|
+
|
|
|
+ }
|
|
|
relList.add(relRealFrom)
|
|
|
} else {
|
|
|
relList.add(ArrayList<RelationEntity>())
|
|
@@ -894,18 +893,18 @@ class GraphyVM(
|
|
|
pack.entity = config
|
|
|
if (config.objTypeFrom.equals("equipment")) {
|
|
|
val equipmentFrom = repo.getEquipByCode(config.classCodeFrom!!)
|
|
|
- pack.fromName = equipmentFrom.name
|
|
|
+ pack.fromName = equipmentFrom?.name
|
|
|
} else {
|
|
|
val equipmentFrom = repo.getSysByCode(config.classCodeFrom!!)
|
|
|
- pack.fromName = equipmentFrom.name
|
|
|
+ pack.fromName = equipmentFrom?.name
|
|
|
|
|
|
}
|
|
|
if (config.objTypeTo.equals("equipment")) {
|
|
|
val equipmentTo = repo.getEquipByCode(config.classCodeTo!!)
|
|
|
- pack.toName = equipmentTo.name
|
|
|
+ pack.toName = equipmentTo?.name
|
|
|
} else {
|
|
|
val equipmentTo = repo.getSysByCode(config.classCodeTo!!)
|
|
|
- pack.toName = equipmentTo.name
|
|
|
+ pack.toName = equipmentTo?.name
|
|
|
}
|
|
|
configParent.add(pack)
|
|
|
}
|
|
@@ -916,13 +915,16 @@ class GraphyVM(
|
|
|
if (!CommonUtils.IsNull(relsTo)) {
|
|
|
var relRealTo = ArrayList<RelationEntity>()
|
|
|
relRealTo.addAll(relsTo)
|
|
|
- for (rel in relRealTo) {
|
|
|
+ val iterator = relRealTo.iterator()
|
|
|
+ while (iterator.hasNext()) {
|
|
|
+ val rel = iterator.next()
|
|
|
val objFrom = repo.getObject(rel.objFrom!!)
|
|
|
val objTo = repo.getObject(rel.objTo!!)
|
|
|
if (objFrom == null) {
|
|
|
rel.objFromLocalId = "该设备"
|
|
|
if (!entity.code.equals(config.classCodeFrom)) {
|
|
|
- relRealTo.remove(rel)
|
|
|
+// relRealTo.remove(rel)
|
|
|
+ iterator.remove()
|
|
|
continue
|
|
|
}
|
|
|
} else {
|
|
@@ -932,14 +934,16 @@ class GraphyVM(
|
|
|
rel.objFromLocalId = objFrom.localId
|
|
|
}
|
|
|
if (!objFrom.classCode.equals(config.classCodeFrom)) {
|
|
|
- relRealTo.remove(rel)
|
|
|
+// relRealTo.remove(rel)
|
|
|
+ iterator.remove()
|
|
|
continue
|
|
|
}
|
|
|
}
|
|
|
if (objTo == null) {
|
|
|
rel.objToLocalId = "该设备"
|
|
|
if (!entity.code.equals(config.classCodeTo)) {
|
|
|
- relRealTo.remove(rel)
|
|
|
+// relRealTo.remove(rel)
|
|
|
+ iterator.remove()
|
|
|
continue
|
|
|
}
|
|
|
} else {
|
|
@@ -949,11 +953,13 @@ class GraphyVM(
|
|
|
rel.objToLocalId = objTo.localId
|
|
|
}
|
|
|
if (!objTo.classCode.equals(config.classCodeTo)) {
|
|
|
- relRealTo.remove(rel)
|
|
|
+// relRealTo.remove(rel)
|
|
|
+ iterator.remove()
|
|
|
continue
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
relList.add(relRealTo)
|
|
|
} else {
|
|
|
relList.add(ArrayList<RelationEntity>())
|
|
@@ -962,18 +968,18 @@ class GraphyVM(
|
|
|
pack.entity = config
|
|
|
if (config.objTypeFrom.equals("equipment")) {
|
|
|
val equipmentFrom = repo.getEquipByCode(config.classCodeFrom!!)
|
|
|
- pack.fromName = equipmentFrom.name
|
|
|
+ pack.fromName = equipmentFrom?.name
|
|
|
} else {
|
|
|
val equipmentFrom = repo.getSysByCode(config.classCodeFrom!!)
|
|
|
- pack.fromName = equipmentFrom.name
|
|
|
+ pack.fromName = equipmentFrom?.name
|
|
|
|
|
|
}
|
|
|
if (config.objTypeTo.equals("equipment")) {
|
|
|
val equipmentTo = repo.getEquipByCode(config.classCodeTo!!)
|
|
|
- pack.toName = equipmentTo.name
|
|
|
+ pack.toName = equipmentTo?.name
|
|
|
} else {
|
|
|
val equipmentTo = repo.getSysByCode(config.classCodeTo!!)
|
|
|
- pack.toName = equipmentTo.name
|
|
|
+ pack.toName = equipmentTo?.name
|
|
|
}
|
|
|
configParent.add(pack)
|
|
|
|
|
@@ -996,13 +1002,16 @@ class GraphyVM(
|
|
|
if (!CommonUtils.IsNull(pipeFrom)) {
|
|
|
var pipeRealFrom = ArrayList<PipeEntity>()
|
|
|
pipeRealFrom.addAll(pipeFrom)
|
|
|
- for (rel in pipeRealFrom) {
|
|
|
+ val iterator = pipeRealFrom.iterator()
|
|
|
+ while (iterator.hasNext()) {
|
|
|
+ val rel = iterator.next()
|
|
|
val objFrom = repo.getObject(rel.objFrom!!)
|
|
|
val objTo = repo.getObject(rel.objTo!!)
|
|
|
if (objFrom == null) {
|
|
|
rel.objFromLocalId = "该设备"
|
|
|
if (!entity.code.equals(config.classCodeFrom)) {
|
|
|
- pipeRealFrom.remove(rel)
|
|
|
+// pipeRealFrom.remove(rel)
|
|
|
+ iterator.remove()
|
|
|
continue
|
|
|
}
|
|
|
} else {
|
|
@@ -1012,14 +1021,16 @@ class GraphyVM(
|
|
|
rel.objFromLocalId = objFrom.localId
|
|
|
}
|
|
|
if (!objFrom.classCode.equals(config.classCodeFrom)) {
|
|
|
- pipeRealFrom.remove(rel)
|
|
|
+// pipeRealFrom.remove(rel)
|
|
|
+ iterator.remove()
|
|
|
continue
|
|
|
}
|
|
|
}
|
|
|
if (objTo == null) {
|
|
|
rel.objToLocalId = "该设备"
|
|
|
if (!entity.code.equals(config.classCodeTo)) {
|
|
|
- pipeRealFrom.remove(rel)
|
|
|
+// pipeRealFrom.remove(rel)
|
|
|
+ iterator.remove()
|
|
|
continue
|
|
|
}
|
|
|
} else {
|
|
@@ -1029,7 +1040,8 @@ class GraphyVM(
|
|
|
rel.objToLocalId = objTo.localId
|
|
|
}
|
|
|
if (!objTo.classCode.equals(config.classCodeTo)) {
|
|
|
- pipeRealFrom.remove(rel)
|
|
|
+// pipeRealFrom.remove(rel)
|
|
|
+ iterator.remove()
|
|
|
continue
|
|
|
}
|
|
|
}
|
|
@@ -1041,9 +1053,9 @@ class GraphyVM(
|
|
|
val pack = PipeConfigEntityPackClass()
|
|
|
pack.entity = config
|
|
|
val equipmentFrom = repo.getEquipByCode(config.classCodeFrom!!)
|
|
|
- pack.fromName = equipmentFrom.name
|
|
|
+ pack.fromName = equipmentFrom?.name
|
|
|
val equipmentTo = repo.getEquipByCode(config.classCodeTo!!)
|
|
|
- pack.toName = equipmentTo.name
|
|
|
+ pack.toName = equipmentTo?.name
|
|
|
pipeParent.add(pack)
|
|
|
}
|
|
|
|
|
@@ -1053,13 +1065,16 @@ class GraphyVM(
|
|
|
if (!CommonUtils.IsNull(pipeFrom)) {
|
|
|
var pipeRealFrom = ArrayList<PipeEntity>()
|
|
|
pipeRealFrom.addAll(pipeFrom)
|
|
|
- for (rel in pipeRealFrom) {
|
|
|
+ val iterator = pipeRealFrom.iterator()
|
|
|
+ while (iterator.hasNext()) {
|
|
|
+ val rel = iterator.next()
|
|
|
val objFrom = repo.getObject(rel.objFrom!!)
|
|
|
val objTo = repo.getObject(rel.objTo!!)
|
|
|
if (objFrom == null) {
|
|
|
rel.objFromLocalId = "该设备"
|
|
|
if (!entity.code.equals(config.classCodeFrom)) {
|
|
|
- pipeRealFrom.remove(rel)
|
|
|
+// pipeRealFrom.remove(rel)
|
|
|
+ iterator.remove()
|
|
|
continue
|
|
|
}
|
|
|
} else {
|
|
@@ -1069,14 +1084,16 @@ class GraphyVM(
|
|
|
rel.objFromLocalId = objFrom.localId
|
|
|
}
|
|
|
if (!objFrom.classCode.equals(config.classCodeFrom)) {
|
|
|
- pipeRealFrom.remove(rel)
|
|
|
+// pipeRealFrom.remove(rel)
|
|
|
+ iterator.remove()
|
|
|
continue
|
|
|
}
|
|
|
}
|
|
|
if (objTo == null) {
|
|
|
rel.objToLocalId = "该设备"
|
|
|
if (!entity.code.equals(config.classCodeTo)) {
|
|
|
- pipeRealFrom.remove(rel)
|
|
|
+// pipeRealFrom.remove(rel)
|
|
|
+ iterator.remove()
|
|
|
continue
|
|
|
}
|
|
|
} else {
|
|
@@ -1086,11 +1103,13 @@ class GraphyVM(
|
|
|
rel.objToLocalId = objTo.localId
|
|
|
}
|
|
|
if (!objTo.classCode.equals(config.classCodeTo)) {
|
|
|
- pipeRealFrom.remove(rel)
|
|
|
+// pipeRealFrom.remove(rel)
|
|
|
+ iterator.remove()
|
|
|
continue
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
pipeChildren.add(pipeRealFrom)
|
|
|
} else {
|
|
|
pipeChildren.add(ArrayList<PipeEntity>())
|
|
@@ -1098,9 +1117,9 @@ class GraphyVM(
|
|
|
val pack = PipeConfigEntityPackClass()
|
|
|
pack.entity = config
|
|
|
val equipmentFrom = repo.getEquipByCode(config.classCodeFrom!!)
|
|
|
- pack.fromName = equipmentFrom.name
|
|
|
+ pack.fromName = equipmentFrom?.name
|
|
|
val equipmentTo = repo.getEquipByCode(config.classCodeTo!!)
|
|
|
- pack.toName = equipmentTo.name
|
|
|
+ pack.toName = equipmentTo?.name
|
|
|
pipeParent.add(pack)
|
|
|
}
|
|
|
val hashMap1 = HashMap<String, Any>()
|
|
@@ -1242,29 +1261,36 @@ class GraphyVM(
|
|
|
|
|
|
fun insProblemEquip(space: TunableSpaceItem, deviceId: String) {
|
|
|
viewModelScope.launch {
|
|
|
- val proEntity = repo.getEqProblem(deviceId)
|
|
|
- if (proEntity == null) {
|
|
|
- val entity = ProblemEquipEntity(
|
|
|
- id = UUID.randomUUID().toString(),
|
|
|
- floorId = floorId,
|
|
|
- projectId = projectId,
|
|
|
- buildingId = buildingId,
|
|
|
- equipId = deviceId,
|
|
|
- workId = null,
|
|
|
- problemType = null,
|
|
|
- problemState = 1,
|
|
|
- message = null,
|
|
|
- creator = null,
|
|
|
- creationTime = null,
|
|
|
- modifier = null,
|
|
|
- modifiedTime = null,
|
|
|
- uploadFlag = null,
|
|
|
- valid = 1, state = "1"
|
|
|
- )
|
|
|
- repo.insProblemEquipEntity(entity)
|
|
|
+ val equip = repo.getObject(deviceId)
|
|
|
+ if (TextUtils.isEmpty(equip?.id)) {
|
|
|
+ val proEntity = repo.getEqProblem(deviceId)
|
|
|
+ if (proEntity == null) {
|
|
|
+ val entity = ProblemEquipEntity(
|
|
|
+ id = UUID.randomUUID().toString(),
|
|
|
+ floorId = floorId,
|
|
|
+ projectId = projectId,
|
|
|
+ buildingId = buildingId,
|
|
|
+ equipId = deviceId,
|
|
|
+ workId = null,
|
|
|
+ problemType = null,
|
|
|
+ problemState = 1,
|
|
|
+ message = null,
|
|
|
+ creator = null,
|
|
|
+ creationTime = null,
|
|
|
+ modifier = null,
|
|
|
+ modifiedTime = null,
|
|
|
+ uploadFlag = null,
|
|
|
+ valid = 1, state = "1"
|
|
|
+ )
|
|
|
+ repo.insProblemEquipEntity(entity)
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ equip?.valid = 0
|
|
|
+ equip?.state = "1"
|
|
|
+ repo.insObject(equip!!)
|
|
|
}
|
|
|
+ getSpaceEq(space)
|
|
|
}
|
|
|
- getSpaceEq(space)
|
|
|
}
|
|
|
|
|
|
fun deleteRel(
|