From 8fa6b010d5c2efb8e3c1727e3a033d3bc241e7c1 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 8 Jun 2020 15:41:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=83=E9=87=8C=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/controller/ApiPropertyController.java | 4 ++-- .../java/com/elink/esua/epdc/feign/PropertyFeignClient.java | 4 ++-- .../esua/epdc/feign/fallback/PropertyFeignClientFallback.java | 4 ++-- .../java/com/elink/esua/epdc/service/PropertyService.java | 4 ++-- .../com/elink/esua/epdc/service/impl/PropertyServiceImpl.java | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java index 121061e..8cd4835 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java @@ -415,7 +415,7 @@ public class ApiPropertyController { * @since 2019/10/22 15:33 */ @GetMapping("psychology/listUserQuestion") - public Result listUserQuestion(@LoginUser TokenDto userDetail, @RequestBody PsychologyAnswerFormDTO formDto) { + public Result> listUserQuestion(@LoginUser TokenDto userDetail, @RequestBody PsychologyAnswerFormDTO formDto) { return propertyService.listUserQuestion(userDetail, formDto); } @@ -428,7 +428,7 @@ public class ApiPropertyController { * @since 2019/10/22 15:33 */ @GetMapping("psychology/listQuestion") - public Result listQuestion(@LoginUser TokenDto userDetail, @RequestBody PsychologyAnswerFormDTO formDto) { + public Result> listQuestion(@LoginUser TokenDto userDetail, @RequestBody PsychologyAnswerFormDTO formDto) { return propertyService.listQuestion(userDetail, formDto); } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java index a616746..a2cc957 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java @@ -331,7 +331,7 @@ public interface PropertyFeignClient { * @date 2020/6/8 9:25 */ @PostMapping(value = "news/epdc-app/psychology/listUserQuestion", consumes = MediaType.APPLICATION_JSON_VALUE) - Result listUserQuestion(@RequestBody PsychologyAnswerFormDTO fromDTO); + Result> listUserQuestion(@RequestBody PsychologyAnswerFormDTO fromDTO); /*** * 居民端-心理咨询-问题列表 @@ -341,5 +341,5 @@ public interface PropertyFeignClient { * @date 2020/6/8 9:25 */ @PostMapping(value = "news/epdc-app/psychology/listQuestion", consumes = MediaType.APPLICATION_JSON_VALUE) - Result listQuestion(@RequestBody PsychologyAnswerFormDTO fromDTO); + Result> listQuestion(@RequestBody PsychologyAnswerFormDTO fromDTO); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java index 06e9cd9..04cd60f 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java @@ -184,12 +184,12 @@ public class PropertyFeignClientFallback implements PropertyFeignClient { } @Override - public Result listUserQuestion(PsychologyAnswerFormDTO formDto) { + public Result> listUserQuestion(PsychologyAnswerFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listUserQuestion", formDto); } @Override - public Result listQuestion(PsychologyAnswerFormDTO formDto) { + public Result> listQuestion(PsychologyAnswerFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listQuestion", formDto); } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java index 6d03c60..f903e8c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java @@ -326,7 +326,7 @@ public interface PropertyService { * @author zhangyuan * @date 2020/6/8 09:15 */ - Result listUserQuestion(TokenDto userDetail, PsychologyAnswerFormDTO formDto); + Result> listUserQuestion(TokenDto userDetail, PsychologyAnswerFormDTO formDto); /** * 居民端-心理咨询-问题列表 @@ -337,5 +337,5 @@ public interface PropertyService { * @author zhangyuan * @date 2020/6/8 09:15 */ - Result listQuestion(TokenDto userDetail, PsychologyAnswerFormDTO formDto); + Result> listQuestion(TokenDto userDetail, PsychologyAnswerFormDTO formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java index 2920382..b8996d6 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java @@ -360,14 +360,14 @@ public class PropertyServiceImpl implements PropertyService { } @Override - public Result listUserQuestion(TokenDto userDetail, PsychologyAnswerFormDTO formDto) { + public Result> listUserQuestion(TokenDto userDetail, PsychologyAnswerFormDTO formDto) { formDto.setUserId(userDetail.getUserId()); formDto.setGridId(userDetail.getGridId()); return propertyFeignClient.listUserQuestion(formDto); } @Override - public Result listQuestion(TokenDto userDetail, PsychologyAnswerFormDTO formDto) { + public Result> listQuestion(TokenDto userDetail, PsychologyAnswerFormDTO formDto) { formDto.setUserId(userDetail.getUserId()); formDto.setGridId(userDetail.getGridId()); return propertyFeignClient.listQuestion(formDto);