From 03ceb87cee21341de27d760b05b2e483746f9dd4 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 11 Jun 2021 15:44:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E5=A4=9A-=E5=B7=A1=E6=9F=A5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/controller/EpmetUserController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java index f01ef8a3d4..bd535ae77c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java @@ -1,6 +1,8 @@ package com.epmet.dataaggre.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; @@ -38,6 +40,7 @@ public class EpmetUserController { * @author sun */ @PostMapping("stafflist") + @RequirePermission(requirePermission = RequirePermissionEnum.MORE_PATROL_RECORD_LIST) public Result> staffList(@LoginUser TokenDto tokenDto, @RequestBody StaffListFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, StaffListFormDTO.Staff.class); if (!"patrolTotal".equals(formDTO.getSortCode()) && !"latestPatrolledTime".equals(formDTO.getSortCode())) { From baa3bff6e43f5e5884a7a1fc56e6b162c2dc87f7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 11 Jun 2021 16:00:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=20=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/enums/RequirePermissionEnum.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java index 0290cf8aa1..ff5e18b091 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java @@ -176,7 +176,11 @@ public enum RequirePermissionEnum { /** * 项目立项 */ - WORK_PROJECT_APPROVAL("work_project_approval","政务管理:项目立项","项目立项"); + WORK_PROJECT_APPROVAL("work_project_approval","政务管理:项目立项","项目立项"), + /** + * 基层治理-巡查 + */ + WORK_GRASSROOT_GOVERN_PATROL("work_grassroot_govern_patrol","基层治理:巡查","巡查"); private String key; private String name;