优化 楼栋同步

service-job/src/main/java/com/java110/job/adapt/hcIot/machine/AddMachineToIotAdapt.java

@@ -207,6 +207,17 @@ public class AddMachineToIotAdapt extends DatabusAdaptImpl {
         } else if ("3000".equals(communityLocationDto.getLocationType())) {// 3000 房屋门
             ownerDto.setRoomId(machinePo.getLocationObjId());
             owners = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
+        }else if ("6000".equals(communityLocationDto.getLocationType())) {// 3000 房屋门
+            //先根据单元门ID 查询 房屋
+            RoomDto roomDto = new RoomDto();
+            roomDto.setFloorId(machinePo.getLocationObjId());
+            roomDto.setCommunityId(machinePo.getCommunityId());
+            List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+            if (roomDtos == null || roomDtos.size() == 0) { // 楼栋下没有房屋
+                return ownerDtos;
+            }
+            ownerDto.setRoomIds(getRoomIds(roomDtos));
+            owners = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
         }
         if (owners == null) {
             return ownerDtos;

service-job/src/main/java/com/java110/job/adapt/hcIot/owner/AddOwnerToIotAdapt.java

@@ -144,6 +144,7 @@ public class AddOwnerToIotAdapt extends DatabusAdaptImpl {
         for (RoomDto tRoomDto : rooms) {
             locationObjIds.add(tRoomDto.getUnitId());
             locationObjIds.add(tRoomDto.getRoomId());
+            locationObjIds.add(tRoomDto.getFloorId());
         }
 
         machineDto.setLocationObjIds(locationObjIds.toArray(new String[locationObjIds.size()]));

service-job/src/main/java/com/java110/job/adapt/hcIot/owner/EditOwnerToIotAdapt.java

@@ -144,6 +144,7 @@ public class EditOwnerToIotAdapt extends DatabusAdaptImpl {
         for (RoomDto tRoomDto : rooms) {
             locationObjIds.add(tRoomDto.getUnitId());
             locationObjIds.add(tRoomDto.getRoomId());
+            locationObjIds.add(tRoomDto.getFloorId());
         }
 
         machineDto.setLocationObjIds(locationObjIds.toArray(new String[locationObjIds.size()]));

service-job/src/main/java/com/java110/job/adapt/hcIot/owner/OwnerBindRoomToIotAdapt.java

@@ -151,6 +151,7 @@ public class OwnerBindRoomToIotAdapt extends DatabusAdaptImpl {
         for (RoomDto tRoomDto : rooms) {
             locationObjIds.add(tRoomDto.getUnitId());
             locationObjIds.add(tRoomDto.getRoomId());
+            locationObjIds.add(tRoomDto.getFloorId());
         }
 
         machineDto.setLocationObjIds(locationObjIds.toArray(new String[locationObjIds.size()]));

service-job/src/main/java/com/java110/job/adapt/hcIot/owner/OwnerUnBindRoomToIotAdapt.java

@@ -130,6 +130,7 @@ public class OwnerUnBindRoomToIotAdapt extends DatabusAdaptImpl {
         for (RoomDto tRoomDto : rooms) {
             locationObjIds.add(tRoomDto.getUnitId());
             locationObjIds.add(tRoomDto.getRoomId());
+            locationObjIds.add(tRoomDto.getFloorId());
         }
 
         machineDto.setLocationObjIds(locationObjIds.toArray(new String[locationObjIds.size()]));