优化代码

java110-bean/src/main/java/com/java110/po/room/RoomAttrPo.java

@@ -17,7 +17,7 @@ public class RoomAttrPo implements Serializable {
     private String roomId;
     private String specCd;
     private String value;
-
+    private String statusCd;
     public String getbId() {
         return bId;
     }
@@ -57,4 +57,12 @@ public class RoomAttrPo implements Serializable {
     public void setValue(String value) {
         this.value = value;
     }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
 }

service-job/src/main/java/com/java110/job/adapt/hcGov/owner/AddOwnerToHcGovAdapt.java

@@ -36,6 +36,7 @@ import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.job.adapt.hcGov.HcGovConstant;
 import com.java110.job.adapt.hcGov.asyn.BaseHcGovSendAsyn;
 import com.java110.po.owner.OwnerPo;
+import com.java110.po.owner.OwnerRoomRelPo;
 import com.java110.po.room.RoomPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -76,20 +77,20 @@ public class AddOwnerToHcGovAdapt extends DatabusAdaptImpl {
     @Override
     public void execute(Business business, List<Business> businesses) {
         JSONObject data = business.getData();
-        if (data.containsKey(OwnerPo.class.getSimpleName())) {
-            Object bObj = data.get(OwnerPo.class.getSimpleName());
-            JSONArray businessOwner = null;
+        if (data.containsKey(OwnerRoomRelPo.class.getSimpleName())) {
+            Object bObj = data.get(OwnerRoomRelPo.class.getSimpleName());
+            JSONArray businessOwnerRoomRelPo = null;
             if (bObj instanceof JSONObject) {
-                businessOwner = new JSONArray();
-                businessOwner.add(bObj);
+                businessOwnerRoomRelPo = new JSONArray();
+                businessOwnerRoomRelPo.add(bObj);
             } else if (bObj instanceof List) {
-                businessOwner = JSONArray.parseArray(JSONObject.toJSONString(bObj));
+                businessOwnerRoomRelPo = JSONArray.parseArray(JSONObject.toJSONString(bObj));
             } else {
-                businessOwner = (JSONArray) bObj;
+                businessOwnerRoomRelPo = (JSONArray) bObj;
             }
             //JSONObject businessOwnerCar = data.getJSONObject("businessOwnerCar");
-            for (int bOwnerIndex = 0; bOwnerIndex < businessOwner.size(); bOwnerIndex++) {
-                JSONObject businessOwnerCar = businessOwner.getJSONObject(bOwnerIndex);
+            for (int bOwnerIndex = 0; bOwnerIndex < businessOwnerRoomRelPo.size(); bOwnerIndex++) {
+                JSONObject businessOwnerCar = businessOwnerRoomRelPo.getJSONObject(bOwnerIndex);
                 doAddOwner(business, businessOwnerCar);
 
             }
@@ -98,12 +99,12 @@ public class AddOwnerToHcGovAdapt extends DatabusAdaptImpl {
 
     private void doAddOwner(Business business, JSONObject businessOwner) {
 
-        OwnerPo ownerPo = BeanConvertUtil.covertBean(businessOwner, OwnerPo.class);
+        OwnerRoomRelPo ownerRoomRelPo = BeanConvertUtil.covertBean(businessOwner, OwnerRoomRelPo.class);
         OwnerDto ownerDto = new OwnerDto();
-        ownerDto.setMemberId(ownerPo.getMemberId());
+        ownerDto.setMemberId(ownerRoomRelPo.getOwnerId());
         List<OwnerDto> ownerDtoList = ownerInnerServiceSMOImpl.queryAllOwners(ownerDto);
         Assert.listNotNull(ownerDtoList, "未查询到业主信息信息");
-        ownerPo = BeanConvertUtil.covertBean(ownerDtoList.get(0), OwnerPo.class);
+        OwnerPo ownerPo = BeanConvertUtil.covertBean(ownerDtoList.get(0), OwnerPo.class);
 
         CommunityDto communityDto = new CommunityDto();
         communityDto.setCommunityId(ownerPo.getCommunityId());
@@ -125,19 +126,24 @@ public class AddOwnerToHcGovAdapt extends DatabusAdaptImpl {
         ownerRoomRelDto.setOwnerId(memberId);
         List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
         if (ownerRoomRelDtos != null && ownerRoomRelDtos.size() > 0) {
-
-            RoomAttrDto roomAttrDto = new RoomAttrDto();
-            roomAttrDto.setRoomId(ownerRoomRelDtos.get(0).getRoomId());
-            roomAttrDto.setSpecCd(HcGovConstant.EXT_COMMUNITY_ID);
-            List<RoomAttrDto> roomAttrDtos = roomAttrInnerServiceSMOImpl.queryRoomAttrs(roomAttrDto);
-            if (roomAttrDtos != null && roomAttrDtos.size() > 0) {
-                extRoomId = new JSONArray();
-                for (RoomAttrDto roomAttr : roomAttrDtos) {
-                    if (HcGovConstant.EXT_COMMUNITY_ID.equals(roomAttr.getSpecCd())) {
-                        extRoomId.add(roomAttr.getValue());
+            for (OwnerRoomRelDto ownerRoomRelD : ownerRoomRelDtos) {
+                RoomAttrDto roomAttrDto = new RoomAttrDto();
+                roomAttrDto.setRoomId(ownerRoomRelD.getRoomId());
+                roomAttrDto.setSpecCd(HcGovConstant.EXT_COMMUNITY_ID);
+                List<RoomAttrDto> roomAttrDtos = roomAttrInnerServiceSMOImpl.queryRoomAttrs(roomAttrDto);
+                if (roomAttrDtos == null || roomAttrDtos.size() < 1) {
+                    return;
+                }
+                if (roomAttrDtos != null && roomAttrDtos.size() > 0) {
+                    extRoomId = new JSONArray();
+                    for (RoomAttrDto roomAttr : roomAttrDtos) {
+                        if (HcGovConstant.EXT_COMMUNITY_ID.equals(roomAttr.getSpecCd())) {
+                            extRoomId.add(roomAttr.getValue());
+                        }
                     }
                 }
             }
+
         }
         JSONObject body = new JSONObject();
         //1001 业主本人 1002 家庭成员

service-job/src/main/java/com/java110/job/adapt/hcGov/room/AddRoomToHcGovAdapt.java

@@ -133,7 +133,9 @@ public class AddRoomToHcGovAdapt extends DatabusAdaptImpl {
         floorDto.setCommunityId( unitDtos.get( 0 ).getCommunityId() );
         floorDto.setFloorId( unitDtos.get( 0 ).getFloorId() );
         List<FloorDto> floorDtos = floorInnerServiceSMOImpl.queryFloors( floorDto );
-        Assert.listNotNull(floorDtos, "未通过单元所属ID查到楼栋数据，请检查数据");
+        if(floorDtos == null || floorDtos.size() < 1){
+            return;
+        }
 
         FloorDto tmpFloorDto = floorDtos.get(0);
         for (FloorAttrDto floorAttrDto : tmpFloorDto.getFloorAttrDto()) {

service-job/src/main/java/com/java110/job/adapt/hcGov/room/AddRoomToHcGovReturnAdapt.java

@@ -69,6 +69,7 @@ public class AddRoomToHcGovReturnAdapt implements IReportReturnDataAdapt {
         roomAttrPo.setRoomId(roomAttrDto.getRoomId());
         roomAttrPo.setSpecCd(roomAttrDto.getSpecCd());
         roomAttrPo.setValue(reportDataDto.getReportDataBodyDto().getString("extRoomId"));
+        roomAttrPo.setStatusCd("0");
         if (roomAttrDtos == null || roomAttrDtos.size() < 1) {
             int flag = roomAttrInnerServiceSMOImpl.saveRoomAttr(roomAttrPo);
             if (flag < 1) {

service-job/src/main/java/com/java110/job/adapt/hcGov/room/EditRoomToHcGovAdapt.java

@@ -133,7 +133,9 @@ public class EditRoomToHcGovAdapt extends DatabusAdaptImpl {
         floorDto.setCommunityId( unitDtos.get( 0 ).getCommunityId() );
         floorDto.setFloorId( unitDtos.get( 0 ).getFloorId() );
         List<FloorDto> floorDtos = floorInnerServiceSMOImpl.queryFloors( floorDto );
-        Assert.listNotNull(floorDtos, "未通过单元所属ID查到楼栋数据，请检查数据");
+        if(floorDtos == null || floorDtos.size() < 1){
+            return;
+        }
 
 
         FloorDto tmpFloorDto = floorDtos.get(0);
@@ -148,7 +150,9 @@ public class EditRoomToHcGovAdapt extends DatabusAdaptImpl {
         roomAttrDto.setRoomId(roomPo.getRoomId());
         roomAttrDto.setSpecCd( HcGovConstant.EXT_COMMUNITY_ID );
         List<RoomAttrDto> roomAttrDtos = roomAttrInnerServiceSMOImpl.queryRoomAttrs(roomAttrDto);
-        Assert.listNotNull(roomAttrDtos, "未包含房屋外部编码属性");
+        if(roomAttrDtos == null || roomAttrDtos.size() < 1){
+            return;
+        }
         for (RoomAttrDto roomAttr : roomAttrDtos) {
             if (HcGovConstant.EXT_COMMUNITY_ID.equals(roomAttr.getSpecCd())) {
                 extRoomId = roomAttr.getValue();