上传业主信息

java110-interface/src/main/java/com/java110/intf/user/IOwnerAttrInnerServiceSMO.java

@@ -48,4 +48,12 @@ public interface IOwnerAttrInnerServiceSMO {
      */
     @RequestMapping(value = "/saveOwnerAttr", method = RequestMethod.POST)
     int saveOwnerAttr(@RequestBody OwnerAttrPo ownerAttrPo);
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param ownerAttrPo 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/updateOwnerAttrInfoInstance", method = RequestMethod.POST)
+    int updateOwnerAttrInfoInstance(@RequestBody OwnerAttrPo ownerAttrPo);
 }

service-job/src/main/java/com/java110/job/adapt/hcGov/floor/EditFloorToHcGovAdapt.java

@@ -20,8 +20,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.UnitDto;
 import com.java110.dto.community.CommunityAttrDto;
 import com.java110.dto.community.CommunityDto;
+import com.java110.dto.floorAttr.FloorAttrDto;
 import com.java110.entity.order.Business;
 import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.community.IFloorAttrInnerServiceSMO;
 import com.java110.intf.community.IUnitInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.job.adapt.hcGov.HcGovConstant;
@@ -53,6 +55,8 @@ public class EditFloorToHcGovAdapt extends DatabusAdaptImpl {
     @Autowired
     private BaseHcGovSendAsyn baseHcGovSendAsynImpl;
 
+    @Autowired
+    private IFloorAttrInnerServiceSMO floorAttrInnerServiceSMOImpl;
 
     /**
      * @param business   当前处理业务
@@ -92,6 +96,7 @@ public class EditFloorToHcGovAdapt extends DatabusAdaptImpl {
         String extCommunityId = "";
         String communityId = tmpCommunityDto.getCommunityId();
         String floorId = floorPo.getFloorId();
+        String extFloorId = "";
 
         for (CommunityAttrDto communityAttrDto : tmpCommunityDto.getCommunityAttrDtos()) {
             if (HcGovConstant.EXT_COMMUNITY_ID.equals(communityAttrDto.getSpecCd())) {
@@ -108,10 +113,21 @@ public class EditFloorToHcGovAdapt extends DatabusAdaptImpl {
             layerCount = unitDtos.get(0).getLayerCount();
             floorUse = unitDtos.size() + "";
         }
-
+        FloorAttrDto floorAttrDto = new FloorAttrDto();
+        floorAttrDto.setFloorId(floorPo.getFloorId());
+        floorAttrDto.setCommunityId(floorPo.getCommunityId());
+        floorAttrDto.setSpecCd( HcGovConstant.EXT_COMMUNITY_ID);
+        List<FloorAttrDto> floorAttrDtos = floorAttrInnerServiceSMOImpl.queryFloorAttrs(floorAttrDto);
+        Assert.listNotNull(floorAttrDtos, "未包含楼栋外部编码属性");
+        for (FloorAttrDto floorAttr : floorAttrDtos) {
+            if (HcGovConstant.EXT_COMMUNITY_ID.equals(floorAttr.getSpecCd())) {
+                extFloorId = floorAttr.getValue();
+            }
+        }
 
         JSONObject body = new JSONObject();
         body.put("floorNum", floorPo.getFloorNum());
+        body.put("extFloorId", extFloorId);
         body.put("floorName", floorPo.getName());
         body.put("floorType", MappingCache.getValue(HcGovConstant.GOV_DOMAIN, HcGovConstant.FLOOR_TYPE));
         body.put("floorArea", floorPo.getFloorArea());

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

@@ -24,9 +24,13 @@ import com.java110.dto.UnitDto;
 import com.java110.dto.community.CommunityAttrDto;
 import com.java110.dto.community.CommunityDto;
 import com.java110.dto.floorAttr.FloorAttrDto;
+import com.java110.dto.owner.OwnerAttrDto;
+import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.owner.OwnerRoomRelDto;
 import com.java110.entity.order.Business;
 import com.java110.intf.community.*;
+import com.java110.intf.user.IOwnerAttrInnerServiceSMO;
+import com.java110.intf.user.IOwnerInnerServiceSMO;
 import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.job.adapt.hcGov.HcGovConstant;
@@ -35,6 +39,7 @@ import com.java110.po.owner.OwnerPo;
 import com.java110.po.room.RoomPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -58,6 +63,10 @@ public class AddOwnerToHcGovAdapt extends DatabusAdaptImpl {
     private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
     @Autowired
     private BaseHcGovSendAsyn baseHcGovSendAsynImpl;
+    @Autowired
+    private IOwnerAttrInnerServiceSMO ownerAttrInnerServiceSMOImpl;
+    @Autowired
+    private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
 
 
     /**
@@ -100,7 +109,7 @@ public class AddOwnerToHcGovAdapt extends DatabusAdaptImpl {
         String extCommunityId = "";
         JSONArray extRoomId = null;
         String communityId = tmpCommunityDto.getCommunityId();
-        String ownerId = ownerPo.getOwnerId();
+        String memberId = ownerPo.getMemberId();
 
         for (CommunityAttrDto communityAttrDto : tmpCommunityDto.getCommunityAttrDtos()) {
             if (HcGovConstant.EXT_COMMUNITY_ID.equals(communityAttrDto.getSpecCd())) {
@@ -108,7 +117,7 @@ public class AddOwnerToHcGovAdapt extends DatabusAdaptImpl {
             }
         }
         OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
-        ownerRoomRelDto.setOwnerId(ownerId);
+        ownerRoomRelDto.setOwnerId(memberId);
         List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
         if (ownerRoomRelDtos != null && ownerRoomRelDtos.size() > 0) {
 
@@ -125,20 +134,80 @@ public class AddOwnerToHcGovAdapt extends DatabusAdaptImpl {
                 }
             }
         }
-
-
         JSONObject body = new JSONObject();
-        body.put("idType", "1");
-        body.put("idCard", ownerPo.getIdCard());
-        body.put("personName", ownerPo.getName());
-        body.put("personTel", ownerPo.getLink());
-        body.put("personSex", ownerPo.getSex());
-        body.put("prePersonName", ownerPo.getName());
-        body.put("birthday", ownerPo.getIdCard());
+        //1001 业主本人 1002 家庭成员
+        if ("1001".equals(ownerPo.getOwnerTypeCd())) {
+            body.put("idType", "1");
+            body.put("idCard", ownerPo.getIdCard());
+            body.put("personName", ownerPo.getName());
+            body.put("personTel", ownerPo.getLink());
+            body.put("personSex", ownerPo.getSex());
+            body.put("prePersonName", ownerPo.getName());
+            body.put("birthday", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B));
+            body.put("nation", "未知");
+            body.put("nativePlace", "中国");
+            body.put("politicalOutlook", "无");
+            body.put("maritalStatus", "N");
+            body.put("religiousBelief", "无");
+            body.put("ramark", ownerPo.getRemark());
+            body.put("extRoomId", extRoomId);
+            body.put("ownerType", "2002");
+            body.put("ownerAddress", "无");
+            body.put("ownerTypeCd", ownerPo.getOwnerTypeCd());
+        }
+        if ("1002".equals(ownerPo.getOwnerTypeCd())) {
+            String extOwnerId = "";
+            OwnerAttrDto ownerAttrDto = new OwnerAttrDto();
+            ownerAttrDto.setMemberId(ownerPo.getOwnerId());
+            ownerAttrDto.setSpecCd(HcGovConstant.EXT_COMMUNITY_ID);
+            List<OwnerAttrDto> ownerAttr = ownerAttrInnerServiceSMOImpl.queryOwnerAttrs(ownerAttrDto);
+            if (ownerAttr != null && ownerAttr.size() > 0) {
+                for (OwnerAttrDto roomAttr : ownerAttr) {
+                    if (HcGovConstant.EXT_COMMUNITY_ID.equals(roomAttr.getSpecCd())) {
+                        extOwnerId = roomAttr.getValue();
+                    }
+                }
+            }
+            if ("".equals(extOwnerId)) {
+                throw new IllegalArgumentException("未获得业主外部编码！");
+            }
 
+           /* String extMemberId = "";
+            ownerAttrDto = new OwnerAttrDto();
+            ownerAttrDto.setMemberId(ownerPo.getMemberId());
+            ownerAttrDto.setSpecCd(HcGovConstant.EXT_COMMUNITY_ID);
+            ownerAttr = ownerAttrInnerServiceSMOImpl.queryOwnerAttrs(ownerAttrDto);
+            if (ownerAttr != null && ownerAttr.size() > 0) {
+                for (OwnerAttrDto roomAttr : ownerAttr) {
+                    if (HcGovConstant.EXT_COMMUNITY_ID.equals(roomAttr.getSpecCd())) {
+                        extMemberId = roomAttr.getValue();
+                    }
+                }
+            }
+            if ("".equals(extOwnerId)) {
+                throw new IllegalArgumentException("未获得业主外部编码！");
+            }*/
+
+            body.put("idType", "1");
+            body.put("idCard", ownerPo.getIdCard());
+            body.put("personName", ownerPo.getName());
+            body.put("personTel", ownerPo.getLink());
+            body.put("personSex", ownerPo.getSex());
+            body.put("prePersonName", ownerPo.getName());
+            body.put("birthday", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B));
+            body.put("nation", "未知");
+            body.put("nativePlace", "中国");
+            body.put("politicalOutlook", "无");
+            body.put("maritalStatus", "N");
+            body.put("religiousBelief", "无");
+            body.put("ramark", ownerPo.getRemark());
+            body.put("ownerType", "2002");
+            body.put("ownerAddress", "无");
+            body.put("extOwnerId", extOwnerId);
+        }
 
         JSONObject kafkaData = baseHcGovSendAsynImpl.createHeadersOrBody(body, extCommunityId, HcGovConstant.ADD_OWNER_ACTION, HcGovConstant.COMMUNITY_SECURE);
