权限注解添加

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java

@@ -1,7 +1,5 @@
 package com.epmet.controller;
 
-import com.epmet.commons.tools.annotation.RequirePermission;
-import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.IssueDetailFormDTO;
 import com.epmet.dto.result.GridVotingIssueCountResultDTO;
@@ -34,7 +32,6 @@ public class IssueController {
      * @date 2020/5/11 9:42
      */
     @PostMapping(value = "detail")
-//    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<IssueResultDTO> detail(@RequestBody IssueDetailFormDTO issueDetail){
         return new Result<IssueResultDTO>().ok(issueService.detail(issueDetail));
     }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java

@@ -67,6 +67,7 @@ public class IssueManageController {
      * @author zxc
      */
     @PostMapping("votingtrend")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<VotingTrendResultDTO> votingTrend(@RequestBody IssueIdFormDTO issueId){
         return new Result<VotingTrendResultDTO>().ok(issueVoteStatisticalService.votingTrend(issueId));
     }
@@ -77,6 +78,7 @@ public class IssueManageController {
      * @author zxc
      */
     @PostMapping("evaluationlist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<List<EvaluationListResultDTO>> evaluationList(@RequestBody EvaluationListFormDTO formDTO){
         return new Result<List<EvaluationListResultDTO>>().ok(issueVoteStatisticalService.evaluationList(formDTO));
     }

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java

@@ -35,7 +35,7 @@ public class IssueController {
      * @date 2020/5/11 9:42
      */
     @PostMapping(value = "/detail")
-//    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<IssueDetailResultDTO> detail(@RequestBody IssueDetailFormDTO issueDetail){
         return new Result<IssueDetailResultDTO>().ok(issueService.detail(issueDetail));
     }
@@ -46,6 +46,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping(value = "votingtrend")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<VotingTrendResultDTO> votingTrend(@RequestBody IssueIdFormDTO formDTO){
         return new Result<VotingTrendResultDTO>().ok(issueService.votingTrend(formDTO));
     }
@@ -56,6 +57,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping(value = "support")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result support(@LoginUser TokenDto tokenDto, @RequestBody IssueIdFormDTO formDTO){
         issueService.support(tokenDto,formDTO);
         return new Result();
@@ -67,6 +69,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping(value = "oppose")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result oppose(@LoginUser TokenDto tokenDto,@RequestBody IssueIdFormDTO formDTO){
         issueService.oppose(tokenDto,formDTO);
         return new Result();
@@ -78,6 +81,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping(value = "vote")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<VoteResultDTO> vote(@RequestBody IssueIdFormDTO formDTO){
         return new Result<VoteResultDTO>().ok(issueService.vote(formDTO));
     }
@@ -89,6 +93,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping("initevaluation")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<InitEvaluationResultDTO> initEvaluation(@LoginUser TokenDto tokenDto, @RequestBody IssueIdFormDTO issueId){
         return new Result<InitEvaluationResultDTO>().ok(issueService.initEvaluation(tokenDto,issueId));
     }
@@ -100,6 +105,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping("projectinitevaluation")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<ProjectInitEvaluationResultDTO> projectInitEvaluation(@LoginUser TokenDto tokenDto, @RequestBody ProjectIdFormDTO projectId){
         return new Result<ProjectInitEvaluationResultDTO>().ok(issueService.projectInitEvaluation(tokenDto,projectId));
     }
@@ -110,6 +116,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping("evaluate")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result evaluate(@LoginUser TokenDto tokenDto,@RequestBody EvaluateFormDTO formDTO){
         issueService.evaluate(tokenDto,formDTO);
         return new Result();
@@ -121,6 +128,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping("projectevaluate")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result projectEvaluate(@LoginUser TokenDto tokenDto,@RequestBody ProjectEvaluateFormDTO formDTO){
         issueService.projectEvaluate(tokenDto,formDTO);
         return new Result();
@@ -132,6 +140,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping("evaluationlist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<List<EvaluationListResultDTO>> evaluationList(@RequestBody EvaluationListFormDTO formDTO){
         return new Result<List<EvaluationListResultDTO>>().ok(issueService.evaluationList(formDTO));
     }
@@ -142,6 +151,7 @@ public class IssueController {
      * @author zxc
      */
     @PostMapping("projectevaluationlist")
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
     public Result<List<EvaluationListResultDTO>> projectEvaluationList(@RequestBody ProjectEvaluationListFormDTO formDTO){
         return new Result<List<EvaluationListResultDTO>>().ok(issueService.projectEvaluationList(formDTO));
     }

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -18,8 +18,8 @@ import java.util.List;
  * @dscription
  * @date 2020/5/11 10:32
  */
-//url = "localhost:8087"
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class,url = "localhost:8087")
+//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
 public interface EpmetUserFeignClient {
 
 	/**

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java

@@ -15,8 +15,8 @@ import java.util.List;
 /**
  * @Description Feign调用gov-issue-server模块
  * @ClassName GovIssueFeignFallBack
- * url = "localhost:8101"
  */
+//@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueFeignClientFallBack.class,url = "localhost:8101")
 @FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueFeignClientFallBack.class)
 public interface GovIssueFeignClient {
 

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java

@@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 /**
  * @Description Feign调用gov-org-server模块
  * @ClassName GovOrgFeginFallBack
- * url = "localhost:8092"
  */
+//@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class,url = "localhost:8092")
 @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
 public interface GovOrgFeignClient {
 

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java

@@ -18,8 +18,8 @@ import java.util.List;
 /**
  * @Description Feign调用gov-project-server模块
  * @ClassName GovProjectFeignClient
- * url = "localhost:8102"
  */
+//@FeignClient(name = ServiceConstant.GOV_PROJECT_SERVER, fallback = GovProjectFeignClientFallBack.class,url = "localhost:8102")
 @FeignClient(name = ServiceConstant.GOV_PROJECT_SERVER, fallback = GovProjectFeignClientFallBack.class)
 public interface GovProjectFeignClient {
 

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java

@@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 
 /**
  * @author zxc
- * url = "localhost:8095"
  */
+//@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class,url = "localhost:8095")
 @FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class)
 public interface ResiGroupFeignClient {