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..3cd6426 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,11 @@ 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.form.PsychologistInfoFormDTO; +import com.elink.esua.epdc.dto.psychology.form.PsychologyQuestionFormDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologistInfoResultDTO; +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 +361,45 @@ 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); + } + + /** + * 心理咨询师详细信息 + * + * @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 psychologistInfo(@LoginUser TokenDto userDetail, PsychologistInfoFormDTO formDto) { + return propertyService.psychologistInfo(userDetail, formDto); + } + + /** + * 提交心理咨询问题 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [userDetail, formDto] + * @author liuchuang + * @since 2019/10/22 15:33 + */ + @PostMapping("psychology/submitQuestion") + public Result submitQuestion(@LoginUser TokenDto userDetail, @RequestBody PsychologyQuestionFormDTO formDto) { + return propertyService.submitQuestion(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..878f9aa 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,11 @@ 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.form.PsychologistInfoFormDTO; +import com.elink.esua.epdc.dto.psychology.form.PsychologyQuestionFormDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologistInfoResultDTO; +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; @@ -25,6 +30,7 @@ import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO; import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO; import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO; import com.elink.esua.epdc.feign.fallback.PropertyFeignClientFallback; +import oracle.jdbc.proxy.annotation.Post; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; @@ -284,4 +290,33 @@ 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); + + /*** + * 心理咨询师详细信息 + * @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/psychologistInfo", consumes = MediaType.APPLICATION_JSON_VALUE) + Result psychologistInfo(@RequestBody PsychologistInfoFormDTO fromDTO); + + /*** + * 提交心理咨询问题 + * @param fromDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangyuan + * @date 2020/6/8 9:25 + */ + @PostMapping(value = "news/epdc-app/psychology/submitQuestion", consumes = MediaType.APPLICATION_JSON_VALUE) + Result submitQuestion(@RequestBody PsychologyQuestionFormDTO 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..21cb046 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,11 @@ 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.form.PsychologistInfoFormDTO; +import com.elink.esua.epdc.dto.psychology.form.PsychologyQuestionFormDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologistInfoResultDTO; +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 +44,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 +165,18 @@ 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); + } + + @Override + public Result psychologistInfo(PsychologistInfoFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "psychologistInfo", formDto); + } + + @Override + public Result submitQuestion(PsychologyQuestionFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "submitQuestion", 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..1f0b84f 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,11 @@ 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.form.PsychologistInfoFormDTO; +import com.elink.esua.epdc.dto.psychology.form.PsychologyQuestionFormDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologistInfoResultDTO; +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 +280,37 @@ 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); + + /** + * 心理咨询师列表 + * + * @param userDetail 用户信息 + * @param formDto 查询参数 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangyuan + * @date 2020/6/8 09:15 + */ + Result psychologistInfo(TokenDto userDetail, PsychologistInfoFormDTO formDto); + + /** + * 提交心理咨询问题 + * + * @param userDetail 用户信息 + * @param formDto 查询参数 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangyuan + * @date 2020/6/8 09:15 + */ + Result submitQuestion(TokenDto userDetail, PsychologyQuestionFormDTO 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..6d21453 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 @@ -2,6 +2,8 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.async.WxMaSecCheckTask; import com.elink.esua.epdc.common.token.dto.TokenDto; +import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.enums.UserTagEnum; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -27,6 +29,11 @@ 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.form.PsychologistInfoFormDTO; +import com.elink.esua.epdc.dto.psychology.form.PsychologyQuestionFormDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologistInfoResultDTO; +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 +334,25 @@ 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); + } + + @Override + public Result psychologistInfo(TokenDto userDetail, PsychologistInfoFormDTO formDto) { + formDto.setGridId(userDetail.getGridId()); + return propertyFeignClient.psychologistInfo(formDto); + } + + @Override + public Result submitQuestion(TokenDto userDetail, PsychologyQuestionFormDTO formDto) { + formDto.setUserId(userDetail.getUserId()); + formDto.setUserName(userDetail.getNickname()); + formDto.setUserAvatar(userDetail.getFaceImg()); + formDto.setAnswerNum(NumConstant.ZERO); + return propertyFeignClient.submitQuestion(formDto); + } }