|
@@ -53,7 +53,8 @@ class DataCenterEquipment {
|
|
|
var synchronousMessageObjService = SObjectService(SMybatisDao(SynchronousMessage::class.java))
|
|
|
/** 项目所属的集团 */
|
|
|
private val dictProjectService = SObjectService(SMybatisDao(DictProject::class.java))
|
|
|
-
|
|
|
+ /** 设备服务*/
|
|
|
+ private val equipmentService = SObjectService(SMybatisDao(Equipment::class.java))
|
|
|
/**
|
|
|
* 处理 数据中心到 - 数据中台的floor
|
|
|
*/
|
|
@@ -83,7 +84,7 @@ class DataCenterEquipment {
|
|
|
val toJsonObjArray2 =
|
|
|
Configure.toJsonObjArray("MechInArch", "Eq2Fl", equip.id!!, equip.floorId!!)
|
|
|
if (!toJsonObjArray2.isNullOrEmpty()) {
|
|
|
- toJsonObjArray.plus(toJsonObjArray2[0])
|
|
|
+ toJsonObjArray.add(toJsonObjArray2[0])
|
|
|
}
|
|
|
val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
|
|
|
if (!createRel){
|
|
@@ -167,4 +168,68 @@ class DataCenterEquipment {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 所有的设备修改
|
|
|
+ *
|
|
|
+ * @param message 消息实体类
|
|
|
+ */
|
|
|
+ fun equipAllUpDate(message: SynchronousMessage){
|
|
|
+ val dictProject = dictProjectService.select(SFilter.eq("id", message.projectId!!)).entity()
|
|
|
+ message.sign = 0
|
|
|
+ if (dictProject!=null){
|
|
|
+ val equipmentList = equipmentService.select(
|
|
|
+ SFilter.eq("projectId", message.projectId!!),
|
|
|
+ SFilter.eq("floorId", message.objId!!)
|
|
|
+ ).exec()
|
|
|
+ if (!equipmentList.isNullOrEmpty()){
|
|
|
+ for (equipment in equipmentList) {
|
|
|
+ try {
|
|
|
+ val equipList = EquipUtil.equipTools(message.projectId!!, equipment)
|
|
|
+ val sign = EquipApi.updateObj(dictProject!!.groupCode!!,message.projectId!!, equipList)
|
|
|
+ if (!equipment.buildingId.isNullOrEmpty()&&!equipment.floorId.isNullOrEmpty()){
|
|
|
+ try {
|
|
|
+ val toJsonObjArray =
|
|
|
+ Configure.toJsonObjArray("MechInArch", "Eq2Bd", equipment.id!!, equipment.buildingId!!)
|
|
|
+ val toJsonObjArray2 =
|
|
|
+ Configure.toJsonObjArray("MechInArch", "Eq2Fl", equipment.id!!, equipment.floorId!!)
|
|
|
+ if (!toJsonObjArray2.isNullOrEmpty()) {
|
|
|
+ toJsonObjArray.add(toJsonObjArray2[0])
|
|
|
+ }
|
|
|
+ val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
|
|
|
+ if (!createRel){
|
|
|
+ message.sign = 2
|
|
|
+ message.count = message.count+1
|
|
|
+ }
|
|
|
+ } catch (e: Exception) {
|
|
|
+ e.printStackTrace()
|
|
|
+ message.sign = 2
|
|
|
+ message.count = message.count+1
|
|
|
+ }
|
|
|
+ }else if (!equipment.buildingId.isNullOrEmpty()) {
|
|
|
+ val toJsonObjArray =
|
|
|
+ Configure.toJsonObjArray("MechInArch", "Eq2Bd", equipment.id!!, equipment.buildingId!!)
|
|
|
+ val createRel = EquipApi.createRel(dictProject.groupCode!!, message.projectId!!, toJsonObjArray)
|
|
|
+ if (!createRel){
|
|
|
+ message.sign = 2
|
|
|
+ message.count = message.count+1
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } catch (e: Exception) {
|
|
|
+ e.printStackTrace()
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ /** 失败 */
|
|
|
+ message.sign = 2
|
|
|
+ message.count = message.count+1
|
|
|
+ }
|
|
|
+
|
|
|
+ /** 更改标记 */
|
|
|
+ synchronousMessageObjService.update(message, arrayListOf("sign","count"))
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|