From 24f890886d5a634f9f1ae2dd73652a05a4e2d2cf Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 08 六月 2022 10:46:36 +0800
Subject: [PATCH] 优化 同步iot 功能
---
service-job/src/main/java/com/java110/job/adapt/hcIot/owner/OwnerUnBindRoomToIotAdapt.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/OwnerUnBindRoomToIotAdapt.java b/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/OwnerUnBindRoomToIotAdapt.java
old mode 100644
new mode 100755
index 96adcee..aa821c0
--- a/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/OwnerUnBindRoomToIotAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/OwnerUnBindRoomToIotAdapt.java
@@ -79,21 +79,26 @@
@Override
public void execute(Business business, List<Business> businesses) {
JSONObject data = business.getData();
+ JSONArray businessMachines = new JSONArray();
if (data.containsKey(OwnerPo.class.getSimpleName())) {
Object bObj = data.get(OwnerPo.class.getSimpleName());
- JSONArray businessMachines = null;
+
if (bObj instanceof JSONObject) {
- businessMachines = new JSONArray();
+
businessMachines.add(bObj);
} else if (bObj instanceof List) {
businessMachines = JSONArray.parseArray(JSONObject.toJSONString(bObj));
} else {
businessMachines = (JSONArray) bObj;
}
- for (int bOwnerIndex = 0; bOwnerIndex < businessMachines.size(); bOwnerIndex++) {
- JSONObject businessOwner = businessMachines.getJSONObject(bOwnerIndex);
- doSendMachine(business, businessOwner);
+ }else {
+ if (data instanceof JSONObject) {
+ businessMachines.add(data);
}
+ }
+ for (int bOwnerIndex = 0; bOwnerIndex < businessMachines.size(); bOwnerIndex++) {
+ JSONObject businessOwner = businessMachines.getJSONObject(bOwnerIndex);
+ doSendMachine(business, businessOwner);
}
}
@@ -130,11 +135,11 @@
for (RoomDto tRoomDto : rooms) {
locationObjIds.add(tRoomDto.getUnitId());
locationObjIds.add(tRoomDto.getRoomId());
+ locationObjIds.add(tRoomDto.getFloorId());
}
machineDto.setLocationObjIds(locationObjIds.toArray(new String[locationObjIds.size()]));
List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
- Assert.listOnlyOne(machineDtos, "鏈壘鍒拌澶�");
for (MachineDto tmpMachineDto : machineDtos) {
if (!"9999".equals(tmpMachineDto.getMachineTypeCd())) {
continue;
--
Gitblit v1.8.0