From 04d8684fe67e3617eb2f7fcdcfffb482f5267b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Mon, 10 Feb 2020 18:29:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E6=9E=90=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiAnalysisIssueController.java | 36 ++++++++++++++++ .../controller/ApiAnalysisItemController.java | 36 ++++++++++++++++ .../ApiAnalysisTopicController.java | 37 +++++++++++++++++ .../epdc/feign/AnalysisIssueFeignClient.java | 33 +++++++++++++++ .../epdc/feign/AnalysisItemFeignClient.java | 41 +++++++++++++++++++ .../epdc/feign/AnalysisTopicFeignClient.java | 33 +++++++++++++++ .../AnalysisIssueFeignClientFallback.java | 23 +++++++++++ .../AnalysisItemFeignClientFallback.java | 30 ++++++++++++++ .../AnalysisTopicFeignClientFallback.java | 23 +++++++++++ .../epdc/service/AnalysisIssueService.java | 22 ++++++++++ .../epdc/service/AnalysisItemService.java | 29 +++++++++++++ .../epdc/service/AnalysisTopicService.java | 22 ++++++++++ .../impl/AnalysisIssueServiceImpl.java | 28 +++++++++++++ .../service/impl/AnalysisItemServiceImpl.java | 36 ++++++++++++++++ .../impl/AnalysisTopicServiceImpl.java | 29 +++++++++++++ 15 files changed, 458 insertions(+) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisTopicController.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisItemFeignClient.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisTopicFeignClient.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisIssueFeignClientFallback.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisItemFeignClientFallback.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisTopicFeignClientFallback.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisItemService.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisTopicService.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisItemServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisTopicServiceImpl.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java new file mode 100644 index 000000000..8a7770d9a --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisIssueController.java @@ -0,0 +1,36 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.common.token.dto.TokenDto; +import com.elink.esua.epdc.commons.tools.annotation.LoginUser; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.service.AnalysisItemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 移动端接口-数据分析模块(项目) + * @Author LPF + * @Date 2019/11/18 13:32 + */ +@RestController +@RequestMapping("analysis/issue") +public class ApiAnalysisIssueController { + + @Autowired + private AnalysisItemService analysisIssueService; + + + /** + * 测试demo + + * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> + * @Author: lipengfei + * @Date: 2019/11/19 16:34 + */ + @GetMapping("test") + public Result test(@LoginUser TokenDto tokenDto) { + return analysisIssueService.test(); + } +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java new file mode 100644 index 000000000..ffef5f892 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisItemController.java @@ -0,0 +1,36 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.common.token.dto.TokenDto; +import com.elink.esua.epdc.commons.tools.annotation.LoginUser; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.service.AnalysisItemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 移动端接口-数据分析模块(项目) + * @Author LPF + * @Date 2019/11/18 13:32 + */ +@RestController +@RequestMapping("analysis/item") +public class ApiAnalysisItemController { + + @Autowired + private AnalysisItemService analysisItemService; + + + /** + * 测试demo + + * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> + * @Author: lipengfei + * @Date: 2019/11/19 16:34 + */ + @GetMapping("test") + public Result test(@LoginUser TokenDto tokenDto) { + return analysisItemService.test(); + } +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisTopicController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisTopicController.java new file mode 100644 index 000000000..2d6e6f961 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAnalysisTopicController.java @@ -0,0 +1,37 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.common.token.dto.TokenDto; +import com.elink.esua.epdc.commons.tools.annotation.LoginUser; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.service.AnalysisItemService; +import com.elink.esua.epdc.service.AnalysisTopicService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 移动端接口-数据分析模块(项目) + * @Author LPF + * @Date 2019/11/18 13:32 + */ +@RestController +@RequestMapping("analysis/topic") +public class ApiAnalysisTopicController { + + @Autowired + private AnalysisTopicService analysisTopicService; + + + /** + * 测试demo + + * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> + * @Author: lipengfei + * @Date: 2019/11/19 16:34 + */ + @GetMapping("test") + public Result test(@LoginUser TokenDto tokenDto) { + return analysisTopicService.test(); + } +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java new file mode 100644 index 000000000..c202dc3c6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisIssueFeignClient.java @@ -0,0 +1,33 @@ +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.feign.fallback.AnalysisIssueFeignClientFallback; +import com.elink.esua.epdc.feign.fallback.AnalysisItemFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * 评价模块调用-移动app端 + * @Author LPF + * @Date 2019/11/18 16:39 + */ +@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = AnalysisIssueFeignClientFallback.class, configuration = FeignRequestInterceptor.class) +public interface AnalysisIssueFeignClient { + + + + /** + * 测试 + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/19 16:42 + */ + @GetMapping(value = "analysis/item/test", consumes = MediaType.APPLICATION_JSON_VALUE) + Result test(); + + + +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisItemFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisItemFeignClient.java new file mode 100644 index 000000000..cfb4edf80 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisItemFeignClient.java @@ -0,0 +1,41 @@ +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.evaluate.form.EvaluateOfficerAppFormDTO; +import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO; +import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO; +import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO; +import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO; +import com.elink.esua.epdc.feign.fallback.AnalysisItemFeignClientFallback; +import com.elink.esua.epdc.feign.fallback.EvaluateFeignClientFallback; +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 java.util.List; + +/** + * 评价模块调用-移动app端 + * @Author LPF + * @Date 2019/11/18 16:39 + */ +@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = AnalysisItemFeignClientFallback.class, configuration = FeignRequestInterceptor.class) +public interface AnalysisItemFeignClient { + + + + /** + * 测试 + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/19 16:42 + */ + @GetMapping(value = "analysis/item/test", consumes = MediaType.APPLICATION_JSON_VALUE) + Result test(); + + + +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisTopicFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisTopicFeignClient.java new file mode 100644 index 000000000..1fae8321c --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisTopicFeignClient.java @@ -0,0 +1,33 @@ +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.feign.fallback.AnalysisIssueFeignClientFallback; +import com.elink.esua.epdc.feign.fallback.AnalysisTopicFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * 评价模块调用-移动app端 + * @Author LPF + * @Date 2019/11/18 16:39 + */ +@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = AnalysisTopicFeignClientFallback.class, configuration = FeignRequestInterceptor.class) +public interface AnalysisTopicFeignClient { + + + + /** + * 测试 + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/19 16:42 + */ + @GetMapping(value = "analysis/item/test", consumes = MediaType.APPLICATION_JSON_VALUE) + Result test(); + + + +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisIssueFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisIssueFeignClientFallback.java new file mode 100644 index 000000000..9e263de49 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisIssueFeignClientFallback.java @@ -0,0 +1,23 @@ +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.feign.AnalysisIssueFeignClient; + +import org.springframework.stereotype.Component; + +/** + * @Author LPF + * @Date 2019/11/18 16:39 + */ +@Component +public class AnalysisIssueFeignClientFallback implements AnalysisIssueFeignClient { + + + @Override + public Result test() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "test"); + } + +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisItemFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisItemFeignClientFallback.java new file mode 100644 index 000000000..ba4362c95 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisItemFeignClientFallback.java @@ -0,0 +1,30 @@ +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.evaluate.form.EvaluateOfficerAppFormDTO; +import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO; +import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO; +import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO; +import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO; +import com.elink.esua.epdc.feign.AnalysisItemFeignClient; +import com.elink.esua.epdc.feign.EvaluateFeignClient; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @Author LPF + * @Date 2019/11/18 16:39 + */ +@Component +public class AnalysisItemFeignClientFallback implements AnalysisItemFeignClient { + + + @Override + public Result test() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "test"); + } + +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisTopicFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisTopicFeignClientFallback.java new file mode 100644 index 000000000..1feb529b6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisTopicFeignClientFallback.java @@ -0,0 +1,23 @@ +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.feign.AnalysisIssueFeignClient; +import com.elink.esua.epdc.feign.AnalysisTopicFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Author LPF + * @Date 2019/11/18 16:39 + */ +@Component +public class AnalysisTopicFeignClientFallback implements AnalysisTopicFeignClient { + + + @Override + public Result test() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "test"); + } + +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java new file mode 100644 index 000000000..d1c5e4bfc --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisIssueService.java @@ -0,0 +1,22 @@ +package com.elink.esua.epdc.service; + +import com.elink.esua.epdc.commons.tools.utils.Result; + +/** + * 项目模块-数据分析移动端 + * @Author LPF + * @Date 2019/11/18 13:34 + */ +public interface AnalysisIssueService { + + + /** + * 测试模块 + * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> + * @Author: lipengfei + * @Date: 2019/11/19 16:37 + */ + Result test(); + + +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisItemService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisItemService.java new file mode 100644 index 000000000..ce06dc96d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisItemService.java @@ -0,0 +1,29 @@ +package com.elink.esua.epdc.service; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO; +import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO; +import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO; +import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO; +import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO; + +import java.util.List; + +/** + * 项目模块-数据分析移动端 + * @Author LPF + * @Date 2019/11/18 13:34 + */ +public interface AnalysisItemService { + + + /** + * 测试模块 + * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> + * @Author: lipengfei + * @Date: 2019/11/19 16:37 + */ + Result test(); + + +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisTopicService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisTopicService.java new file mode 100644 index 000000000..145d55187 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AnalysisTopicService.java @@ -0,0 +1,22 @@ +package com.elink.esua.epdc.service; + +import com.elink.esua.epdc.commons.tools.utils.Result; + +/** + * 项目模块-数据分析移动端 + * @Author LPF + * @Date 2019/11/18 13:34 + */ +public interface AnalysisTopicService { + + + /** + * 测试模块 + * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> + * @Author: lipengfei + * @Date: 2019/11/19 16:37 + */ + Result test(); + + +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java new file mode 100644 index 000000000..fc7669c5d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisIssueServiceImpl.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.service.impl; + + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.feign.AnalysisIssueFeignClient; +import com.elink.esua.epdc.service.AnalysisIssueService; +import com.elink.esua.epdc.service.AnalysisItemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * 项目模块-移动app端 + * @Author LPF + * @Date 2019/11/18 16:34 + */ +@Service +public class AnalysisIssueServiceImpl implements AnalysisIssueService { + + @Autowired + private AnalysisIssueFeignClient analysisIssueFeignClient; + + + + @Override + public Result test() { + return analysisIssueFeignClient.test(); + } +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisItemServiceImpl.java new file mode 100644 index 000000000..7cf5ed304 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisItemServiceImpl.java @@ -0,0 +1,36 @@ +package com.elink.esua.epdc.service.impl; + + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO; +import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO; +import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO; +import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO; +import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO; +import com.elink.esua.epdc.feign.AnalysisItemFeignClient; +import com.elink.esua.epdc.feign.EvaluateFeignClient; +import com.elink.esua.epdc.service.AnalysisItemService; +import com.elink.esua.epdc.service.EvaluateService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 项目模块-移动app端 + * @Author LPF + * @Date 2019/11/18 16:34 + */ +@Service +public class AnalysisItemServiceImpl implements AnalysisItemService { + + @Autowired + private AnalysisItemFeignClient analysisItemFeignClient; + + + + @Override + public Result test() { + return analysisItemFeignClient.test(); + } +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisTopicServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisTopicServiceImpl.java new file mode 100644 index 000000000..582b1ff6b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisTopicServiceImpl.java @@ -0,0 +1,29 @@ +package com.elink.esua.epdc.service.impl; + + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.feign.AnalysisIssueFeignClient; +import com.elink.esua.epdc.feign.AnalysisTopicFeignClient; +import com.elink.esua.epdc.service.AnalysisIssueService; +import com.elink.esua.epdc.service.AnalysisTopicService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * 项目模块-移动app端 + * @Author LPF + * @Date 2019/11/18 16:34 + */ +@Service +public class AnalysisTopicServiceImpl implements AnalysisTopicService { + + @Autowired + private AnalysisTopicFeignClient analysisTopicFeignClient; + + + + @Override + public Result test() { + return analysisTopicFeignClient.test(); + } +} From ac1c73a3549cfcedb5518f8a4fe8e0eb714a14f9 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Mon, 10 Feb 2020 20:04:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=AA=E8=A7=A3=E5=86=B3=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/result/UnsolvedItemResultDTO.java | 57 +++++++++++++++++++ .../item/controller/ItemController.java | 13 +++++ .../esua/epdc/modules/item/dao/ItemDao.java | 10 ++++ .../modules/item/service/ItemService.java | 10 ++++ .../item/service/impl/ItemServiceImpl.java | 18 ++++++ .../main/resources/mapper/item/ItemDao.xml | 51 +++++++++++++++++ 6 files changed, 159 insertions(+) create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java new file mode 100644 index 000000000..14fd2efe8 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java @@ -0,0 +1,57 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 未解决项目列表 + * @Author yinzuomei + * @Date 2020/2/10 18:58 + */ +@Data +public class UnsolvedItemResultDTO implements Serializable { + private static final long serialVersionUID = 7659596790013430029L; + /** + * epdc_item表主键 + */ + private String id; + + /** + * 议题内容-项目摘要 + */ + private String itemContent; + + /** + * 发布时间 + */ + private Date releaseTime; + + /** + * 所有部门 + */ + private String allDeptNames; + + /** + * 发布人用户昵称 + */ + private String nickName; + + /** + * 处理次数 + */ + private Integer solveNum; + + /** + *最新进展处理时间 + */ + private Date latestHandleTime; + + /** + * 最新进展处理部门 + */ + private String latestHandleDeptName; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index d0e230492..1ecb34a5f 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.item.controller; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO; import com.elink.esua.epdc.modules.item.service.ItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -56,4 +57,16 @@ public class ItemController { return new Result>().ok(page); } + /** + * @param params + * @return com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO + * @Author yinzuomei + * @Description 未解决项目列表查询 + * @Date 2020/2/10 19:08 + **/ + @GetMapping("pageUnsolvedItem") + public Result> pageUnsolvedItem(@RequestParam Map params) { + PageData page = itemService.listUnsolvedItemResultDTO(params); + return new Result>().ok(page); + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index 81319ce3e..6e83edcad 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.item.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -39,4 +40,13 @@ public interface ItemDao extends BaseDao { * @Date 2020/2/10 13:53 **/ List selectListHottestItemResultDTO(Map params); + + /** + * @param params + * @return java.util.List + * @Author yinzuomei + * @Description 未解决项目列表查询 + * @Date 2020/2/10 19:16 + **/ + List selectListUnsolvedItemResultDTO(Map params); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index eedbbc6ba..2c30cedd0 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.modules.item.service; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO; import java.util.Map; @@ -21,4 +22,13 @@ public interface ItemService { * @Date 2020/2/10 13:46 **/ PageData listItemResultDTO(Map params); + + /** + * @param params + * @return com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO + * @Author yinzuomei + * @Description 未解决项目列表查询 + * @Date 2020/2/10 19:11 + **/ + PageData listUnsolvedItemResultDTO(Map params); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index c6a499082..ebca0a70a 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -8,6 +8,7 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.datasources.DataSourceNames; import com.elink.esua.epdc.datasources.annotation.DataSource; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO; import com.elink.esua.epdc.modules.item.dao.ItemDao; import com.elink.esua.epdc.modules.item.service.ItemService; import org.springframework.stereotype.Service; @@ -38,4 +39,21 @@ public class ItemServiceImpl extends BaseServiceImpl imp List list = baseDao.selectListHottestItemResultDTO(params); return new PageData<>(list, page.getTotal()); } + + /** + * @param params + * @return com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO + * @Author yinzuomei + * @Description 未解决项目列表查询 + * @Date 2020/2/10 19:13 + **/ + @Override + @DataSource(name = DataSourceNames.FOURTH) + public PageData listUnsolvedItemResultDTO(Map params) { + UserDetail userDetail = SecurityUser.getUser(); + params.put("deptIdList", userDetail.getDeptIdList()); + IPage page = getPage(params); + List list = baseDao.selectListUnsolvedItemResultDTO(params); + return new PageData<>(list, page.getTotal()); + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemDao.xml index d2dca2d1d..7b04ebb77 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemDao.xml @@ -50,4 +50,55 @@ ORDER BY expressAttitudeNum DESC + + +