From dcf56b3419f51d7c043f1289ae6fd1d86548c536 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Mon, 9 Sep 2019 14:22:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=BF=9B=E5=BA=A6=E6=8E=A5=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiIssueController.java | 13 +++++++++ .../esua/epdc/feign/IssueFeignClient.java | 12 ++++++++ .../fallback/IssueFeignClientFallback.java | 7 +++++ .../elink/esua/epdc/service/IssueService.java | 10 +++++++ .../epdc/service/impl/IssueServiceImpl.java | 6 ++++ .../result/IssueHandleProgressResultDTO.java | 28 +++++++++++++++++++ .../controller/EpdcAppIssueController.java | 18 +++++++++--- .../esua/epdc/modules/issue/dao/IssueDao.java | 12 +++++++- .../modules/issue/service/IssueService.java | 10 +++++++ .../issue/service/impl/IssueServiceImpl.java | 7 +++++ .../main/resources/mapper/issue/IssueDao.xml | 14 ++++++++++ 11 files changed, 132 insertions(+), 5 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueHandleProgressResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java index 65d6e046d..74a71e64a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java @@ -8,6 +8,7 @@ import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO; +import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; import com.elink.esua.epdc.service.IssueService; import org.springframework.beans.factory.annotation.Autowired; @@ -88,4 +89,16 @@ public class ApiIssueController { return issueService.getIssueCategoryStatistics(userDetail, categoryId); } + /** + * 议题处理进度 + * @Params: [issueId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/9 13:14 + */ + @GetMapping("progress/{issueId}") + public Result> issueHandleProgress(@PathVariable String issueId) { + return issueService.getIssueHandleProgress(issueId); + } + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java index 86a5f71d9..b113dd510 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java @@ -8,11 +8,13 @@ import com.elink.esua.epdc.dto.issue.form.IssueDetailFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO; +import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; import com.elink.esua.epdc.feign.fallback.IssueFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import java.util.List; @@ -64,4 +66,14 @@ public interface IssueFeignClient { */ @GetMapping(value = "events/epdc-app/issue/statistics", consumes = MediaType.APPLICATION_JSON_VALUE) Result issueCategoryStatistics(IssueCategoryStatisticsFormDTO formDto); + + /** + * 议题处理进度 + * @Params: [issueId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/9 13:31 + */ + @GetMapping(value = "events/epdc-app/issue/progress/{issueId}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> issueHandleProgress(@PathVariable String issueId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/IssueFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/IssueFeignClientFallback.java index b43b14aec..9e37dd072 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/IssueFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/IssueFeignClientFallback.java @@ -9,9 +9,11 @@ import com.elink.esua.epdc.dto.issue.form.IssueDetailFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO; +import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; import com.elink.esua.epdc.feign.IssueFeignClient; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.PathVariable; import java.util.List; @@ -41,4 +43,9 @@ public class IssueFeignClientFallback implements IssueFeignClient { public Result issueCategoryStatistics(IssueCategoryStatisticsFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "issueCategoryStatistics", formDto); } + + @Override + public Result> issueHandleProgress(String issueId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "issueHandleProgress", issueId); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java index 7e4cb65be..ad00eafc9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java @@ -7,6 +7,7 @@ import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO; +import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; import org.springframework.web.multipart.MultipartFile; @@ -63,4 +64,13 @@ public interface IssueService { * @Date: 2019/9/9 12:27 */ Result getIssueCategoryStatistics(TokenDto userDetail, String categoryId); + + /** + * 议题处理进度 + * @Params: [issueId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/9 13:28 + */ + Result> getIssueHandleProgress(String issueId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java index 6a1d0d9f1..4e96daebb 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java @@ -10,6 +10,7 @@ import com.elink.esua.epdc.dto.issue.form.IssueDetailFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO; +import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.feign.IssueFeignClient; @@ -86,4 +87,9 @@ public class IssueServiceImpl implements IssueService { formDto.setGridId(userDetail.getGridId()); return issueFeignClient.issueCategoryStatistics(formDto); } + + @Override + public Result> getIssueHandleProgress(String issueId) { + return issueFeignClient.issueHandleProgress(issueId); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueHandleProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueHandleProgressResultDTO.java new file mode 100644 index 000000000..27bcbaca1 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueHandleProgressResultDTO.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.dto.issue.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 议题处理进度DTO + * @Author LC + * @Date 2019/9/9 13:11 + */ +@Data +public class IssueHandleProgressResultDTO implements Serializable { + private static final long serialVersionUID = 2179111743827985376L; + + /** + * 处理状态 + */ + private String stateName; + /** + * 创建时间 + */ + private String createdTime; + /** + * 处理描述 + */ + private String advice; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java index 555a89d21..07bdcee49 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/EpdcAppIssueController.java @@ -8,13 +8,11 @@ import com.elink.esua.epdc.dto.issue.form.IssueDetailFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO; +import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; import com.elink.esua.epdc.modules.issue.service.IssueService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -68,4 +66,16 @@ public class EpdcAppIssueController { ValidatorUtils.validateEntity(formDto); return this.issueService.getIssueCategoryStatistics(formDto); } + + /** + * 议题处理进度 + * @Params: [issueId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/9 13:33 + */ + @GetMapping("progress/{issueId}") + public Result> issueHandleProgress(@PathVariable String issueId) { + return issueService.getIssueHandleProgress(issueId); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java index 39b69cf70..ad5d0a6a7 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java @@ -28,6 +28,7 @@ import com.elink.esua.epdc.dto.issue.form.IssueDetailFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO; +import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; import com.elink.esua.epdc.modules.issue.entity.IssueEntity; import org.apache.ibatis.annotations.Mapper; @@ -91,7 +92,7 @@ public interface IssueDao extends BaseDao { void updateCommentDelFlag(@Param("commentIds") String[] commentIds); /** - * 议题最新最热列表 + * 移动端-议题最新最热列表 * @Params: [formDto] * @Return: java.util.List * @Author: liuchuang @@ -108,4 +109,13 @@ public interface IssueDao extends BaseDao { */ IssueDetailResultDTO selectOneIssueDetail(IssueDetailFormDTO formDto); + /** + * 移动端-议题处理进度 + * @Params: [issueId] + * @Return: java.util.List + * @Author: liuchuang + * @Date: 2019/9/9 14:18 + */ + List selectListOfHandleProgress(String issueId); + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java index 3e0471258..a8d012102 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java @@ -31,6 +31,7 @@ import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueWaitHandleSubmitFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO; +import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; import com.elink.esua.epdc.modules.issue.entity.IssueEntity; @@ -176,4 +177,13 @@ public interface IssueService extends BaseService { * @Date: 2019/9/9 12:37 */ Result getIssueCategoryStatistics(IssueCategoryStatisticsFormDTO formDto); + + /** + * 议题处理进度 + * @Params: [issueId] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: liuchuang + * @Date: 2019/9/9 13:34 + */ + Result> getIssueHandleProgress(String issueId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index 563ec3c78..f083cef70 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -36,6 +36,7 @@ import com.elink.esua.epdc.dto.issue.form.IssueFormDTO; import com.elink.esua.epdc.dto.issue.form.IssueWaitHandleSubmitFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueDetailResultDTO; +import com.elink.esua.epdc.dto.issue.result.IssueHandleProgressResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; import com.elink.esua.epdc.modules.events.service.EpdcEventsService; import com.elink.esua.epdc.modules.issue.dao.IssueDao; @@ -226,6 +227,12 @@ public class IssueServiceImpl extends BaseServiceImpl imp return new Result().ok(resultDTO); } + @Override + public Result> getIssueHandleProgress(String issueId) { + List progressResultDTOS = baseDao.selectListOfHandleProgress(issueId); + return new Result>().ok(progressResultDTOS); + } + /** * 初始化项目 * @Params: [issueEntity] diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index f614b8293..6e789dc53 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -288,4 +288,18 @@ ORDER BY img.CREATED_TIME + +