From e000b43a2131856d8143ec64c450b623a16d91cb Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 27 Jul 2021 17:52:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E7=BE=A4=E8=AE=AE=E4=BA=8BUI=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/feign/GovIssueOpenFeignClient.java | 4 + .../GovIssueOpenFeignClientFallBack.java | 5 + .../com/epmet/controller/IssueController.java | 6 + .../src/main/java/com/epmet/dao/IssueDao.java | 9 ++ .../java/com/epmet/service/IssueService.java | 9 ++ .../epmet/service/impl/IssueServiceImpl.java | 44 +++++++ .../src/main/resources/mapper/IssueDao.xml | 16 +++ .../dto/form/ShiftProjectListFromDTO.java | 0 .../epmet/dto/result/PendingResultDTO.java | 32 ++++++ .../epmet/dto/result/ResolvedResultDTO.java | 53 +++++++++ .../epmet/dto/result/UnResolvedResultDTO.java | 53 +++++++++ .../feign/GovProjectOpenFeignClient.java | 31 +++++ .../GovProjectOpenFeignClientFallback.java | 39 +++++++ .../epmet/controller/ProjectController.java | 37 ++++++ .../main/java/com/epmet/dao/ProjectDao.java | 33 ++++++ .../com/epmet/service/ProjectService.java | 27 +++++ .../service/impl/ProjectServiceImpl.java | 47 ++++++++ .../src/main/resources/mapper/ProjectDao.xml | 62 ++++++++++ .../com/epmet/controller/IssueController.java | 36 ++++++ .../java/com/epmet/service/IssueService.java | 30 +++++ .../epmet/service/impl/IssueServiceImpl.java | 107 ++++++++++++++++++ 21 files changed, 680 insertions(+) rename epmet-module/{gov-issue/gov-issue-client => gov-project/gov-project-client}/src/main/java/com/epmet/dto/form/ShiftProjectListFromDTO.java (100%) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResolvedResultDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UnResolvedResultDTO.java diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java index a5179ea765..7fe71f737a 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java @@ -336,4 +336,8 @@ public interface GovIssueOpenFeignClient { */ @PostMapping(value = "/gov/issue/issueprojectcategorydict/getprojectcategory") Result> getProjectCategory(@RequestBody List list); + + + @PostMapping("/gov/issue/issue/unresolvedlist") + Result> getUnresolvedList(@RequestBody ShiftProjectListFromDTO formDTO); } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java index 6808afaee5..786a2e1a56 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java @@ -276,4 +276,9 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient public Result> getProjectCategory(List list) { return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getProjectCategory", list); } + + @Override + public Result> getUnresolvedList(ShiftProjectListFromDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getUnresolvedList", formDTO); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index 4f1125b356..cec85e03e5 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -278,5 +278,11 @@ public class IssueController { return new Result>().ok(issueService.canEvaluateProjectCountBatch(issueIds)); } + + @PostMapping("unresolvedlist") + public Result> getUnresolvedList(@RequestBody ShiftProjectListFromDTO formDTO){ + return new Result>().ok(issueService.getUnResolvedList(formDTO)); + } + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index e1f1e0f476..be1c4ee25b 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -216,4 +216,13 @@ public interface IssueDao extends BaseDao { * @Date 2020/12/25 14:12 **/ List selectIssueRedDot(@Param("gridIdList") List gridIdList); + + /** + * 无需解决列表 + * @author zhaoqifeng + * @date 2021/7/27 16:52 + * @param gridId + * @return java.util.List + */ + List selectUnResolvedList(@Param("gridId") String gridId); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java index dd1eb23013..af7ec1b7a5 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java @@ -341,4 +341,13 @@ public interface IssueService extends BaseService { * @date 2021/5/11 4:50 下午 */ List canEvaluateProjectCountBatch(List issueIds); + + /** + * 无需解决解决列表 + * @author zhaoqifeng + * @date 2021/7/27 16:58 + * @param fromDTO + * @return java.util.List + */ + List getUnResolvedList(ShiftProjectListFromDTO fromDTO); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index b1f1701e75..1a131bb685 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -127,6 +127,8 @@ public class IssueServiceImpl extends BaseServiceImpl imp private IssueVoteDetailDao issueVoteDetailDao; @Autowired private EpmetMessageOpenFeignClient messageOpenFeignClient; + @Autowired + private GovProjectOpenFeignClient govProjectOpenFeignClient; @Value("${openapi.scan.server.url}") @@ -1507,4 +1509,46 @@ public class IssueServiceImpl extends BaseServiceImpl imp return result; } + /** + * 无需解决解决列表 + * + * @param fromDTO + * @return java.util.List + * @author zhaoqifeng + * @date 2021/7/27 16:58 + */ + @Override + public List getUnResolvedList(ShiftProjectListFromDTO fromDTO) { + List resultList = new ArrayList<>(); + List issueList = baseDao.selectUnResolvedList(fromDTO.getGridId()); + if (CollectionUtils.isNotEmpty(issueList)) { + resultList.addAll(issueList); + } + List projectList = govProjectOpenFeignClient.getUnResolvedList(fromDTO).getData(); + if (CollectionUtils.isNotEmpty(projectList)) { + resultList.addAll(projectList); + } + if (CollectionUtils.isNotEmpty(resultList)) { + resultList = resultList.stream().sorted(Comparator.comparing(UnResolvedResultDTO::getClosedTime).reversed()).collect(Collectors.toList()); + int fromIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize(); + int toIndex = fromDTO.getPageNo() * fromDTO.getPageSize(); + if (fromIndex >= resultList.size()) { + return new ArrayList<>(); + } + if (toIndex > resultList.size()) { + toIndex = resultList.size(); + } + resultList = resultList.subList(fromIndex, toIndex); + } + return resultList; + } + + public static void main(String[] args) { + List list = new ArrayList<>(); + list.add("1"); + list.add("2"); + list.add("3"); + System.out.println(list.subList(0, 3)); + } + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 498d2ab252..f12b363cc7 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -235,6 +235,7 @@ DEL_FLAG = '0' AND GRID_ID = #{gridId} AND ISSUE_STATUS = 'closed' + AND RESOLVE_TYPE = 'resolved' ORDER BY created_time DESC LIMIT #{pageNo}, @@ -561,4 +562,19 @@ GROUP BY temp.gridId + \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShiftProjectListFromDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ShiftProjectListFromDTO.java similarity index 100% rename from epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShiftProjectListFromDTO.java rename to epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ShiftProjectListFromDTO.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java new file mode 100644 index 0000000000..d469915f90 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/PendingResultDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2021/7/27 10:47 + */ + +@NoArgsConstructor +@Data +public class PendingResultDTO implements Serializable { + + private static final long serialVersionUID = 2545519820222637112L; + private String issueId; + private String issueTitle; + private Long issueShiftedTime; + private String topicContent; + private List currentHandleDepartMent; + private List topicVoices; + private List topicImgs; + @JsonIgnore + private String sourceId; + @JsonIgnore + private String projectId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResolvedResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResolvedResultDTO.java new file mode 100644 index 0000000000..644a4d33cd --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ResolvedResultDTO.java @@ -0,0 +1,53 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2021/7/27 13:55 + */ +@Data +public class ResolvedResultDTO implements Serializable { + private static final long serialVersionUID = -6670213622289052352L; + /** + * 议题Id + */ + private String issueId; + /** + * 议题标题 + */ + private String issueTitle; + /** + * 转成项目时间 + */ + private Long closedTime; + + /** + * 结案说明 + */ + private String publicReply; + + /** + * 来源id + */ + private String sourceId; + + /** + * 话题图片 + */ + private List topicImgs; + + /** + * 话题语音 + */ + private List topicVoices; + + /** + * 话题内容 + */ + private String topicContent; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UnResolvedResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UnResolvedResultDTO.java new file mode 100644 index 0000000000..f803df9fc6 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UnResolvedResultDTO.java @@ -0,0 +1,53 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2021/7/27 10:31 + */ +@Data +public class UnResolvedResultDTO implements Serializable { + private static final long serialVersionUID = 3654271828450408782L; + /** + * 议题Id + */ + private String issueId; + /** + * 议题标题 + */ + private String issueTitle; + /** + * 转成项目时间 + */ + private Long closedTime; + + /** + * 结案说明 + */ + private String solution; + + /** + * 来源id + */ + private String sourceId; + + /** + * 话题图片 + */ + private List topicImgs; + + /** + * 话题语音 + */ + private List topicVoices; + + /** + * 话题内容 + */ + private String topicContent; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java index 7bd2b95f31..28d29e8e64 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java @@ -92,4 +92,35 @@ public interface GovProjectOpenFeignClient { */ @PostMapping("gov/project/project/patrolproject") Result selectPatrolProject(@RequestBody PatrolProjectFormDTO formDTO); + + + /** + * 获取待处理列表 + * @author zhaoqifeng + * @date 2021/7/27 14:55 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("gov/project/project/pendinglist") + Result> getPendingList(@RequestBody ShiftProjectListFromDTO formDTO); + + /** + * 已解决项目列表 + * @author zhaoqifeng + * @date 2021/7/27 14:55 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("gov/project/project/resolvedlist") + Result> getResolvedList(@RequestBody ShiftProjectListFromDTO formDTO); + + /** + * 无需解决项目列表 + * @author zhaoqifeng + * @date 2021/7/27 14:55 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("gov/project/project/unresolvedlist") + Result> getUnResolvedList(@RequestBody ShiftProjectListFromDTO formDTO); } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java index cb2dbf1abd..4fbd2cb509 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java @@ -80,4 +80,43 @@ public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignCli public Result selectPatrolProject(PatrolProjectFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "selectPatrolProject", formDTO); } + + /** + * 获取待处理列表 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + * @author zhaoqifeng + * @date 2021/7/27 14:55 + */ + @Override + public Result> getPendingList(ShiftProjectListFromDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "getPendingList", formDTO); + } + + /** + * 已解决项目列表 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + * @author zhaoqifeng + * @date 2021/7/27 14:55 + */ + @Override + public Result> getResolvedList(ShiftProjectListFromDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "getResolvedList", formDTO); + } + + /** + * 无需解决项目列表 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + * @author zhaoqifeng + * @date 2021/7/27 14:55 + */ + @Override + public Result> getUnResolvedList(ShiftProjectListFromDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "getUnResolvedList", formDTO); + } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index 1c1460b3cb..46de571a19 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -234,4 +234,41 @@ public class ProjectController { return new Result().ok(projectService.selectPatrolProject(formDTO)); } + + /** + * 获取待处理列表 + * @author zhaoqifeng + * @date 2021/7/27 14:55 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("pendinglist") + public Result> getPendingList(@RequestBody ShiftProjectListFromDTO formDTO){ + return new Result>().ok(projectService.getPendingList(formDTO)); + } + + /** + * 已解决项目列表 + * @author zhaoqifeng + * @date 2021/7/27 14:55 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("resolvedlist") + public Result> getResolvedList(@RequestBody ShiftProjectListFromDTO formDTO){ + return new Result>().ok(projectService.getResolvedListByGrid(formDTO)); + } + + /** + * 无需解决项目列表 + * @author zhaoqifeng + * @date 2021/7/27 14:55 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("unresolvedlist") + public Result> getUnResolvedList(@RequestBody ShiftProjectListFromDTO formDTO){ + return new Result>().ok(projectService.getUnResolvedListByGrid(formDTO)); + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index 38176df2ad..d5c2dbab5d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -173,4 +173,37 @@ public interface ProjectDao extends BaseDao { * @date 2021/7/1 10:16 上午 */ Integer selectPatrolProject(PatrolProjectFormDTO formDTO); + + /** + * 获取党建声音处理中列表 + * @author zhaoqifeng + * @date 2021/7/27 10:28 + * @param gridId + * @param pageNo + * @param pageSize + * @return java.util.List + */ + List selectPendingListByGrid(@Param("gridId")String gridId, @Param("pageNo") Integer pageNo, + @Param("pageSize") Integer pageSize); + + /** + * 获取党建声音已结案列表 + * @author zhaoqifeng + * @date 2021/7/27 10:28 + * @param gridId + * @param pageNo + * @param pageSize + * @return java.util.List + */ + List selectResolvedListByGrid(@Param("gridId")String gridId, @Param("pageNo") Integer pageNo, + @Param("pageSize") Integer pageSize); + + /** + * 无需解决列表 + * @author zhaoqifeng + * @date 2021/7/27 14:38 + * @param gridId + * @return java.util.List + */ + List selectUnResolvedListByGrid(@Param("gridId")String gridId); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java index f04d8f050a..7a5ac21888 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java @@ -303,4 +303,31 @@ public interface ProjectService extends BaseService { * @date 2021/7/1 10:16 上午 */ Integer selectPatrolProject(PatrolProjectFormDTO formDTO); + + /** + * 获取待处理列表 + * @author zhaoqifeng + * @date 2021/7/27 14:18 + * @param fromDTO + * @return java.util.List + */ + List getPendingList(ShiftProjectListFromDTO fromDTO); + + /** + * 已解决项目列表 + * @author zhaoqifeng + * @date 2021/7/27 14:36 + * @param fromDTO + * @return java.util.List + */ + List getResolvedListByGrid(ShiftProjectListFromDTO fromDTO); + + /** + * 无需解决项目列表 + * @author zhaoqifeng + * @date 2021/7/27 14:40 + * @param fromDTO + * @return java.util.List + */ + List getUnResolvedListByGrid(ShiftProjectListFromDTO fromDTO); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index d721ccad51..f15a2a7c24 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2706,4 +2706,51 @@ public class ProjectServiceImpl extends BaseServiceImpl + * @author zhaoqifeng + * @date 2021/7/27 14:18 + */ + @Override + public List getPendingList(ShiftProjectListFromDTO fromDTO) { + int pageIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize(); + List list = baseDao.selectPendingListByGrid(fromDTO.getGridId(), pageIndex, fromDTO.getPageSize()); + list.forEach(item -> { + ProjectDTO dto = new ProjectDTO(); + dto.setId(item.getProjectId()); + item.setCurrentHandleDepartMent(baseDao.selectDepartmentNameList(dto)); + }); + return list; + } + + /** + * 已解决项目列表 + * + * @param fromDTO + * @return java.util.List + * @author zhaoqifeng + * @date 2021/7/27 14:36 + */ + @Override + public List getResolvedListByGrid(ShiftProjectListFromDTO fromDTO) { + int pageIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize(); + return baseDao.selectResolvedListByGrid(fromDTO.getGridId(), pageIndex, fromDTO.getPageSize()); + } + + /** + * 无需解决项目列表 + * + * @param fromDTO + * @return java.util.List + * @author zhaoqifeng + * @date 2021/7/27 14:40 + */ + @Override + public List getUnResolvedListByGrid(ShiftProjectListFromDTO fromDTO) { + return baseDao.selectUnResolvedListByGrid(fromDTO.getGridId()); + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 265ef3bcc6..5940f47003 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -316,5 +316,67 @@ AND ORIGIN = 'agency' AND CREATED_BY = #{userId} + + + \ No newline at end of file diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java index f790c9b769..e3c06ede7a 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java @@ -235,5 +235,41 @@ public class IssueController { PublishSuggestionResultDTO resultDTO=issueService.publisSuggestion(formDTO); return new Result().ok(resultDTO); } + + /** + * 处理中列表 + * @author zhaoqifeng + * @date 2021/7/27 17:50 + * @param fromDTO + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("processing") + public Result> processingList(@RequestBody ShiftProjectListFromDTO fromDTO){ + return new Result>().ok(issueService.getProcessing(fromDTO)); + } + + /** + * 已结案列表 + * @author zhaoqifeng + * @date 2021/7/27 17:50 + * @param fromDTO + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("closedproject") + public Result> closedProject(@RequestBody ShiftProjectListFromDTO fromDTO){ + return new Result>().ok(issueService.getClosedProjectList(fromDTO)); + } + + /** + * 无需解决列表 + * @author zhaoqifeng + * @date 2021/7/27 17:50 + * @param fromDTO + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("unreslovedlist") + public Result> unResolvedList(@RequestBody ShiftProjectListFromDTO fromDTO){ + return new Result>().ok(issueService.getUnResolvedList(fromDTO)); + } } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java index 7196ee7717..c75ab67fa8 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java @@ -127,4 +127,34 @@ public interface IssueService { * @date 2021.05.19 10:52 */ List getClosedList(CommonIssueListFormDTO issueListFormDTO); + + /** + * 处理中项目列表 + * @author zhaoqifeng + * @date 2021/7/26 17:46 + * @param formDTO + * @return java.util.List + */ + List getProcessing(ShiftProjectListFromDTO formDTO); + + + /** + * 已结案项目列表 + * @author zhaoqifeng + * @date 2021/7/27 15:51 + * @param formDTO + * @return java.util.List + */ + List getClosedProjectList(ShiftProjectListFromDTO formDTO); + + /** + * 无需解决项目议题列表 + * @author zhaoqifeng + * @date 2021/7/27 17:45 + * @param formDTO + * @return java.util.List + */ + List getUnResolvedList(ShiftProjectListFromDTO formDTO); + + } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index d01104d40f..97ea4918b7 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -54,6 +54,8 @@ public class IssueServiceImpl implements IssueService { private LoginUserUtil loginUserUtil; @Autowired private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + @Autowired + private GovProjectOpenFeignClient govProjectOpenFeignClient; @Autowired private ResiGroupOpenFeignClient resiGroupOpenFeignClient; @@ -468,4 +470,109 @@ public class IssueServiceImpl implements IssueService { return issueList; } + + /** + * 处理中项目列表 + * + * @param formDTO + * @return java.util.List + * @author zhaoqifeng + * @date 2021/7/26 17:46 + */ + @Override + public List getProcessing(ShiftProjectListFromDTO formDTO) { + List resultList = govProjectOpenFeignClient.getPendingList(formDTO).getData(); + if (org.apache.commons.collections4.CollectionUtils.isEmpty(resultList)) { + return new ArrayList<>(); + } + + List topicIds = resultList.stream().map(PendingResultDTO::getSourceId).collect(Collectors.toList()); + TopicDetailBatchFormDTO form = new TopicDetailBatchFormDTO(); + form.setTopicIdList(topicIds); + Result> topicDetailsResult = resiGroupOpenFeignClient.listTopicDetailsByIds(form); + if (!topicDetailsResult.success()) { + logger.error("调用resi-group批量查询详情失败"); + } else { + List topicDetails = topicDetailsResult.getData(); + HashMap rtm = convertTopicDetailList2Map(topicDetails); + resultList.forEach(vi -> { + ResiTopicDetailResultDTO rr = rtm.get(vi.getSourceId()); + vi.setTopicImgs(rr == null ? new ArrayList<>() : rr.getTopicImgs()); + vi.setTopicVoices(rr == null ? new ArrayList<>() : rr.getTopicImgs()); + vi.setTopicContent(rr == null ? "" : rr.getTopicContent()); + }); + } + + return resultList; + } + + /** + * 已结案项目列表 + * + * @param formDTO + * @return java.util.List + * @author zhaoqifeng + * @date 2021/7/27 15:51 + */ + @Override + public List getClosedProjectList(ShiftProjectListFromDTO formDTO) { + List resultList = govProjectOpenFeignClient.getResolvedList(formDTO).getData(); + if (org.apache.commons.collections4.CollectionUtils.isEmpty(resultList)) { + return new ArrayList<>(); + } + + List topicIds = resultList.stream().map(ResolvedResultDTO::getSourceId).collect(Collectors.toList()); + TopicDetailBatchFormDTO form = new TopicDetailBatchFormDTO(); + form.setTopicIdList(topicIds); + Result> topicDetailsResult = resiGroupOpenFeignClient.listTopicDetailsByIds(form); + if (!topicDetailsResult.success()) { + logger.error("调用resi-group批量查询详情失败"); + } else { + List topicDetails = topicDetailsResult.getData(); + HashMap rtm = convertTopicDetailList2Map(topicDetails); + resultList.forEach(vi -> { + ResiTopicDetailResultDTO rr = rtm.get(vi.getSourceId()); + vi.setTopicImgs(rr == null ? new ArrayList<>() : rr.getTopicImgs()); + vi.setTopicVoices(rr == null ? new ArrayList<>() : rr.getTopicImgs()); + vi.setTopicContent(rr == null ? "" : rr.getTopicContent()); + }); + } + + return resultList; + } + + /** + * 无需解决项目议题列表 + * + * @param formDTO + * @return java.util.List + * @author zhaoqifeng + * @date 2021/7/27 17:45 + */ + @Override + public List getUnResolvedList(ShiftProjectListFromDTO formDTO) { + List resultList = govIssueOpenFeignClient.getUnresolvedList(formDTO).getData(); + if (org.apache.commons.collections4.CollectionUtils.isEmpty(resultList)) { + return new ArrayList<>(); + } + + List topicIds = resultList.stream().map(UnResolvedResultDTO::getSourceId).collect(Collectors.toList()); + TopicDetailBatchFormDTO form = new TopicDetailBatchFormDTO(); + form.setTopicIdList(topicIds); + Result> topicDetailsResult = resiGroupOpenFeignClient.listTopicDetailsByIds(form); + if (!topicDetailsResult.success()) { + logger.error("调用resi-group批量查询详情失败"); + } else { + List topicDetails = topicDetailsResult.getData(); + HashMap rtm = convertTopicDetailList2Map(topicDetails); + resultList.forEach(vi -> { + ResiTopicDetailResultDTO rr = rtm.get(vi.getSourceId()); + vi.setTopicImgs(rr == null ? new ArrayList<>() : rr.getTopicImgs()); + vi.setTopicVoices(rr == null ? new ArrayList<>() : rr.getTopicImgs()); + vi.setTopicContent(rr == null ? "" : rr.getTopicContent()); + }); + } + + return resultList; + } }