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 7a2fc0c..19ae7ec 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,10 +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; +import com.elink.esua.epdc.dto.personroom.form.*; import com.elink.esua.epdc.service.CustomEnterpriseService; import com.elink.esua.epdc.service.CustomPersonroomService; import org.springframework.beans.factory.annotation.Autowired; @@ -159,6 +156,20 @@ public class ApiCustomPersonroomController { return customPersonroomService.bindingFamily(formDTO); } + /** + * 获取跳转方向 + * + * @param formDTO + * @return + * @Author wanggongfeng + */ + @GetMapping("getSkipDirection") + public Result getSkipDirection(GetSkipDirectionFormDTO formDTO){ + //效验数据 + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + return customPersonroomService.getSkipDirection(formDTO); + } + 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 index 13c1294..63cb4b5 100644 --- 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 @@ -121,4 +121,7 @@ public class ApiWorkCustomPersonroomController { + + + } 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 507ba3d..ac964be 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,10 +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; +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; @@ -316,5 +313,14 @@ public interface CustomFeignClient { Result bindingFamily(BindingFamilyFormDTO formDto); + /** + * 获取跳转方向 + * @param formDto + * @return + */ + @GetMapping(value = "custom/family/getSkipDirection", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getSkipDirection(GetSkipDirectionFormDTO 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 b839c17..790c259 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,10 +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; +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; @@ -178,5 +175,10 @@ public class CustomFeignClientFallback implements CustomFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "bindingFamily", formDto); } + @Override + public Result getSkipDirection(GetSkipDirectionFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getSkipDirection", 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 de23845..f130294 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,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; +import com.elink.esua.epdc.dto.personroom.form.*; import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO; import org.springframework.web.bind.annotation.RequestBody; @@ -96,6 +93,13 @@ public interface CustomPersonroomService { */ Result bindingFamily(BindingFamilyFormDTO formDTO); + /** + * 获取跳转方向 + * @param formDTO + * @return + */ + Result getSkipDirection(GetSkipDirectionFormDTO 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 index 0b3f37b..097e18a 100644 --- 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 @@ -64,4 +64,6 @@ public interface WorkCustomPersonroomService { + + } 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 bb0ed30..a5604a4 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,10 +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; +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.AdminFeignClient; @@ -99,5 +96,10 @@ public class CustomPersonroomServiceImpl implements CustomPersonroomService { return customFeignClient.bindingFamily(formDTO); } + @Override + public Result getSkipDirection(GetSkipDirectionFormDTO formDTO) { + return customFeignClient.getSkipDirection(formDTO); + } + }