diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index cc90ddbc2f..9818f7f832 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -460,6 +460,12 @@ public interface GovOrgOpenFeignClient { @PostMapping("/gov/org/grid/getbaseinfo") Result getGridBaseInfoByGridId(CustomerGridFormDTO customerGridFormDTO); + /** + * @V23 + * @param houseIds + * @param customerId + * @return 根据房屋id查询房屋表,并且放到了缓存里 + */ @PostMapping(value = "/gov/org/house/queryListHouseInfo", consumes = MediaType.APPLICATION_JSON_VALUE) Result> queryListHouseInfo(@RequestBody Set houseIds, @RequestParam("customerId") String customerId); @@ -486,6 +492,7 @@ public interface GovOrgOpenFeignClient { Result> getBranchOption(@RequestBody CustomerPartyBranchDTO formDTO); /** + * @V23 * @Description 获取小区内的楼栋 * @Param dto * @Return {@link Result>} @@ -496,6 +503,7 @@ public interface GovOrgOpenFeignClient { Result> getBuildingOptions(IcBuildingDTO dto); /** + * @V23 * @Description 获取楼栋内单元 * @Param dto * @Return {@link Result>} @@ -505,10 +513,16 @@ public interface GovOrgOpenFeignClient { @PostMapping("/gov/org/icbuildingunit/unitoption") Result> getUnitOptions(IcBuildingUnitDTO dto); + /** + * @V23 + * @param formDTO + * @return 根据楼栋id、单元id获取房屋列表 + */ @PostMapping("/gov/org/ichouse/houseoption") Result> getHouseOption(@RequestBody HouseFormDTO formDTO); /** + * @V23 * @Description 获取网格下小区列表 * @Param dto * @Return {@link Result< List< OptionResultDTO>>} @@ -519,23 +533,47 @@ public interface GovOrgOpenFeignClient { Result> getNeighborHoodOptions(IcNeighborHoodDTO dto); /** - * @param idCard + * @V23 + * @param idCard 对应ic_house.OWNER_ID_CARD 房主身份证号 * @Description 查询房屋信息 * @author zxc * @date 2021/11/3 3:30 下午 + * @return 返回该小区名+楼栋名+单元名+房屋名 */ @PostMapping("/gov/org/ichouse/selecthouseinfobyidcard") Result> selectHouseInfoByIdCard(@RequestParam("idCard") String idCard, @RequestParam("customerId") String customerId); + /** + * @V23 + * @param id + * @Description 根据房屋id查询,查询房屋信息;这个接口需要重构吧,怎么还查询两次。 + */ @GetMapping("/gov/org/ichouse/{id}") Result get(@PathVariable("id") String id); + /** + * @V23 + * @param buildingIdList + * @return 根据楼栋id,查询楼栋信息 + */ @PostMapping("/gov/org/building/buildinglistbyids") Result> buildingListByIds(@RequestBody List buildingIdList); + /** + * @V23 + * @param buildingIdList + * @param pageNo + * @param pageSize + * @return 分页查询楼栋信息 + */ @PostMapping("/gov/org/building/buildinglistbyidsPage/{pageNo}/{pageSize}") Result buildinglistbyidsPage(@RequestBody List buildingIdList, @PathVariable("pageNo") Integer pageNo, @PathVariable("pageSize") Integer pageSize); + /** + * @V23 + * @param ids + * @Description 根据小区id查询小区信息 + */ @PostMapping("/gov/org/icneighborhood/getlistbyids") Result> getListByIds(@RequestBody List ids); @@ -555,7 +593,7 @@ public interface GovOrgOpenFeignClient { /** * 根据ID查询楼栋信息 - * + * @V23 * @param id * @return */ @@ -564,7 +602,7 @@ public interface GovOrgOpenFeignClient { /** * 通过ID查询小区信息 - * + * @V23 * @param id * @return */ @@ -587,6 +625,7 @@ public interface GovOrgOpenFeignClient { @RequestParam("orgType") String orgType); /** + * @V23 * @Author sun * @Description 查询组织、网格、小区、楼栋、单元、房屋信息 **/ @@ -595,7 +634,7 @@ public interface GovOrgOpenFeignClient { /** * 查询单元 - * + * @V23 * @param id * @return */ @@ -614,7 +653,7 @@ public interface GovOrgOpenFeignClient { /** * Desc: 根据身份证查询房屋名 - * + * @V23 * @param idCards * @author zxc * @date 2022/4/12 16:42 @@ -624,7 +663,7 @@ public interface GovOrgOpenFeignClient { /** * Desc: 房屋更新 - * + * @V23 * @param formDTO * @author zxc * @date 2022/5/11 09:46 @@ -643,7 +682,7 @@ public interface GovOrgOpenFeignClient { /** * 根据houseId查询数据 - * + * @V23 * @param houseId * @return com.epmet.commons.tools.utils.Result * @author LZN @@ -661,7 +700,7 @@ public interface GovOrgOpenFeignClient { /** * 根据房屋编码查询房屋信息 - * + * @V23 * @param houseCode * @return com.epmet.commons.tools.utils.Result * @author work@yujt.net.cn @@ -677,6 +716,7 @@ public interface GovOrgOpenFeignClient { * @author wangtong * @date 2022/6/10 13:27 * @params [dto] + * @V23 */ @PostMapping("/gov/org/house/getHomeInfoByHouseCode") Result getHomeInfoByHouseCode(CommonHouseFormDTO dto); @@ -685,6 +725,7 @@ public interface GovOrgOpenFeignClient { * desc:根据房屋id更新 屋内的居民数量 * @param paramList * @return + * @V23 */ @PostMapping("/gov/org/ichouse/updateIcHouseResiNumber") Result updateIcHouseResiNumber(List> paramList); @@ -706,6 +747,7 @@ public interface GovOrgOpenFeignClient { * @Return {@link Result< List>} * @Author zhaoqifeng * @Date 2022/7/20 9:52 + * @V23 */ @PostMapping("/gov/org/ichouse/getOwnerHouseList") Result> getOwnerHouseList(@RequestBody IcHouseDTO formDTO); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 6282777484..f462449ec9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -293,6 +293,12 @@ public class HouseController implements ResultDataResolver { epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); } + /** + * 根据房屋id查询房屋表,并且放到了缓存里 + * @param houseIds + * @param customerId + * @return + */ @PostMapping("queryListHouseInfo") Result> queryListHouseInfo(@RequestBody Set houseIds, @RequestParam("customerId") String customerId) { return new Result>().ok(houseService.queryListHouseInfo(houseIds, customerId)); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java index e7b5ac7e56..c2420c0832 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java @@ -26,9 +26,11 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.IcHouseDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO; -import com.epmet.dto.form.DetailByTypeFormDTO; import com.epmet.dto.form.HouseFormDTO; -import com.epmet.dto.result.*; +import com.epmet.dto.result.HouseAgencyInfoResultDTO; +import com.epmet.dto.result.HouseInfoDTO; +import com.epmet.dto.result.HouseListResultDTO; +import com.epmet.dto.result.HousesNameResultDTO; import com.epmet.service.IcHouseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -57,6 +59,11 @@ public class IcHouseController { return new Result().ok(data); } + /** + * 根据楼栋id、单元id获取房屋列表 + * @param formDTO + * @return + */ @PostMapping("houseoption") public Result> getHouseOption(@RequestBody HouseFormDTO formDTO) { return new Result>().ok(icHouseService.getHouseOption(formDTO)); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 943d6f9eee..93322c7ed6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -3,8 +3,6 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.rocketmq.constants.TopicConstants; -import com.epmet.commons.rocketmq.messages.CheckMQMsg; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; @@ -12,14 +10,10 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; -import com.epmet.commons.tools.redis.common.CustomerResiUserRedis; import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; -import com.epmet.commons.tools.redis.common.bean.IcResiUserInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.IpUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.constant.NeighborhoodConstant; import com.epmet.dao.IcBuildingDao; import com.epmet.dao.IcBuildingUnitDao; import com.epmet.dao.IcHouseDao; @@ -29,9 +23,7 @@ import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.ImportGeneralDTO; import com.epmet.dto.form.CheckHouseInfoFormDTO; -import com.epmet.dto.form.DetailByTypeFormDTO; import com.epmet.dto.form.HouseFormDTO; -import com.epmet.dto.form.SystemMsgFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.IcBuildingEntity; import com.epmet.entity.IcBuildingUnitEntity; @@ -51,11 +43,8 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; @@ -97,7 +86,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl