From cc6906183d3e131ddb89530f445e531fdf55087c Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 18 May 2020 10:27:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=8F=82=E6=95=B0=E5=B1=9E=E6=80=A7=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=EF=BC=8C=E5=B1=85=E6=B0=91=E6=AE=B5=E6=94=BF=E5=BA=9C=E7=AB=AF?= =?UTF-8?q?=E8=A1=A8=E5=86=B3=E4=B8=AD=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/GovTopicOfIssueInfoResultDTO.java | 2 +- .../main/java/com/epmet/controller/IssueManageController.java | 3 +++ .../group/dto/topic/result/GovTopicIssueInfoResultDTO.java | 2 +- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 4 ++-- .../src/main/java/com/epmet/controller/IssueController.java | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GovTopicOfIssueInfoResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GovTopicOfIssueInfoResultDTO.java index 9473fcae6e..04563a33a7 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GovTopicOfIssueInfoResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GovTopicOfIssueInfoResultDTO.java @@ -32,7 +32,7 @@ public class GovTopicOfIssueInfoResultDTO implements Serializable { /** * 话题发表人（山东路168-尹女士） */ - private String publishedUser; + private String topicPublisher; /** * 话题发表时间 (时间戳 毫秒级) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java index ac058620f8..267788393a 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java @@ -119,6 +119,7 @@ public class IssueManageController { * @date 2020.05.14 13:57 **/ @PostMapping(value = "votingissuelist") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_VOTINGLIST) public Result> votingList( @RequestBody CommonIssueListFormDTO issueListFormDTO){ ValidatorUtils.validateEntity(issueListFormDTO); return new Result>().ok(issueService.votingList(issueListFormDTO)); @@ -132,6 +133,7 @@ public class IssueManageController { * @date 2020.05.14 13:58 **/ @PostMapping(value = "closedlist") + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_CLOSED_LIST) public Result> closedList( @RequestBody CommonIssueListFormDTO issueListFormDTO){ ValidatorUtils.validateEntity(issueListFormDTO); return new Result>().ok(issueService.closedList(issueListFormDTO)); @@ -144,6 +146,7 @@ public class IssueManageController { * @author wangc * @date 2020.05.15 00:19 **/ + @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) @PostMapping(value = "votingissuedetail") public Result votingissuedetail(@RequestBody IssueDetailFormDTO issueDetail){ ValidatorUtils.validateEntity(issueDetail); diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicIssueInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicIssueInfoResultDTO.java index dbacd67e4c..6dcc27c7be 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicIssueInfoResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicIssueInfoResultDTO.java @@ -33,7 +33,7 @@ public class GovTopicIssueInfoResultDTO implements Serializable { /** * 话题发表人（山东路168-尹女士） */ - private String publishedUser; + private String topicPublisher; /** * 话题发表时间 (时间戳 毫秒级) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index fe028611cc..d971d03543 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -1102,12 +1102,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl> votingList(CommonIssueListFormDTO issueListFormDTO){ + public Result> votingList(@RequestBody CommonIssueListFormDTO issueListFormDTO){ ValidatorUtils.validateEntity(issueListFormDTO); return govIssueFeignClient.votingList(issueListFormDTO); }