心理咨询问题接口

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<PsychologistInfoResultDTO> 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);
+    }
 }

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<PsychologistInfoResultDTO> 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);
 }

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<PsychologistInfoResultDTO> 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);
+    }
 }

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<PsychologistInfoResultDTO> 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);
 }

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);
+    }
 }