From 913f98db39a2135cb94bc20631d318223ca5cbaf Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=88=98=E6=B4=AA=E9=9D=92?= Date: Tue, 3 Sep 2019 10:45:03 +0800 Subject: [PATCH] =?utf8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=89=B9=E9=87=8F?= =?utf8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../api/v1/admin/AdminMenuController.java | 17 +++++++++ .../api/v1/admin/AdminRoleController.java | 18 ++++++++++ .../request/PermissionDeleteBatchRequest.java | 21 +++++++++++ .../vo/request/RoleDeleteBatchRequest.java | 21 +++++++++++ .../PermissionDeleteBatchResponseData.java | 35 +++++++++++++++++++ .../response/RoleDeleteBatchResponseData.java | 35 +++++++++++++++++++ .../domain/service/PermissionService.java | 7 ++++ .../system/domain/service/RoleService.java | 7 ++++ 8 files changed, 161 insertions(+) create mode 100644 system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/PermissionDeleteBatchRequest.java create mode 100644 system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleDeleteBatchRequest.java create mode 100644 system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionDeleteBatchResponseData.java create mode 100644 system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleDeleteBatchResponseData.java diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminMenuController.java b/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminMenuController.java index 4bc4cb8..3c3a832 100644 --- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminMenuController.java +++ b/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminMenuController.java @@ -25,9 +25,11 @@ import org.springframework.web.bind.annotation.RestController; import com.supwisdom.institute.backend.common.framework.entity.EntityUtils; import com.supwisdom.institute.backend.common.framework.vo.response.DefaultApiResponse; import com.supwisdom.institute.backend.system.api.vo.request.PermissionCreateRequest; +import com.supwisdom.institute.backend.system.api.vo.request.PermissionDeleteBatchRequest; import com.supwisdom.institute.backend.system.api.vo.request.PermissionQueryRequest; import com.supwisdom.institute.backend.system.api.vo.request.PermissionUpdateRequest; import com.supwisdom.institute.backend.system.api.vo.response.PermissionCreateResponseData; +import com.supwisdom.institute.backend.system.api.vo.response.PermissionDeleteBatchResponseData; import com.supwisdom.institute.backend.system.api.vo.response.PermissionLoadResponseData; import com.supwisdom.institute.backend.system.api.vo.response.PermissionQueryResponseData; import com.supwisdom.institute.backend.system.api.vo.response.PermissionRemoveResponseData; @@ -164,6 +166,21 @@ public class AdminMenuController { return new DefaultApiResponse(data); } + + @DeleteMapping(path = "/batch", consumes = MimeTypeUtils.APPLICATION_JSON_VALUE, produces = MimeTypeUtils.APPLICATION_JSON_VALUE) + @ResponseStatus(value = HttpStatus.OK) + @ResponseBody + public DefaultApiResponse deleteBatch( + @RequestBody PermissionDeleteBatchRequest deleteBatchRequest) { + + System.out.println(deleteBatchRequest.getIds()); + List ids = deleteBatchRequest.getIds(); + + permissionService.deleteBatch(ids); + + PermissionDeleteBatchResponseData data = PermissionDeleteBatchResponseData.build(ids); + return new DefaultApiResponse(data); + } @GetMapping(path = "/tree", produces = MimeTypeUtils.APPLICATION_JSON_VALUE) @ResponseStatus(value = HttpStatus.OK) diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminRoleController.java b/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminRoleController.java index b64adda..a198eeb 100644 --- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminRoleController.java +++ b/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminRoleController.java @@ -1,6 +1,7 @@ package com.supwisdom.institute.backend.system.api.v1.admin; import java.util.HashMap; +import java.util.List; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; @@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController; import com.supwisdom.institute.backend.common.framework.entity.EntityUtils; import com.supwisdom.institute.backend.common.framework.vo.response.DefaultApiResponse; import com.supwisdom.institute.backend.system.api.vo.request.RoleCreateRequest; +import com.supwisdom.institute.backend.system.api.vo.request.RoleDeleteBatchRequest; import com.supwisdom.institute.backend.system.api.vo.request.RoleRelateAccountsRequest; import com.supwisdom.institute.backend.system.api.vo.request.RoleRelateGroupsRequest; import com.supwisdom.institute.backend.system.api.vo.request.RoleRelatePermissionsRequest; @@ -33,6 +35,7 @@ import com.supwisdom.institute.backend.system.api.vo.request.RoleRelatedPermissi import com.supwisdom.institute.backend.system.api.vo.request.RoleUpdateRequest; import com.supwisdom.institute.backend.system.api.vo.request.RoleQueryRequest; import com.supwisdom.institute.backend.system.api.vo.response.RoleCreateResponseData; +import com.supwisdom.institute.backend.system.api.vo.response.RoleDeleteBatchResponseData; import com.supwisdom.institute.backend.system.api.vo.response.RoleLoadResponseData; import com.supwisdom.institute.backend.system.api.vo.response.RoleRelateAccountsResponseData; import com.supwisdom.institute.backend.system.api.vo.response.RoleRelateGroupsResponseData; @@ -161,6 +164,21 @@ public class AdminRoleController { return new DefaultApiResponse(data); } + @DeleteMapping(path = "/batch", consumes = MimeTypeUtils.APPLICATION_JSON_VALUE, produces = MimeTypeUtils.APPLICATION_JSON_VALUE) + @ResponseStatus(value = HttpStatus.OK) + @ResponseBody + public DefaultApiResponse deleteBatch( + @RequestBody RoleDeleteBatchRequest deleteBatchRequest) { + + System.out.println(deleteBatchRequest.getIds()); + List ids = deleteBatchRequest.getIds(); + + roleService.deleteBatch(ids); + + RoleDeleteBatchResponseData data = RoleDeleteBatchResponseData.build(ids); + return new DefaultApiResponse(data); + } + @RequestMapping(method = RequestMethod.GET, path = "/{id}/accounts", produces = MimeTypeUtils.APPLICATION_JSON_VALUE) @ResponseBody diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/PermissionDeleteBatchRequest.java b/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/PermissionDeleteBatchRequest.java new file mode 100644 index 0000000..d868006 --- /dev/null +++ b/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/PermissionDeleteBatchRequest.java @@ -0,0 +1,21 @@ +package com.supwisdom.institute.backend.system.api.vo.request; + +import java.util.List; + +import lombok.Getter; +import lombok.Setter; + +import com.supwisdom.institute.backend.common.framework.vo.request.IApiRequest; + +public class PermissionDeleteBatchRequest implements IApiRequest { + + /** + * + */ + private static final long serialVersionUID = -9180558051324597595L; + + @Getter + @Setter + private List ids; + +} diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleDeleteBatchRequest.java b/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleDeleteBatchRequest.java new file mode 100644 index 0000000..14f65d3 --- /dev/null +++ b/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleDeleteBatchRequest.java @@ -0,0 +1,21 @@ +package com.supwisdom.institute.backend.system.api.vo.request; + +import java.util.List; + +import lombok.Getter; +import lombok.Setter; + +import com.supwisdom.institute.backend.common.framework.vo.request.IApiRequest; + +public class RoleDeleteBatchRequest implements IApiRequest { + + /** + * + */ + private static final long serialVersionUID = 3121491905067659896L; + + @Getter + @Setter + private List ids; + +} diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionDeleteBatchResponseData.java b/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionDeleteBatchResponseData.java new file mode 100644 index 0000000..2923725 --- /dev/null +++ b/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionDeleteBatchResponseData.java @@ -0,0 +1,35 @@ +package com.supwisdom.institute.backend.system.api.vo.response; + +import java.util.List; + +import lombok.Getter; +import lombok.Setter; + +import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiResponseData; + +/** + * @author loie + */ +public class PermissionDeleteBatchResponseData implements IApiResponseData { + + /** + * + */ + private static final long serialVersionUID = -7406287471651267066L; + + @Getter + @Setter + private List ids; + + private PermissionDeleteBatchResponseData() { + + } + + public static PermissionDeleteBatchResponseData build(List ids) { + PermissionDeleteBatchResponseData data = new PermissionDeleteBatchResponseData(); + data.setIds(ids); + + return data; + } + +} diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleDeleteBatchResponseData.java b/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleDeleteBatchResponseData.java new file mode 100644 index 0000000..c7a6ac0 --- /dev/null +++ b/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleDeleteBatchResponseData.java @@ -0,0 +1,35 @@ +package com.supwisdom.institute.backend.system.api.vo.response; + +import java.util.List; + +import lombok.Getter; +import lombok.Setter; + +import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiResponseData; + +/** + * @author loie + */ +public class RoleDeleteBatchResponseData implements IApiResponseData { + + /** + * + */ + private static final long serialVersionUID = -7775951512990321469L; + + @Getter + @Setter + private List ids; + + private RoleDeleteBatchResponseData() { + + } + + public static RoleDeleteBatchResponseData build(List ids) { + RoleDeleteBatchResponseData data = new RoleDeleteBatchResponseData(); + data.setIds(ids); + + return data; + } + +} diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/PermissionService.java b/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/PermissionService.java index d7ebd1e..ff2f7f2 100644 --- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/PermissionService.java +++ b/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/PermissionService.java @@ -29,6 +29,13 @@ public class PermissionService extends ABaseService ids) { + + ids.stream().forEach(id -> { + this.deleteById(id); + }); + } + public PermissionTreeNode selectPermissionTree(Map mapBean) { List permissions = permissionRepository.selectList(true, -1, -1, mapBean, null); diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/RoleService.java b/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/RoleService.java index 068eeeb..5b533df 100644 --- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/RoleService.java +++ b/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/RoleService.java @@ -44,6 +44,13 @@ public class RoleService extends ABaseService { + public void deleteBatch(List ids) { + + ids.stream().forEach(id -> { + this.deleteById(id); + }); + } + public Page selectRoleAccounts(int pageIndex, int pageSize, Map mapBean) { AccountRole probe = new AccountRole(); -- 2.17.1