From 5a0824f825ec09b8cab07e08d86f5251543b13bb Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 16 Jun 2022 09:47:17 +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=E5=B7=A5=E4=BD=9C=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiWorkCustomPersonroomController.java | 112 ++++++++++++++++++ .../epdc/feign/WorkCustomFeignClient.java | 82 +++++++++++++ .../WorkCustomFeignClientFallback.java | 64 ++++++++++ .../service/WorkCustomPersonroomService.java | 67 +++++++++++ .../impl/WorkCustomPersonroomServiceImpl.java | 62 ++++++++++ 5 files changed, 387 insertions(+) create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkCustomPersonroomController.java create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkCustomFeignClient.java create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkCustomFeignClientFallback.java create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkCustomPersonroomService.java create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkCustomPersonroomServiceImpl.java diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkCustomPersonroomController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkCustomPersonroomController.java new file mode 100644 index 0000000..4353f8d --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkCustomPersonroomController.java @@ -0,0 +1,112 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +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.*; +import com.elink.esua.epdc.dto.personroom.result.HouseInfoResultDTO; +import com.elink.esua.epdc.service.CustomPersonroomService; +import com.elink.esua.epdc.service.WorkCustomPersonroomService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * 房屋 + * + * @author work@yujt.net.cn + * @date 2022/6/9 11:27 + */ +@RestController +@RequestMapping("work/custom/personroom") +public class ApiWorkCustomPersonroomController { + + @Autowired + private WorkCustomPersonroomService workCustomPersonroomService; + + /** + * 获取房屋信息 + * + * @param formDTO + * @return + * @Author wanggongfeng + */ + @GetMapping("getHouseInfo") + public Result getHouseInfo(GetHouseInfoFormDTO formDTO){ + //效验数据 + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + return workCustomPersonroomService.getHouseInfo(formDTO); + } + + /** + * 修改房屋信息 + * + * @param formDTO + * @return + * @Author wanggongfeng + */ + @PostMapping("updateHouseInfo") + public Result updateHouseInfo(@RequestBody HouseInfoFormDTO formDTO){ + //效验数据 + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + return workCustomPersonroomService.updateHouseInfo(formDTO); + } + + + /** + * 获取成员信息 + * + * @param formDTO + * @return + * @Author wanggongfeng + */ + @GetMapping("getFamilyMember") + public Result getFamilyMember(GetMemberListFormDTO formDTO){ + //效验数据 + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + return workCustomPersonroomService.getFamilyMember(formDTO); + } + + /** + * 新增成员信息 + * + * @param formDTO + * @return + * @Author wanggongfeng + */ + @PostMapping("addFamilyMember") + public Result addFamilyMember(@RequestBody FamilyMemberInfoFormDTO formDTO){ + //效验数据 + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + return workCustomPersonroomService.addFamilyMember(formDTO); + } + + /** + * 修改成员信息 + * + * @param formDTO + * @return + * @Author wanggongfeng + */ + @PostMapping("updateFamilyMember") + public Result updateFamilyMember(@RequestBody FamilyMemberInfoFormDTO formDTO){ + //效验数据 + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + return workCustomPersonroomService.updateFamilyMember(formDTO); + } + + + + + + + + + + + + +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkCustomFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkCustomFeignClient.java new file mode 100644 index 0000000..197d959 --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkCustomFeignClient.java @@ -0,0 +1,82 @@ +package com.elink.esua.epdc.feign; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.EpidemicSentryPostDTO; +import com.elink.esua.epdc.dto.GetTripInfoFormDTO; +import com.elink.esua.epdc.dto.SaveTripInfoFormDTO; +import com.elink.esua.epdc.dto.TypeNode; +import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO; +import com.elink.esua.epdc.dto.consult.result.CheckStateResultDTO; +import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO; +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.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.*; +import com.elink.esua.epdc.dto.suggestion.form.MySuggestionFormDTO; +import com.elink.esua.epdc.dto.suggestion.form.SuggestionMakeFormDTO; +import com.elink.esua.epdc.dto.suggestion.result.MySuggestionResultDTO; +import com.elink.esua.epdc.feign.fallback.CustomFeignClientFallback; +import com.elink.esua.epdc.feign.fallback.WorkCustomFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author yzm + * @Date: 2020/1/28 13:24 + * @Description: 定制化功能模块fegin + */ +@FeignClient(name = ServiceConstant.EPDC_CUSTOM_SERVER, fallback = WorkCustomFeignClientFallback.class) +public interface WorkCustomFeignClient { + + /** + * 获取成员信息 + * @param formDto + * @return + */ + @GetMapping(value = "custom/family/getFamilyMember", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getFamilyMember(GetMemberListFormDTO formDto); + + /** + * 新增成员信息 + * @param formDto + * @return + */ + @PostMapping(value = "custom/family/addFamilyMember", consumes = MediaType.APPLICATION_JSON_VALUE) + Result addFamilyMember(FamilyMemberInfoFormDTO formDto); + + /** + * 更新成员信息 + * @param formDto + * @return + */ + @PostMapping(value = "custom/family/updateFamilyMember", consumes = MediaType.APPLICATION_JSON_VALUE) + Result updateFamilyMember(FamilyMemberInfoFormDTO formDto); + + /** + * 获取房屋信息 + * @param formDto + * @return + */ + @GetMapping(value = "custom/family/getHouseInfo", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getHouseInfo(GetHouseInfoFormDTO formDto); + + /** + * 更新房屋信息 + * @param formDto + * @return + */ + @PostMapping(value = "custom/family/updateHouseInfo", consumes = MediaType.APPLICATION_JSON_VALUE) + Result updateHouseInfo(HouseInfoFormDTO formDto); + + + + +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkCustomFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkCustomFeignClientFallback.java new file mode 100644 index 0000000..5f86dd5 --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkCustomFeignClientFallback.java @@ -0,0 +1,64 @@ +package com.elink.esua.epdc.feign.fallback; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +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; +import com.elink.esua.epdc.dto.GetTripInfoFormDTO; +import com.elink.esua.epdc.dto.SaveTripInfoFormDTO; +import com.elink.esua.epdc.dto.TypeNode; +import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO; +import com.elink.esua.epdc.dto.consult.result.CheckStateResultDTO; +import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO; +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.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.*; +import com.elink.esua.epdc.dto.suggestion.form.MySuggestionFormDTO; +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 com.elink.esua.epdc.feign.WorkCustomFeignClient; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @Description 定制化功能模块fegin + * @Author yinzuomei + * @Date 2020/1/28 13:26 + */ +@Component +public class WorkCustomFeignClientFallback implements WorkCustomFeignClient { + + @Override + public Result getFamilyMember(GetMemberListFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getFamilyMember", formDto); + } + + @Override + public Result addFamilyMember(FamilyMemberInfoFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "addFamilyMember", formDto); + } + + @Override + public Result updateFamilyMember(FamilyMemberInfoFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "updateFamilyMember", formDto); + } + + @Override + public Result getHouseInfo(GetHouseInfoFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getHouseInfo", formDto); + } + + @Override + public Result updateHouseInfo(HouseInfoFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "updateHouseInfo", formDto); + } + + +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkCustomPersonroomService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkCustomPersonroomService.java new file mode 100644 index 0000000..0b3f37b --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkCustomPersonroomService.java @@ -0,0 +1,67 @@ +package com.elink.esua.epdc.service; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; +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.*; +import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * 房屋 + * + * @author work@yujt.net.cn + * @date 2020/2/28 11:28 + */ +public interface WorkCustomPersonroomService { + + /** + * 获取成员信息 + * @param formDTO + * @return + */ + Result getFamilyMember(GetMemberListFormDTO formDTO); + + /** + * 添加成员 + * @param formDTO + * @return + */ + Result addFamilyMember(FamilyMemberInfoFormDTO formDTO); + + /** + * 修改成员 + * @param formDTO + * @return + */ + Result updateFamilyMember(FamilyMemberInfoFormDTO formDTO); + + /** + * 获取房屋信息 + * @param formDTO + * @return + */ + Result getHouseInfo(GetHouseInfoFormDTO formDTO); + + /** + * 修改房屋信息 + * @param formDTO + * @return + */ + Result updateHouseInfo(HouseInfoFormDTO formDTO); + + + + + + + + + + + +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkCustomPersonroomServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkCustomPersonroomServiceImpl.java new file mode 100644 index 0000000..2c0819d --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkCustomPersonroomServiceImpl.java @@ -0,0 +1,62 @@ +package com.elink.esua.epdc.service.impl; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.epidemic.DictOptionDTO; +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.*; +import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO; +import com.elink.esua.epdc.dto.personroom.result.HouseInfoResultDTO; +import com.elink.esua.epdc.feign.CustomFeignClient; +import com.elink.esua.epdc.feign.WorkCustomFeignClient; +import com.elink.esua.epdc.service.CustomPersonroomService; +import com.elink.esua.epdc.service.WorkCustomPersonroomService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 房屋 + * + * @author work@yujt.net.cn + * @date 2020/2/28 11:28 + */ +@Slf4j +@Service +public class WorkCustomPersonroomServiceImpl implements WorkCustomPersonroomService { + + @Autowired + private WorkCustomFeignClient workCustomFeignClient; + + + + @Override + public Result getFamilyMember(GetMemberListFormDTO formDTO) { + return workCustomFeignClient.getFamilyMember(formDTO); + } + + @Override + public Result addFamilyMember(FamilyMemberInfoFormDTO formDTO) { + return workCustomFeignClient.addFamilyMember(formDTO); + } + + @Override + public Result updateFamilyMember(FamilyMemberInfoFormDTO formDTO) { + return workCustomFeignClient.updateFamilyMember(formDTO); + } + + @Override + public Result getHouseInfo(GetHouseInfoFormDTO formDTO) { + return workCustomFeignClient.getHouseInfo(formDTO); + } + + @Override + public Result updateHouseInfo(HouseInfoFormDTO formDTO) { + return workCustomFeignClient.updateHouseInfo(formDTO); + } + + +}