From 8b7461c9da84860649e3ef3ea20f6063c7e20c24 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 13 Jun 2022 15:17:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=AE=B6=E5=BA=AD=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiCustomPersonroomController.java | 18 +++++++++++++++++- .../esua/epdc/feign/CustomFeignClient.java | 9 +++++++++ .../fallback/CustomFeignClientFallback.java | 6 ++++++ .../epdc/service/CustomPersonroomService.java | 11 +++++++++++ .../impl/CustomPersonroomServiceImpl.java | 6 ++++++ 5 files changed, 49 insertions(+), 1 deletion(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCustomPersonroomController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCustomPersonroomController.java index 0329592..7a2fc0c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCustomPersonroomController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCustomPersonroomController.java @@ -12,6 +12,7 @@ import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO; +import com.elink.esua.epdc.dto.personroom.form.BindingFamilyFormDTO; import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO; import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO; import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO; @@ -137,13 +138,28 @@ public class ApiCustomPersonroomController { * @Author wanggongfeng */ @GetMapping("getHouseInfo") - public Result getHouseInfo(@RequestBody GetHouseInfoFormDTO formDTO){ + public Result getHouseInfo(GetHouseInfoFormDTO formDTO){ //效验数据 ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); return customPersonroomService.getHouseInfo(formDTO); } + /** + * 绑定我的家庭房屋 + * + * @param formDTO + * @return + * @Author wanggongfeng + */ + @PostMapping("bindingFamily") + public Result bindingFamily(@RequestBody BindingFamilyFormDTO formDTO){ + //效验数据 + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + return customPersonroomService.bindingFamily(formDTO); + } + + 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 db7081e..01fb0ac 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 @@ -16,6 +16,7 @@ import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO; +import com.elink.esua.epdc.dto.personroom.form.BindingFamilyFormDTO; import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO; import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO; import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO; @@ -306,6 +307,14 @@ public interface CustomFeignClient { @GetMapping(value = "custom/family/getHouseInfo", consumes = MediaType.APPLICATION_JSON_VALUE) Result getHouseInfo(GetHouseInfoFormDTO formDto); + /** + * 绑定我的家庭房屋 + * @param formDto + * @return + */ + @PostMapping(value = "custom/family/bindingFamily", consumes = MediaType.APPLICATION_JSON_VALUE) + Result bindingFamily(BindingFamilyFormDTO formDto); + } 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 ccec1ff..b839c17 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 @@ -17,6 +17,7 @@ import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO; +import com.elink.esua.epdc.dto.personroom.form.BindingFamilyFormDTO; import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO; import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO; import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO; @@ -172,5 +173,10 @@ public class CustomFeignClientFallback implements CustomFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getHouseInfo", formDto); } + @Override + public Result bindingFamily(BindingFamilyFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "bindingFamily", formDto); + } + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/CustomPersonroomService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/CustomPersonroomService.java index 9053c8f..de23845 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/CustomPersonroomService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/CustomPersonroomService.java @@ -9,10 +9,12 @@ import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO; +import com.elink.esua.epdc.dto.personroom.form.BindingFamilyFormDTO; import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO; import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO; import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO; import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -85,6 +87,15 @@ public interface CustomPersonroomService { */ Result getHouseInfo(GetHouseInfoFormDTO formDTO); + /** + * 绑定我的家庭房屋 + * + * @param formDTO + * @return + * @Author wanggongfeng + */ + Result bindingFamily(BindingFamilyFormDTO formDTO); + diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/CustomPersonroomServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/CustomPersonroomServiceImpl.java index f46b707..bb0ed30 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/CustomPersonroomServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/CustomPersonroomServiceImpl.java @@ -19,6 +19,7 @@ import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO; import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO; import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO; +import com.elink.esua.epdc.dto.personroom.form.BindingFamilyFormDTO; import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO; import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO; import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO; @@ -93,5 +94,10 @@ public class CustomPersonroomServiceImpl implements CustomPersonroomService { return customFeignClient.getHouseInfo(formDTO); } + @Override + public Result bindingFamily(BindingFamilyFormDTO formDTO) { + return customFeignClient.bindingFamily(formDTO); + } + }