diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCustomHouseSaleRentInfoController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCustomHouseSaleRentInfoController.java new file mode 100644 index 0000000..f02702e --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCustomHouseSaleRentInfoController.java @@ -0,0 +1,81 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.house.form.HouseSaleRentInfoPublishFormDTO; +import com.elink.esua.epdc.dto.house.result.HouseSaleRentInfoListResultDTO; +import com.elink.esua.epdc.feign.CustomFeignClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +@RestController +@RequestMapping("custom/housesalerentinfo") +public class ApiCustomHouseSaleRentInfoController { + + @Autowired + private CustomFeignClient customFeignClient; + + @PostMapping("publish") + public Result publish(@RequestBody HouseSaleRentInfoPublishFormDTO form) { + return customFeignClient.publishHouseSaleRentInfo(form); + } + + /** + * @description: 居民端，查看所有人发布的列表 + * @param : + * @return + * @author: WangXianZhang + * @date: 2023/5/5 3:56 PM + */ + @GetMapping("resi/list") + public Result> resiList(@RequestParam("houseStatus") Integer houseStatus, + @RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize") Integer pageSize) { + return customFeignClient.houseSaleRentInfoResiList(houseStatus, pageNum, pageSize); + } + + /** + * @description: 居民端-我发布的列表 + * @param userDetail: + * @return + * @author: WangXianZhang + * @date: 2023/5/5 5:31 PM + */ + @GetMapping("resi/mypublishedlist") + public Result> listMyPuhlishedList(@RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize") Integer pageSize) { + + return customFeignClient.listMyPuhlishedList(pageNum, pageSize); + } + + /** + * @description: 审核列表 + * @param pageNum: + * @param pageSize: + * @param auditStatus: + * @return + * @author: WangXianZhang + * @date: 2023/5/5 4:45 PM + */ + @GetMapping("work/list2audit") + public Result> list2audit(@RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize") Integer pageSize, + @RequestParam(value = "auditStatus", required = false) Integer auditStatus) { + + return customFeignClient.list2audit(pageNum, pageSize, auditStatus); + } + + /** + * @description: 提交审核结果 + * @param form: + * @return + * @author: WangXianZhang + * @date: 2023/5/5 4:58 PM + */ + @PostMapping("work/audit") + public Result audit(@RequestBody Map form) { + return customFeignClient.audit(form); + } +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java index 3b2b56f..28ec023 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.EpidemicSentryPostDTO; import com.elink.esua.epdc.dto.GetTripInfoFormDTO; @@ -13,6 +14,8 @@ import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO; import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO; import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO; import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO; +import com.elink.esua.epdc.dto.house.form.HouseSaleRentInfoPublishFormDTO; +import com.elink.esua.epdc.dto.house.result.HouseSaleRentInfoListResultDTO; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO; @@ -26,6 +29,7 @@ import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * @author yzm @@ -329,6 +333,53 @@ public interface CustomFeignClient { @GetMapping(value = "custom/family/getRoomCodeByIdCard", consumes = MediaType.APPLICATION_JSON_VALUE) Result getRoomCodeByIdCard(IdCardFormDTO formDto); + /** + * @description: fangwu -发布租售信息 + * @param form: + * @param user: + * @return + * @author: WangXianZhang + * @date: 2023/5/6 4:33 PM + */ + @PostMapping(value = "custom/housesalerentinfo/publish") + Result publishHouseSaleRentInfo(@RequestBody HouseSaleRentInfoPublishFormDTO form); + + @GetMapping(value = "custom/housesalerentinfo/resi/list") + Result houseSaleRentInfoResiList(@RequestParam("houseStatus") Integer houseStatus, + @RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize") Integer pageSize); + + /** + * @description: 居民端-我发布的列表 + * @return + * @author: WangXianZhang + * @date: 2023/5/5 5:31 PM + */ + @GetMapping("custom/housesalerentinfo/resi/mypublishedlist") + Result> listMyPuhlishedList(@RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize") Integer pageSize); + /** + * @description: 审核列表 + * @param pageNum: + * @param pageSize: + * @param auditStatus: + * @return + * @author: WangXianZhang + * @date: 2023/5/5 4:45 PM + */ + @GetMapping("custom/housesalerentinfo/work/list2audit") + Result> list2audit(@RequestParam("pageNum") Integer pageNum, + @RequestParam("pageSize") Integer pageSize, + @RequestParam(value = "auditStatus", required = false) Integer auditStatus); + /** + * @description: 提交审核结果 + * @param form: + * @return + * @author: WangXianZhang + * @date: 2023/5/5 4:58 PM + */ + @PostMapping("custom/housesalerentinfo/work/audit") + Result audit(@RequestBody Map form); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java index 448b644..93e8fc8 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.EpidemicSentryPostDTO; @@ -14,6 +15,8 @@ import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO; import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO; import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO; import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO; +import com.elink.esua.epdc.dto.house.form.HouseSaleRentInfoPublishFormDTO; +import com.elink.esua.epdc.dto.house.result.HouseSaleRentInfoListResultDTO; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO; @@ -25,6 +28,7 @@ import com.elink.esua.epdc.feign.CustomFeignClient; import org.springframework.stereotype.Component; import java.util.List; +import java.util.Map; /** * @Description 定制化功能模块fegin @@ -185,5 +189,28 @@ public class CustomFeignClientFallback implements CustomFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getRoomCodeByIdCard", formDto); } + @Override + public Result publishHouseSaleRentInfo(HouseSaleRentInfoPublishFormDTO form) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "publishHouseSaleRentInfo", form); + } + @Override + public Result houseSaleRentInfoResiList(Integer houseStatus, Integer pageNum, Integer pageSize) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "houseSaleRentInfoResiList", houseStatus, pageNum, pageSize); + } + + @Override + public Result> listMyPuhlishedList(Integer pageNum, Integer pageSize) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "listMyPuhlishedList", pageNum, pageSize); + } + + @Override + public Result> list2audit(Integer pageNum, Integer pageSize, Integer auditStatus) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "list2audit", pageNum, pageSize, auditStatus); + } + + @Override + public Result audit(Map form) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "audit", form); + } } diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index cc0e5d4..13974fd 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit cc0e5d4a31687b9224edc53d7b8d6414e7005d6a +Subproject commit 13974fd18be0669576eb76e98cf6f1febbf9bace diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index f491284..4553c4e 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit f49128405cd591b9aab7f129df01518c5aea143e +Subproject commit 4553c4e17bd9206a4d87126f7ac2208c69e13fbf diff --git a/epdc-cloud-parent-yushan b/epdc-cloud-parent-yushan index 7d5b870..6c53fd9 160000 --- a/epdc-cloud-parent-yushan +++ b/epdc-cloud-parent-yushan @@ -1 +1 @@ -Subproject commit 7d5b8709e3fa8224b3463e120f7b79af1feea28c +Subproject commit 6c53fd985cbaae46046a44a2d84f1eb9bff86a9d