From 53f71e2d45582ba5d991dd27d8bab3c43414cd1c Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 14 May 2020 10:57:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=AF=A6=E6=83=85=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/IssueController.java | 4 +- .../IssueSatisfactionDetailServiceImpl.java | 2 +- .../impl/IssueVoteDetailServiceImpl.java | 2 +- .../src/main/resources/mapper/IssueDao.xml | 7 +-- .../ProjectSatisfactionDetailServiceImpl.java | 2 +- .../com/epmet/feign/GovIssueFeignClient.java | 4 +- .../fallback/GovIssueFeignClientFallBack.java | 4 +- .../epmet/service/impl/IssueServiceImpl.java | 26 ++++++++--- .../src/main/resources/mapper/IssueDao.xml | 46 ------------------- 9 files changed, 32 insertions(+), 65 deletions(-) delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueDao.xml 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 9e6169f22b..f19e4e43ee 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 @@ -33,8 +33,8 @@ public class IssueController { * @author zxc * @date 2020/5/11 9:42 */ - @PostMapping(value = "/detail") - @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) + @PostMapping(value = "detail") +// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) public Result detail(@RequestBody IssueDetailFormDTO issueDetail){ return new Result().ok(issueService.detail(issueDetail)); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java index 37fb08814d..4b7bc5d837 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java @@ -147,7 +147,7 @@ public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java index df8fb0c47b..310d1f6bc0 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java @@ -185,7 +185,7 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl issueDetail(@RequestBody IssueDetailFormDTO issueDetail); + @PostMapping("/gov/issue/issue/detail") + Result detail(@RequestBody IssueDetailFormDTO issueDetail); /** * @Description 表决中议题详情——支持、反对数 diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java index 03ba888efa..0a9fb24d06 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java @@ -19,8 +19,8 @@ import java.util.List; public class GovIssueFeignClientFallBack implements GovIssueFeignClient { @Override - public Result issueDetail(IssueDetailFormDTO issueDetail) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "issueDetail", issueDetail); + public Result detail(IssueDetailFormDTO issueDetail) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "detail", issueDetail); } @Override 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 dd197c2d98..1ab6c5e96e 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 @@ -48,7 +48,7 @@ public class IssueServiceImpl implements IssueService { public IssueDetailResultDTO detail(IssueDetailFormDTO issueDetail) { IssueDetailResultDTO issueDetailResult = new IssueDetailResultDTO(); //议题信息 - Result issueResultDTOResult = govIssueFeignClient.issueDetail(issueDetail); + Result issueResultDTOResult = govIssueFeignClient.detail(issueDetail); IssueResultDTO issueResult = issueResultDTOResult.getData(); if (issueResult==null){ return issueDetailResult; @@ -58,22 +58,34 @@ public class IssueServiceImpl implements IssueService { IssueInitiatorFormDTO initiatorFormDTO = new IssueInitiatorFormDTO(); initiatorFormDTO.setUserId(issueResult.getUserId()); if (!StringUtils.isBlank(issueResult.getUserId())) { - Result initiatorResult = userFeignClient.selectIssueInitiator(initiatorFormDTO); - issueDetailResult.setIssueInitiator(initiatorResult.getData().getIssueInitiator()); + IssueInitiatorResultDTO initiatorResult = userFeignClient.selectIssueInitiator(initiatorFormDTO).getData(); + if (initiatorResult==null){ + issueDetailResult.setIssueInitiator(""); + }else { + issueDetailResult.setIssueInitiator(initiatorResult.getIssueInitiator()); + } } //网格名称 BelongGridNameFormDTO belongGridName = new BelongGridNameFormDTO(); belongGridName.setGridId(issueResult.getGridId()); if (!StringUtils.isBlank(issueResult.getGridId())) { - Result belongGridNameResult = govOrgFeignClient.getGridNameByGridId(belongGridName); - issueDetailResult.setBelongsGridName(belongGridNameResult.getData().getBelongsGridName()); + BelongGridNameResultDTO belongGridNameResult = govOrgFeignClient.getGridNameByGridId(belongGridName).getData(); + if (belongGridNameResult==null){ + issueDetailResult.setBelongsGridName(""); + }else { + issueDetailResult.setBelongsGridName(belongGridNameResult.getBelongsGridName()); + } } //话题信息 TopicInfoFormDTO topicInfoFormDTO = new TopicInfoFormDTO(); topicInfoFormDTO.setTopicId(issueResult.getTopicId()); if (!StringUtils.isBlank(issueResult.getTopicId())) { - Result topicInfoDTOResult = resiGroupFeignClient.selectDetail(topicInfoFormDTO); - issueDetailResult.setTopicInfo(topicInfoDTOResult.getData()); + TopicInfoDTO topicInfoDTOResult = resiGroupFeignClient.selectDetail(topicInfoFormDTO).getData(); + if (topicInfoDTOResult==null){ + issueDetailResult.setTopicInfo(new TopicInfoDTO()); + }else { + issueDetailResult.setTopicInfo(topicInfoDTOResult); + } } return issueDetailResult; } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueDao.xml deleted file mode 100644 index 5a93dcd218..0000000000 --- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueDao.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file