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 c1ba296..0329592 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 @@ -39,10 +39,10 @@ public class ApiCustomPersonroomController { * @Author wgf * @Date 2022/6/9 11:27 **/ - @GetMapping("getPlotOption") + @GetMapping("getPlotOptionApp") public Result getPlotOption(EpidemicPlotCoordinateDTO formDto) { // ValidatorUtils.validateEntity(formDto); - return customPersonroomService.getPlotOption(formDto); + return customPersonroomService.getPlotOptionApp(formDto); } /** @@ -51,10 +51,10 @@ public class ApiCustomPersonroomController { * @Author wgf * @Date 2022/6/9 11:27 **/ - @GetMapping("getBuildingOption") - public Result getBuildingOption(EpidemicPlotBuildingDTO formDto) { + @GetMapping("getBuildingOptionApp") + public Result getBuildingOptionApp(EpidemicPlotBuildingDTO formDto) { // ValidatorUtils.validateEntity(formDto); - return customPersonroomService.getBuildingOption(formDto); + return customPersonroomService.getBuildingOptionApp(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 db0af0f..db7081e 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 @@ -244,8 +244,8 @@ public interface CustomFeignClient { * @Author wgf * @Date 2022/6/9 11:27 **/ - @GetMapping(value = "custom/epidemicplotcoordinate/getPlotOption", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getPlotOption(EpidemicPlotCoordinateDTO formDto); + @GetMapping(value = "custom/epidemicplotcoordinate/getPlotOptionApp", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getPlotOptionApp(EpidemicPlotCoordinateDTO formDto); /** * @return list @@ -253,8 +253,8 @@ public interface CustomFeignClient { * @Author wgf * @Date 2022/6/9 11:27 **/ - @GetMapping(value = "custom/epidemicplotcoordinate/getBuildingOption", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getBuildingOption(EpidemicPlotBuildingDTO formDto); + @GetMapping(value = "custom/epidemicplotcoordinate/getBuildingOptionApp", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getBuildingOptionApp(EpidemicPlotBuildingDTO formDto); /** * @return list 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 5abb39e..ccec1ff 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 @@ -133,13 +133,13 @@ public class CustomFeignClientFallback implements CustomFeignClient { @Override - public Result getPlotOption(EpidemicPlotCoordinateDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getPlotOption", formDto); + public Result getPlotOptionApp(EpidemicPlotCoordinateDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getPlotOptionApp", formDto); } @Override - public Result getBuildingOption(EpidemicPlotBuildingDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getBuildingOption", formDto); + public Result getBuildingOptionApp(EpidemicPlotBuildingDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getBuildingOptionApp", formDto); } @Override 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 73cff9b..9053c8f 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 @@ -30,7 +30,7 @@ public interface CustomPersonroomService { * @Author wgf * @Date 2022/6/9 11:27 **/ - Result> getPlotOption(EpidemicPlotCoordinateDTO formDto); + Result> getPlotOptionApp(EpidemicPlotCoordinateDTO formDto); /** * @return list @@ -38,7 +38,7 @@ public interface CustomPersonroomService { * @Author wgf * @Date 2022/6/9 11:27 **/ - Result> getBuildingOption(EpidemicPlotBuildingDTO formDto); + Result> getBuildingOptionApp(EpidemicPlotBuildingDTO formDto); /** * @return list 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 31b9f19..f46b707 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 @@ -52,13 +52,13 @@ public class CustomPersonroomServiceImpl implements CustomPersonroomService { private CustomFeignClient customFeignClient; @Override - public Result> getPlotOption(EpidemicPlotCoordinateDTO formDto) { - return customFeignClient.getPlotOption(formDto); + public Result> getPlotOptionApp(EpidemicPlotCoordinateDTO formDto) { + return customFeignClient.getPlotOptionApp(formDto); } @Override - public Result> getBuildingOption(EpidemicPlotBuildingDTO formDto) { - return customFeignClient.getBuildingOption(formDto); + public Result> getBuildingOptionApp(EpidemicPlotBuildingDTO formDto) { + return customFeignClient.getBuildingOptionApp(formDto); } @Override