房主相关

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseInfoFormDTO.java

@@ -22,5 +22,5 @@ public class IcHouseInfoFormDTO extends PageFormDTO {
     private String houseCode;
 
     private String customerId;
-
+    private String userId;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseInfoResultDTO.java

@@ -59,7 +59,16 @@ public class IcHouseInfoResultDTO implements Serializable {
      * 客户id
      */
     private String customerId;
+    private String isOwner = "0";
+    private String ownerIdCard;
+    /**
+     * 房屋编码
+     */
+    private String houseCode;
+    /**
+     * 二维码地址
+     */
+    private String houseQrcodeUrl;
 
-
-
+    private String coding;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -516,6 +516,7 @@ public class HouseController implements ResultDataResolver {
         //效验数据
         ValidatorUtils.validateEntity(formDTO);
         formDTO.setCustomerId(loginUser.getCustomerId());
+        formDTO.setUserId(loginUser.getUserId());
         return houseService.getHouseInfoByCode(formDTO);
 
     }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -1060,9 +1060,21 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查询到相关房屋","未查询到相关房屋");
         }
         HouseInfoCache cache = CustomerIcHouseRedis.getHouseInfo(formDTO.getCustomerId(), house.getId());
-        IcHouseInfoResultDTO resut = ConvertUtils.sourceToTarget(cache, IcHouseInfoResultDTO.class);
-        resut.setHouseId(cache.getHomeId());
-        return new Result<IcHouseInfoResultDTO>().ok(resut);
+        if (null == cache) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查询到相关房屋","未查询到相关房屋");
+        }
+        IcHouseInfoResultDTO result = ConvertUtils.sourceToTarget(cache, IcHouseInfoResultDTO.class);
+        result.setHouseId(cache.getHomeId());
+        result.setOwnerIdCard(house.getOwnerIdCard());
+        result.setCoding(house.getCoding());
+        ResiUserInfoCache userInfo = CustomerResiUserRedis.getUserBaseInfo(formDTO.getUserId());
+        if (null != userInfo) {
+            if (StringUtils.equals(house.getOwnerIdCard(), userInfo.getIdNum())) {
+                result.setIsOwner(NumConstant.ONE_STR);
+
+            }
+        }
+        return new Result<IcHouseInfoResultDTO>().ok(result);
     }