From 3bb78a981052466fdcedb4d6ee1b3e7f9ccd3f46 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 8 Jun 2020 14:04:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E7=90=86=E5=92=A8=E8=AF=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98=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 | 14 ++++++++++++++ .../elink/esua/epdc/feign/PropertyFeignClient.java | 11 +++++++++++ .../fallback/PropertyFeignClientFallback.java | 6 ++++++ .../elink/esua/epdc/service/PropertyService.java | 11 +++++++++++ .../epdc/service/impl/PropertyServiceImpl.java | 12 ++++++++++++ 5 files changed, 54 insertions(+) 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 04686d3..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 @@ -23,6 +23,7 @@ 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; @@ -388,4 +389,17 @@ public class ApiPropertyController { 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/PropertyFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java index 9a12e63..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 @@ -20,6 +20,7 @@ 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; @@ -29,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; @@ -308,4 +310,13 @@ public interface PropertyFeignClient { @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 08d7463..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 @@ -21,6 +21,7 @@ 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; @@ -173,4 +174,9 @@ public class PropertyFeignClientFallback implements PropertyFeignClient { 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 ba31bc8..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 @@ -24,6 +24,7 @@ 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; @@ -302,4 +303,14 @@ public interface PropertyService { */ 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 1ef59e8..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; @@ -29,6 +31,7 @@ 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; @@ -343,4 +346,13 @@ public class PropertyServiceImpl implements PropertyService { 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); + } }