-        baseHcGovSendAsynImpl.sendKafka(HcGovConstant.GOV_TOPIC, kafkaData, communityId, ownerId, HcGovConstant.COMMUNITY_SECURE);
+        baseHcGovSendAsynImpl.sendKafka(HcGovConstant.GOV_TOPIC, kafkaData, communityId, memberId, HcGovConstant.COMMUNITY_SECURE);
     }
 
 }

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

@@ -0,0 +1,87 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.job.adapt.hcGov.owner;
+
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.RoomAttrDto;
+import com.java110.dto.hcGovTranslate.HcGovTranslateDto;
+import com.java110.dto.owner.OwnerAttrDto;
+import com.java110.dto.reportData.ReportDataDto;
+import com.java110.intf.common.IHcGovTranslateInnerServiceSMO;
+import com.java110.intf.community.IRoomAttrInnerServiceSMO;
+import com.java110.intf.user.IOwnerAttrInnerServiceSMO;
+import com.java110.job.adapt.hcGov.HcGovConstant;
+import com.java110.job.adapt.hcGov.IReportReturnDataAdapt;
+import com.java110.po.owner.OwnerAttrPo;
+import com.java110.po.room.RoomAttrPo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 新增房屋同步HC政务接口 返回
+ * <p>
+ * 接口协议地址： https://gitee.com/java110/microCommunityInformation/tree/master/info-doc#1%E6%A5%BC%E6%A0%8B%E4%B8%8A%E4%BC%A0
+ *
+ * @desc add by 吴学文 16:20
+ */
+@Component(value = "ADD_OWNER_RETURN")
+public class AddOwnerToHcGovReturnAdapt implements IReportReturnDataAdapt {
+
+    @Autowired
+    private IOwnerAttrInnerServiceSMO ownerAttrInnerServiceSMOImpl;
+    @Autowired
+    private IHcGovTranslateInnerServiceSMO hcGovTranslateInnerServiceSMOImpl;
+
+    @Override
+    public void reportReturn(ReportDataDto reportDataDto, String extCommunityId) {
+
+        HcGovTranslateDto hcGovTranslateDto = new HcGovTranslateDto();
+        hcGovTranslateDto.setTranId(reportDataDto.getReportDataHeaderDto().getTranId());
+        hcGovTranslateDto.setServiceCode(reportDataDto.getReportDataHeaderDto().getServiceCode());
+        List<HcGovTranslateDto> hcGovTranslateDtos = hcGovTranslateInnerServiceSMOImpl.queryHcGovTranslates(hcGovTranslateDto);
+        if (hcGovTranslateDtos == null || hcGovTranslateDtos.size() < 1) {
+            throw new IllegalArgumentException("查询推送报文失败。不是同一订单信息");
+        }
+        OwnerAttrDto ownerAttrDto = new OwnerAttrDto();
+        ownerAttrDto.setMemberId(hcGovTranslateDtos.get(0).getObjId());
+        ownerAttrDto.setSpecCd( HcGovConstant.EXT_COMMUNITY_ID );
+        List<OwnerAttrDto>  ownerAttr = ownerAttrInnerServiceSMOImpl.queryOwnerAttrs(ownerAttrDto);
+
+        OwnerAttrPo ownerAttrPo = new OwnerAttrPo();
+        ownerAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId));
+        ownerAttrPo.setMemberId(ownerAttrDto.getMemberId());
+        ownerAttrPo.setSpecCd(ownerAttrDto.getSpecCd());
+        ownerAttrPo.setValue(reportDataDto.getReportDataBodyDto().getString("extOwnerId"));
+
+        if (ownerAttr == null || ownerAttr.size() < 1) {
+            int flag = ownerAttrInnerServiceSMOImpl.saveOwnerAttr(ownerAttrPo);
+            if (flag < 1) {
+                throw new IllegalArgumentException("保存业主属性失败");
+            }
+        } else {
+            ownerAttrPo.setAttrId(ownerAttr.get(0).getAttrId());
+            int flag = ownerAttrInnerServiceSMOImpl.updateOwnerAttrInfoInstance(ownerAttrPo);
+            if (flag < 1) {
+                throw new IllegalArgumentException("修改业主属性失败");
+            }
+
+        }
+
+
+    }
+}

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

