From e50eed10a176a1ffd5c36ffae68876e26559c8c8 Mon Sep 17 00:00:00 2001 From: wxz Date: Sat, 6 May 2023 20:05:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=A7=9F=E5=94=AE=EF=BC=8C?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=9A=84url=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiCustomHouseSaleRentInfoController.java | 5 +- ...CustomHouseSaleRentInfoWorkController.java | 47 +++++++++++++++++++ .../esua/epdc/feign/CustomFeignClient.java | 3 +- .../fallback/CustomFeignClientFallback.java | 5 +- 4 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCustomHouseSaleRentInfoWorkController.java 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 index f02702e..238a131 100644 --- 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 @@ -32,8 +32,9 @@ public class ApiCustomHouseSaleRentInfoController { @GetMapping("resi/list") public Result> resiList(@RequestParam("houseStatus") Integer houseStatus, @RequestParam("pageNum") Integer pageNum, - @RequestParam("pageSize") Integer pageSize) { - return customFeignClient.houseSaleRentInfoResiList(houseStatus, pageNum, pageSize); + @RequestParam("pageSize") Integer pageSize, + @RequestParam(value = "search", required = false) String search) { + return customFeignClient.houseSaleRentInfoResiList(houseStatus, pageNum, pageSize, search); } /** diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCustomHouseSaleRentInfoWorkController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCustomHouseSaleRentInfoWorkController.java new file mode 100644 index 0000000..4438725 --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCustomHouseSaleRentInfoWorkController.java @@ -0,0 +1,47 @@ +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.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("work/custom/housesalerentinfo") +public class ApiCustomHouseSaleRentInfoWorkController { + + @Autowired + private CustomFeignClient customFeignClient; + + /** + * @description: 审核列表 + * @param pageNum: + * @param pageSize: + * @param auditStatus: + * @return + * @author: WangXianZhang + * @date: 2023/5/5 4:45 PM + */ + @GetMapping("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("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 28ec023..d2ee03d 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 @@ -347,7 +347,8 @@ public interface CustomFeignClient { @GetMapping(value = "custom/housesalerentinfo/resi/list") Result houseSaleRentInfoResiList(@RequestParam("houseStatus") Integer houseStatus, @RequestParam("pageNum") Integer pageNum, - @RequestParam("pageSize") Integer pageSize); + @RequestParam("pageSize") Integer pageSize, + @RequestParam(value = "search", required = false) String search); /** * @description: 居民端-我发布的列表 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 93e8fc8..ec5578f 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 @@ -26,6 +26,7 @@ import com.elink.esua.epdc.dto.suggestion.form.SuggestionMakeFormDTO; import com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO; import com.elink.esua.epdc.feign.CustomFeignClient; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; import java.util.Map; @@ -195,8 +196,8 @@ public class CustomFeignClientFallback implements CustomFeignClient { } @Override - public Result houseSaleRentInfoResiList(Integer houseStatus, Integer pageNum, Integer pageSize) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "houseSaleRentInfoResiList", houseStatus, pageNum, pageSize); + public Result houseSaleRentInfoResiList(Integer houseStatus, Integer pageNum, Integer pageSize, String search) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "houseSaleRentInfoResiList", houseStatus, pageNum, pageSize, search); } @Override