From 7a0bf9fda64c5bce2421ecd6fa4f96a0618d1563 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 10 Jun 2020 10:19:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF--=E7=9F=9B=E7=9B=BE?= =?UTF-8?q?=E7=BA=A0=E7=BA=B7=E6=8F=90=E4=BA=A4api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiPropertyController.java | 1 + .../controller/ApiWorkConflictController.java | 60 +++++++++++++++++++ .../controller/ApiWorkPropertyController.java | 2 + .../epdc/feign/WorkConflictFeignClient.java | 59 ++++++++++++++++++ .../epdc/feign/WorkPropertyFeignClient.java | 9 +-- .../WorkConflictFeignClientFallback.java | 39 ++++++++++++ .../WorkPropertyFeignClientFallback.java | 5 +- .../epdc/service/WorkConflictService.java | 52 ++++++++++++++++ .../service/impl/WorkConflictServiceImpl.java | 46 ++++++++++++++ .../service/impl/WorkPropertyServiceImpl.java | 2 +- 10 files changed, 268 insertions(+), 7 deletions(-) create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkConflictController.java create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkConflictFeignClient.java create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkConflictFeignClientFallback.java create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkConflictService.java create mode 100644 epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkConflictServiceImpl.java 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 fdbdea0..3d4eda9 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 @@ -403,6 +403,7 @@ public class ApiPropertyController { */ @PostMapping("psychology/submitQuestion") public Result submitQuestion(@LoginUser TokenDto userDetail, @RequestBody PsychologyQuestionFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); return propertyService.submitQuestion(userDetail, formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkConflictController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkConflictController.java new file mode 100644 index 0000000..3f55a97 --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkConflictController.java @@ -0,0 +1,60 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO; +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.WorkConflictService; +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; + +import java.util.List; + +/** + * @author: qushutong + * @Date: 2020/5/12 11:11 + * @Description: 物业相关 + */ +@RestController +@RequestMapping("work/conflict") +public class ApiWorkConflictController { + + @Autowired + private WorkConflictService workConflictService; + +// /** +// * 工作端--待解答的心理咨询问题列表 +// * +// * @return com.elink.esua.epdc.commons.tools.utils.Result < PsychologyUnansweredResultDTO > +// * @params [formDto] +// * @author zhangyuan +// * @since 2020/6/9 15:33 +// */ +// @GetMapping("psychology/listQuestion") +// public Result> listQuestion(PsychologyUnansweredFormDTO formDto) { +// return workPropertyService.listUnansweredQuestion(formDto); +// } + + /** + * 工作端--矛盾纠纷提交 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] + * @author zhangyuan + * @since 2020/6/9 15:33 + */ + @PostMapping("conflict/submit") + public Result submit(ConflictMediateFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return workConflictService.submit(formDto); + } + +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkPropertyController.java index 8e18f9c..f0f8b4f 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkPropertyController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkPropertyController.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; 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; @@ -63,6 +64,7 @@ public class ApiWorkPropertyController { */ @PostMapping("psychology/submitAnswer") public Result submitAnswer(PsychologySubmitAnswerFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); return workPropertyService.submitAnswer(formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkConflictFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkConflictFeignClient.java new file mode 100644 index 0000000..5ca0abf --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkConflictFeignClient.java @@ -0,0 +1,59 @@ +package com.elink.esua.epdc.feign; + +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; + +import java.util.List; + +/** + * 项目模块调用-移动app端 + * + * @Author zhangyuan + * @Date 2020/6/9 16:39 + */ +@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkPropertyFeignClientFallback.class, configuration = FeignRequestInterceptor.class) +public interface WorkConflictFeignClient { + + /*** + * 工作端--待解答的心理咨询问题列表 + * @param fromDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result < PsychologyAnswerListResultDTO > + * @author zhangyuan + * @date 2020/6/8 9:25 + */ + @GetMapping(value = "news/epdc-app/psychology/listUnansweredQuestion", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> listUnansweredQuestion(@RequestBody PsychologyUnansweredFormDTO fromDTO); + + /*** + * 工作端--待解答的心理咨询问题列表 + * @param fromDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result < PsychologyAnswerListResultDTO > + * @author zhangyuan + * @date 2020/6/8 9:25 + */ + @GetMapping(value = "news/epdc-app/psychology/listMyQuestion", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> 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); + +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkPropertyFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkPropertyFeignClient.java index 947d0fc..a4bcc77 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkPropertyFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/WorkPropertyFeignClient.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign; 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.conflict.form.ConflictMediateFormDTO; 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; @@ -47,13 +48,13 @@ public interface WorkPropertyFeignClient { Result> listMyQuestion(@RequestBody PsychologyAnswerFormDTO fromDTO); /*** - * 工作端--待解答的心理咨询问题列表 + * 工作端--矛盾纠纷提交 * @param fromDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result < PsychologyAnswerListResultDTO > + * @return com.elink.esua.epdc.commons.tools.utils.Result * @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); + @PostMapping(value = "news/epdc-app/conflictmediate/submit", consumes = MediaType.APPLICATION_JSON_VALUE) + Result submit(@RequestBody ConflictMediateFormDTO fromDTO); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkConflictFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkConflictFeignClientFallback.java new file mode 100644 index 0000000..083f485 --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkConflictFeignClientFallback.java @@ -0,0 +1,39 @@ +package com.elink.esua.epdc.feign.fallback; + +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; +import com.elink.esua.epdc.feign.WorkConflictFeignClient; +import com.elink.esua.epdc.feign.WorkPropertyFeignClient; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @Author zhangyuan + * @Date 2020/6/9 16:39 + */ +@Component +public class WorkConflictFeignClientFallback implements WorkConflictFeignClient { + + @Override + public Result> listUnansweredQuestion(PsychologyUnansweredFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listUnansweredQuestion", formDto); + } + + @Override + public Result> 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); + } + +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkPropertyFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkPropertyFeignClientFallback.java index d4a35d3..03e9010 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkPropertyFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/WorkPropertyFeignClientFallback.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign.fallback; 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.conflict.form.ConflictMediateFormDTO; 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; @@ -31,8 +32,8 @@ public class WorkPropertyFeignClientFallback implements WorkPropertyFeignClient } @Override - public Result submitAnswer(PsychologySubmitAnswerFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "submitAnswer", formDto); + public Result submit(ConflictMediateFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "submit", formDto); } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkConflictService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkConflictService.java new file mode 100644 index 0000000..6ba6ae3 --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkConflictService.java @@ -0,0 +1,52 @@ +package com.elink.esua.epdc.service; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO; +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 java.util.List; + + +/** + * @author: zhangyuan + * @Date: 2020/5/12 13:21 + * @Description: 心理咨询 + */ +public interface WorkConflictService { + + /** + * 工作端--待解答的心理咨询问题列表 + * + * @param formDto 查询参数 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangyuan + * @date 2020/6/8 09:15 + */ + Result> listUnansweredQuestion(PsychologyUnansweredFormDTO formDto); + + /** + * 工作端--心理咨询-我回答的问题列表 + * + * @param formDto 查询参数 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangyuan + * @date 2020/6/8 09:15 + */ + Result> listMyQuestion(PsychologyAnswerFormDTO formDto); + + + /** + * 工作端--矛盾纠纷提交 + * + * @param formDto 参数 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangyuan + * @date 2020/6/8 09:15 + */ + Result submit(ConflictMediateFormDTO formDto); + +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkConflictServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkConflictServiceImpl.java new file mode 100644 index 0000000..8c5319f --- /dev/null +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkConflictServiceImpl.java @@ -0,0 +1,46 @@ +package com.elink.esua.epdc.service.impl; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.conflict.form.ConflictMediateFormDTO; +import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO; +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.WorkPropertyFeignClient; +import com.elink.esua.epdc.service.WorkConflictService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + * @author: zhangyuan + * @Date: 2020/6/9 13:23 + * @Description: 心理咨询 + */ +@Service +public class WorkConflictServiceImpl implements WorkConflictService { + + @Autowired + private WorkPropertyFeignClient workPropertyFeignClient; + + @Override + public Result> listUnansweredQuestion(PsychologyUnansweredFormDTO formDto) { + + return workPropertyFeignClient.listUnansweredQuestion(formDto); + } + + @Override + public Result> listMyQuestion(PsychologyAnswerFormDTO formDto) { + + return workPropertyFeignClient.listMyQuestion(formDto); + } + + @Override + public Result submit(ConflictMediateFormDTO formDto) { + + return workPropertyFeignClient.submit(formDto); + } + +} diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkPropertyServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkPropertyServiceImpl.java index 5e4b54b..a7aa27c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkPropertyServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkPropertyServiceImpl.java @@ -40,7 +40,7 @@ public class WorkPropertyServiceImpl implements WorkPropertyService { @Override public Result submitAnswer(PsychologySubmitAnswerFormDTO formDto) { - return workPropertyFeignClient.submitAnswer(formDto); + return workPropertyFeignClient.submit(formDto); } }