@@ -18,16 +18,14 @@ package com.java110.job.adapt.hcGov.room;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.FloorDto;
+import com.java110.dto.RoomAttrDto;
 import com.java110.dto.RoomDto;
 import com.java110.dto.UnitDto;
 import com.java110.dto.community.CommunityAttrDto;
 import com.java110.dto.community.CommunityDto;
 import com.java110.dto.floorAttr.FloorAttrDto;
 import com.java110.entity.order.Business;
-import com.java110.intf.community.ICommunityInnerServiceSMO;
-import com.java110.intf.community.IFloorInnerServiceSMO;
-import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.community.IUnitInnerServiceSMO;
+import com.java110.intf.community.*;
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.job.adapt.hcGov.HcGovConstant;
 import com.java110.job.adapt.hcGov.asyn.BaseHcGovSendAsyn;
@@ -61,7 +59,8 @@ public class EditRoomToHcGovAdapt extends DatabusAdaptImpl {
     private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
     @Autowired
     private BaseHcGovSendAsyn baseHcGovSendAsynImpl;
-
+    @Autowired
+    private IRoomAttrInnerServiceSMO roomAttrInnerServiceSMOImpl;
 
     /**
      * @param business   当前处理业务
@@ -120,6 +119,7 @@ public class EditRoomToHcGovAdapt extends DatabusAdaptImpl {
         CommunityDto tmpCommunityDto = communityDtos.get(0);
         String extCommunityId = "";
         String extFloorId = "";
+        String extRoomId = "";
         String communityId = tmpCommunityDto.getCommunityId();
         String roomId = roomPo.getRoomId();
 
@@ -140,8 +140,20 @@ public class EditRoomToHcGovAdapt extends DatabusAdaptImpl {
                 extFloorId = floorAttrDto.getValue();
             }
         }
+
+        RoomAttrDto roomAttrDto = new RoomAttrDto();
+        roomAttrDto.setRoomId(roomPo.getRoomId());
+        roomAttrDto.setSpecCd( HcGovConstant.EXT_COMMUNITY_ID );
+        List<RoomAttrDto> roomAttrDtos = roomAttrInnerServiceSMOImpl.queryRoomAttrs(roomAttrDto);
+        Assert.listNotNull(roomAttrDtos, "未包含房屋外部编码属性");
+        for (RoomAttrDto roomAttr : roomAttrDtos) {
+            if (HcGovConstant.EXT_COMMUNITY_ID.equals(roomAttr.getSpecCd())) {
+                extRoomId = roomAttr.getValue();
+            }
+        }
         JSONObject body = new JSONObject();
         body.put("roomNum", roomPo.getRoomNum());
+        body.put("extRoomId", extRoomId);
         body.put("builtUpArea", roomPo.getBuiltUpArea());
         body.put("layer", roomPo.getLayer());
         body.put("roomArea", roomPo.getRoomArea());

service-user/src/main/java/com/java110/user/dao/IOwnerAttrServiceDao.java

@@ -67,7 +67,7 @@ public interface IOwnerAttrServiceDao {
      * @param info 修改信息
      * @throws DAOException DAO异常
      */
-    void updateOwnerAttrInfoInstance(Map info) throws DAOException;
+    int updateOwnerAttrInfoInstance(Map info) throws DAOException;
 
 
     /**

service-user/src/main/java/com/java110/user/dao/impl/OwnerAttrServiceDaoImpl.java

@@ -102,7 +102,7 @@ public class OwnerAttrServiceDaoImpl extends BaseServiceDao implements IOwnerAtt
      * @throws DAOException DAO异常
      */
     @Override
-    public void updateOwnerAttrInfoInstance(Map info) throws DAOException {
+    public int updateOwnerAttrInfoInstance(Map info) throws DAOException {
         logger.debug("修改业主属性信息Instance 入参 info : {}", info);
 
         int saveFlag = sqlSessionTemplate.update("ownerAttrServiceDaoImpl.updateOwnerAttrInfoInstance", info);
@@ -110,6 +110,7 @@ public class OwnerAttrServiceDaoImpl extends BaseServiceDao implements IOwnerAtt
         if (saveFlag < 1) {
             throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "修改业主属性信息Instance数据失败：" + JSONObject.toJSONString(info));
         }
+        return saveFlag;
     }
 
     /**

service-user/src/main/java/com/java110/user/smo/impl/OwnerAttrInnerServiceSMOImpl.java

@@ -103,6 +103,10 @@ public class OwnerAttrInnerServiceSMOImpl extends BaseServiceSMO implements IOwn
     public int saveOwnerAttr(@RequestBody OwnerAttrPo ownerAttrPo) {
         return ownerAttrServiceDaoImpl.saveOwnerAttr(BeanConvertUtil.beanCovertMap(ownerAttrPo));
     }
+    @Override
+    public int updateOwnerAttrInfoInstance(@RequestBody OwnerAttrPo ownerAttrPo) {
+        return ownerAttrServiceDaoImpl.updateOwnerAttrInfoInstance(BeanConvertUtil.beanCovertMap(ownerAttrPo));
+    }
 
     public IOwnerAttrServiceDao getOwnerAttrServiceDaoImpl() {
         return ownerAttrServiceDaoImpl;