根据房屋编码获取房屋信息

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

@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+* @describe: 根据房屋编码获取房屋信息
+* @author wangtong
+* @date 2022/6/1 18:17
+* @params
+* @return
+*/
+@Data
+public class IcHouseInfoFormDTO extends PageFormDTO {
+
+    private static final long serialVersionUID = -1L;
+
+
+    @NotNull(message = "房屋编码不可为空")
+    private String houseCode;
+
+    private String customerId;
+
+}

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

@@ -0,0 +1,55 @@
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * desc:房屋列表结果类
+ *
+ * @author liujianjun
+ */
+@Data
+public class IcHouseInfoResultDTO implements Serializable {
+
+
+    private static final long serialVersionUID = 4963952996288796744L;
+
+    /**
+     * 所属网格
+     */
+    private String gridName;
+    private String gridId;
+
+    /**
+     * 所属小区
+     */
+    private String neighborHoodId;
+    private String neighborHoodName;
+
+    /**
+     * 所属楼栋
+     */
+    private String buildingId;
+    private String buildingName;
+
+    /**
+     * 所属单元id
+     */
+    private String buildingUnitId;
+    private String unitName;
+
+    /**
+     * 房间名称
+     */
+    private String houseName;
+
+    /**
+     * 门牌号
+     */
+    private String doorName;
+
+
+
+}

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

@@ -484,4 +484,20 @@ public class HouseController implements ResultDataResolver {
         ValidatorUtils.validateEntity(formDTO);
         houseService.downloadZip(response,formDTO);
     }
+
+    /**
+    * @describe: 根据房屋编码获取信息
+    * @author wangtong
+    * @date 2022/6/1 18:24
+    * @params [formDTO]
+    * @return com.epmet.dto.result.IcHouseInfoResultDTO
+    */
+    @PostMapping("getHouseInfoByCode")
+    public Result<IcHouseInfoResultDTO> getHouseInfoByCode(@LoginUser TokenDto loginUser,@RequestBody IcHouseInfoFormDTO formDTO) {
+        //效验数据
+        ValidatorUtils.validateEntity(formDTO);
+        formDTO.setCustomerId(loginUser.getCustomerId());
+        return houseService.getHouseInfoByCode(formDTO);
+
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java

@@ -110,4 +110,13 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
     * @return com.epmet.dto.result.IcHouseListResultDTO
     */
     IcHouseListResultDTO selectHouseQrcodeById(@Param("id") String id);
+
+    /**
+    * @describe: 通过房屋编码获取信息
+    * @author wangtong
+    * @date 2022/6/1 18:29
+    * @params [houseCode]
+    * @return com.epmet.entity.IcHouseEntity
+    */
+    IcHouseEntity selectByHouseCode(@Param("houseCode") String houseCode);
 }

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

@@ -145,4 +145,13 @@ public interface HouseService {
     * @return java.lang.String
     */
     String createHouseQrcodeUrl(String houseId);
+
+    /**
+    * @describe: 根据房屋编码获取信息
+    * @author wangtong
+    * @date 2022/6/1 18:24
+    * @params [formDTO]
+    * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.IcHouseInfoResultDTO>
+    */
+    Result<IcHouseInfoResultDTO> getHouseInfoByCode(IcHouseInfoFormDTO formDTO);
 }

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

@@ -16,9 +16,11 @@ import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
+import com.epmet.commons.tools.redis.common.bean.HouseInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.BarcodeUtils;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -912,6 +914,14 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         }
     }
 
+    @Override
+    public Result<IcHouseInfoResultDTO> getHouseInfoByCode(IcHouseInfoFormDTO formDTO) {
+        IcHouseEntity house = icHouseDao.selectByHouseCode(formDTO.getHouseCode());
+        HouseInfoCache cache = CustomerIcHouseRedis.getHouseInfo(formDTO.getCustomerId(),house.getId());
+        IcHouseInfoResultDTO resut = ConvertUtils.sourceToTarget(cache, IcHouseInfoResultDTO.class);
+        return new Result<IcHouseInfoResultDTO>().ok(resut);
+    }
+
 
     /**
      * @return java.lang.String

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@@ -394,5 +394,10 @@
         where a.id=#{id}
               and a.del_flag = '0'
     </select>
+    <select id="selectByHouseCode" resultType="com.epmet.entity.IcHouseEntity">
+        select * from ic_house
+        where HOUSE_CODE=#{houseCode}
+              and del_flag = '0'
+    </select>
 
 </mapper>