工作端--心理咨询-提交问题的回答api

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkPropertyController.java

@@ -2,12 +2,14 @@ package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
+import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO;
 import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO;
 import com.elink.esua.epdc.service.WorkPropertyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -50,4 +52,18 @@ public class ApiWorkPropertyController {
     public Result<List<PsychologyAnswerOfMineResultDTO>> listMyQuestion(PsychologyAnswerFormDTO formDto) {
         return workPropertyService.listMyQuestion(formDto);
     }
+
+    /**
+     * 工作端--心理咨询-提交问题的回答
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result < PsychologyAnswerOfMineResultDTO >
+     * @params [formDto]
+     * @author zhangyuan
+     * @since 2020/6/9 15:33
+     */
+    @PostMapping("psychology/submitAnswer")
+    public Result submitAnswer(PsychologySubmitAnswerFormDTO formDto) {
+        return workPropertyService.submitAnswer(formDto);
+    }
+
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java

@@ -329,7 +329,7 @@ public interface PropertyFeignClient {
      * @author zhangyuan
      * @date 2020/6/8 9:25
      */
-    @PostMapping(value = "news/epdc-app/psychology/listUserQuestion", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "news/epdc-app/psychology/listUserQuestion", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<PsychologyAnswerListUserResultDTO>> listUserQuestion(@RequestBody PsychologyAnswerFormDTO fromDTO);
 
     /***
@@ -339,7 +339,7 @@ public interface PropertyFeignClient {
      * @author zhangyuan
      * @date 2020/6/8 9:25
      */
-    @PostMapping(value = "news/epdc-app/psychology/listQuestion", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "news/epdc-app/psychology/listQuestion", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<PsychologyAnswerListResultDTO>> listQuestion(@RequestBody PsychologyAnswerFormDTO fromDTO);
 
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkPropertyFeignClient.java

@@ -4,12 +4,14 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.config.FeignRequestInterceptor;
 import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
+import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO;
 import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO;
 import com.elink.esua.epdc.feign.fallback.WorkPropertyFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -17,6 +19,7 @@ import java.util.List;
 
 /**
  * 项目模块调用-移动app端
+ *
  * @Author zhangyuan
  * @Date 2020/6/9 16:39
  */
@@ -30,7 +33,7 @@ public interface WorkPropertyFeignClient {
      * @author zhangyuan
      * @date 2020/6/8 9:25
      */
-    @PostMapping(value = "news/epdc-app/psychology/listUnansweredQuestion", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "news/epdc-app/psychology/listUnansweredQuestion", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<PsychologyUnansweredResultDTO>> listUnansweredQuestion(@RequestBody PsychologyUnansweredFormDTO fromDTO);
 
     /***
@@ -40,7 +43,17 @@ public interface WorkPropertyFeignClient {
      * @author zhangyuan
      * @date 2020/6/8 9:25
      */
-    @PostMapping(value = "news/epdc-app/psychology/listMyQuestion", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "news/epdc-app/psychology/listMyQuestion", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<PsychologyAnswerOfMineResultDTO>> listMyQuestion(@RequestBody PsychologyAnswerFormDTO fromDTO);
 
+    /***
+     * 工作端--待解答的心理咨询问题列表
+     * @param fromDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result < PsychologyAnswerListResultDTO >
+     * @author zhangyuan
+     * @date 2020/6/8 9:25
+     */
+    @PostMapping(value = "news/epdc-app/psychology/submitAnswer", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result submitAnswer(@RequestBody PsychologySubmitAnswerFormDTO fromDTO);
+
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkPropertyFeignClientFallback.java

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
+import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO;
 import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO;
@@ -28,4 +29,10 @@ public class WorkPropertyFeignClientFallback implements WorkPropertyFeignClient
     public Result<List<PsychologyAnswerOfMineResultDTO>> listMyQuestion(PsychologyAnswerFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listMyQuestion", formDto);
     }
+
+    @Override
+    public Result submitAnswer(PsychologySubmitAnswerFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "submitAnswer", formDto);
+    }
+
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkPropertyService.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
+import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO;
 import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO;
@@ -19,7 +20,7 @@ public interface WorkPropertyService {
     /**
      * 工作端--待解答的心理咨询问题列表
      *
-     * @param formDto    查询参数
+     * @param formDto 查询参数
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.PsychologyAnswerListResultDTO>>
      * @author zhangyuan
      * @date 2020/6/8 09:15
@@ -29,10 +30,22 @@ public interface WorkPropertyService {
     /**
      * 工作端--心理咨询-我回答的问题列表
      *
-     * @param formDto    查询参数
+     * @param formDto 查询参数
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.PsychologyAnswerListResultDTO>>
      * @author zhangyuan
      * @date 2020/6/8 09:15
      */
     Result<List<PsychologyAnswerOfMineResultDTO>> listMyQuestion(PsychologyAnswerFormDTO formDto);
+
+
+    /**
+     * 工作端--心理咨询-我回答的问题列表
+     *
+     * @param formDto 参数
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhangyuan
+     * @date 2020/6/8 09:15
+     */
+    Result submitAnswer(PsychologySubmitAnswerFormDTO formDto);
+
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkPropertyServiceImpl.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO;
+import com.elink.esua.epdc.dto.psychology.form.PsychologySubmitAnswerFormDTO;
 import com.elink.esua.epdc.dto.psychology.form.PsychologyUnansweredFormDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerOfMineResultDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologyUnansweredResultDTO;
@@ -35,4 +36,11 @@ public class WorkPropertyServiceImpl implements WorkPropertyService {
 
         return workPropertyFeignClient.listMyQuestion(formDto);
     }
+
+    @Override
+    public Result submitAnswer(PsychologySubmitAnswerFormDTO formDto) {
+
+        return workPropertyFeignClient.submitAnswer(formDto);
+    }
+
 }