From 87df18def393a248c75fa4c0c6fc65d5eac8f6ac Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 2 Dec 2020 16:35:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E7=BD=91=E6=A0=BC(enterG?= =?UTF-8?q?rid)=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82userS?= =?UTF-8?q?treetName(=E6=A0=BC=E5=BC=8F:=20XX=E8=B7=AF-X=E5=85=88=E7=94=9F?= =?UTF-8?q?/=E5=A5=B3=E5=A3=AB)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java | 4 ++++ .../com/epmet/service/impl/RegisterRelationServiceImpl.java | 1 + 2 files changed, 5 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java index 3779e68a24..0e5cd22fef 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java @@ -50,4 +50,8 @@ public class UserInfoOnEnterGridResultDTO implements Serializable{ * */ private List userRoleList; + /** + * + */ + private String userStreetName; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index 06d33d7d93..7b9edb95a5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -304,6 +304,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl Date: Wed, 2 Dec 2020 17:09:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=BA=E5=8D=95?= =?UTF-8?q?=E4=B8=AA=E8=A7=92=E8=89=B2=EF=BC=8C=E6=89=B9=E9=87=8F=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A4=9A=E4=B8=AA=E6=93=8D=E4=BD=9C=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=92=8C=E6=93=8D=E4=BD=9C=E8=8C=83=E5=9B=B4=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/AccessConfigAdd4RoletFormDTO.java | 50 ++++++++++++++++++- .../controller/AccessConfigController.java | 17 ++++++- .../epmet/service/AccessConfigService.java | 4 +- .../service/impl/AccessConfigServiceImpl.java | 10 ++++ 4 files changed, 76 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java index 85b9e9d68d..d2a6770d41 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigAdd4RoletFormDTO.java @@ -2,16 +2,62 @@ package com.epmet.dto.form; import lombok.Data; +import javax.validation.Valid; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.ArrayList; import java.util.List; @Data public class AccessConfigAdd4RoletFormDTO { - @NotBlank(message = "角色Key不能为空") + + // 为角色添加单个操作 + public interface AddSingleOperation4RoleGroup {} + + // 为角色添加多个操作 + public interface AddMultiOperations4RoleGroup {} + + @NotBlank(message = "角色Key不能为空", groups = { AddSingleOperation4RoleGroup.class }) private String roleKey; - @NotBlank(message = "操作Key不能为空") + @NotBlank(message = "操作Key不能为空", groups = { AddSingleOperation4RoleGroup.class }) private String operationKey; private List scopeKeys; + + // 操作列表，及其范围 + @Valid + @NotEmpty(message = "操作列表及其范围不能为空", groups = { AddMultiOperations4RoleGroup.class }) + private List operationsAndScopes = new ArrayList<>(); + + /** + * 操作及其范围封装类 + */ + public static class OperationsAndScopes { + + // 操作key + @NotBlank(message = "角色Key不能为空", groups = { AddMultiOperations4RoleGroup.class }) + private String operationKey; + + // 范围key列表 + @NotEmpty(message = "操作Key列表不能为空", groups = { AddMultiOperations4RoleGroup.class }) + private List scopeKeys; + + public String getOperationKey() { + return operationKey; + } + + public void setOperationKey(String operationKey) { + this.operationKey = operationKey; + } + + public List getScopeKeys() { + return scopeKeys; + } + + public void setScopeKeys(List scopeKeys) { + this.scopeKeys = scopeKeys; + } + } } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java index 76a7886947..0983ca46a4 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java @@ -118,14 +118,14 @@ public class AccessConfigController { } /** - * @Description 给角色添加操作权限和操作范围 + * @Description 给角色添加单个操作权限和操作范围 * @return * @author wxz * @date 2020.11.17 17:41 */ @PostMapping("add-ope-and-scopes-4role") public Result addOpeAndScopes4Role(@RequestBody AccessConfigAdd4RoletFormDTO form) { - ValidatorUtils.validateEntity(form); + ValidatorUtils.validateEntity(form, AccessConfigAdd4RoletFormDTO.AddSingleOperation4RoleGroup.class); String roleKey = form.getRoleKey(); String operationKey = form.getOperationKey(); List scopeKeys = form.getScopeKeys(); @@ -134,5 +134,18 @@ public class AccessConfigController { return new Result(); } + /** + * @Description 给角色添加单个操作权限和操作范围 + * @return + * @author wxz + * @date 2020.12.02 16:20 + */ + @PostMapping("add-opes-and-scopes-4role") + public Result addOpesAndScopes4Role(@RequestBody AccessConfigAdd4RoletFormDTO form) { + ValidatorUtils.validateEntity(form, AccessConfigAdd4RoletFormDTO.AddMultiOperations4RoleGroup.class); + accessConfigService.addOpesAndScopes4Role(form.getRoleKey(), form.getOperationsAndScopes()); + return new Result(); + } + } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java index 508f3ad45f..a2b1850e04 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java @@ -1,6 +1,6 @@ package com.epmet.service; -import com.epmet.dto.form.AccessConfigRoleDefaultOpesFormDTO; +import com.epmet.dto.form.AccessConfigAdd4RoletFormDTO; import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO; import com.epmet.dto.result.AccessConfigOpesResultDTO; import com.epmet.dto.result.AccessConfigOptionsResultDTO; @@ -27,4 +27,6 @@ public interface AccessConfigService { void saveOpeDefaultScopes(String roleKey, String operationKey, List scopeKeys); void addOpeAndScopes4Role(String roleKey, String operationKey, List scopeKeys); + + void addOpesAndScopes4Role(String roleKey, List operations); } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java index 06f391eada..52a0ae282c 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.*; +import com.epmet.dto.form.AccessConfigAdd4RoletFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.OperationScopeDefaultEntity; import com.epmet.entity.RoleOperationDefaultEntity; @@ -261,4 +262,13 @@ public class AccessConfigServiceImpl implements AccessConfigService { } } } + + @Override + public void addOpesAndScopes4Role(String roleKey, List operations) { + for (AccessConfigAdd4RoletFormDTO.OperationsAndScopes operation : operations) { + String operationKey = operation.getOperationKey(); + List scopeKeys = operation.getScopeKeys(); + addOpeAndScopes4Role(roleKey, operationKey, scopeKeys); + } + } } From cf7c47bee17787d2abe42acef7a9aa5a1ea64673 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 3 Dec 2020 09:39:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?userStreetName(=E6=A0=BC=E5=BC=8F:=20XX?= =?UTF-8?q?=E8=B7=AF-X=E5=85=88=E7=94=9F/=E5=A5=B3=E5=A3=AB)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/RegisterRelationServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index 7b9edb95a5..f8a78f8c14 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -304,9 +304,10 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl Date: Fri, 4 Dec 2020 15:30:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=A5=E5=8F=82=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/OpenUpUserController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenUpUserController.java b/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenUpUserController.java index 41124d3b5d..e1a2e0a07c 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenUpUserController.java +++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenUpUserController.java @@ -1,6 +1,8 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.constant.AppClientConstant; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -38,6 +40,9 @@ public class OpenUpUserController { CommonUserIdFormDTO userParam = new CommonUserIdFormDTO(); userParam.setUserId(token.getUserId()); ValidatorUtils.validateEntity(userParam, CommonUserIdFormDTO.CommonUserIdGroup.class); + if(!AppClientConstant.APP_RESI.equals(token.getApp())){ + throw new RenException("参数错误,Authorization不是居民端的业务Token"); + } return epmetUserOpenFeignClient.extUserInfo(userParam); } }