From 76d25a813c2fcd5b8379c75bd96243c378f2432c Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 8 Jun 2020 10:46:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E7=90=86=E5=92=A8=E8=AF=A2=E5=B8=88ap?= =?UTF-8?q?p=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiPropertyController.java | 16 ++++++++++++++++ .../elink/esua/epdc/feign/NewsFeignClient.java | 3 ++- .../esua/epdc/feign/PropertyFeignClient.java | 13 +++++++++++++ .../fallback/PropertyFeignClientFallback.java | 7 ++++++- .../elink/esua/epdc/service/PropertyService.java | 14 ++++++++++++++ .../epdc/service/impl/PropertyServiceImpl.java | 8 ++++++++ 6 files changed, 59 insertions(+), 2 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 7baac6e..c64cf5d 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 @@ -21,6 +21,8 @@ import com.elink.esua.epdc.dto.police.form.PoliceFormDTO; import com.elink.esua.epdc.dto.police.result.PoliceResultDTO; import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO; import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO; +import com.elink.esua.epdc.dto.psychology.form.PsychologistFormDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO; import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO; @@ -356,4 +358,18 @@ public class ApiPropertyController { public Result> listBnnerByCategory(@LoginUser TokenDto userDetail, EpdcBannerListFromDTO formDto) { return propertyService.listBnnerByCategory(userDetail, formDto); } + + /** + * 心理咨询师列表 + * + * @param userDetail 用户信息 + * @param formDto 查询参数 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangyuan + * @date 2020/6/8 09:17 + */ + @GetMapping("psychology/listPsychiatrist") + public Result> listPsychiatrist(@LoginUser TokenDto userDetail, PsychologistFormDTO formDto) { + return propertyService.listPsychiatrist(userDetail, formDto); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java index 0c758b5..cc09102 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java @@ -4,6 +4,8 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; +import com.elink.esua.epdc.dto.psychology.form.PsychologistFormDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO; import com.elink.esua.epdc.feign.fallback.NewsFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -166,5 +168,4 @@ public interface NewsFeignClient { @PostMapping(value = "news/epdc-app/information/first/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE) Result selectOneFristByUserId(@PathVariable String userId); - } 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 3460712..50f6454 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 @@ -18,6 +18,8 @@ import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO; import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO; import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO; import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO; +import com.elink.esua.epdc.dto.psychology.form.PsychologistFormDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO; import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicDetailFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO; @@ -284,4 +286,15 @@ public interface PropertyFeignClient { @GetMapping(value = "property/epdc-app/comment/list", consumes = MediaType.APPLICATION_JSON_VALUE) Result listOfComments(TopicCommentsFormDTO formDto); + + /*** + * 心理咨询师列表 + * @param fromDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangyuan + * @date 2020/6/8 9:25 + */ + @GetMapping(value = "news/epdc-app/psychology/listPsychiatrist", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> listPsychiatrist(@RequestBody PsychologistFormDTO 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 bab8326..7dcf96c 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 @@ -19,6 +19,8 @@ import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO; import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO; import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO; import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO; +import com.elink.esua.epdc.dto.psychology.form.PsychologistFormDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO; import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicDetailFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO; @@ -39,7 +41,6 @@ import java.util.List; @Component public class PropertyFeignClientFallback implements PropertyFeignClient { - @Override public Result detail(GroupDetailForMobileEndFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "detail", formDto); @@ -161,4 +162,8 @@ public class PropertyFeignClientFallback implements PropertyFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "listOfComments", formDto); } + @Override + public Result> listPsychiatrist(PsychologistFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listPsychiatrist", 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 bc9858e..628a89f 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 @@ -22,6 +22,8 @@ import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO; import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO; import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO; import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO; +import com.elink.esua.epdc.dto.psychology.form.PsychologistFormDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO; import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO; @@ -275,4 +277,16 @@ public interface PropertyService { * @date 2020/5/25 09:15 */ Result> listBnnerByCategory(TokenDto userDetail, EpdcBannerListFromDTO formDto); + + /** + * 心理咨询师列表 + * + * @param userDetail 用户信息 + * @param formDto 查询参数 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangyuan + * @date 2020/6/8 09:15 + */ + Result> listPsychiatrist(TokenDto userDetail, PsychologistFormDTO 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 046d728..d72322e 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 @@ -27,6 +27,8 @@ import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO; import com.elink.esua.epdc.dto.project.form.ProjectScoreFormDTO; import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO; import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO; +import com.elink.esua.epdc.dto.psychology.form.PsychologistFormDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO; import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicDetailFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO; @@ -327,4 +329,10 @@ public class PropertyServiceImpl implements PropertyService { formDto.setDeptId(userDetail.getGridId()); return newsFeignClient.listBanner(formDto); } + + @Override + public Result> listPsychiatrist(TokenDto userDetail, PsychologistFormDTO formDto) { + formDto.setGridId(userDetail.getGridId()); + return propertyFeignClient.listPsychiatrist(formDto); + } }