From 612b7052caa85c6f65a2a53a66649b62bfa37bc4 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 12 Sep 2023 11:31:44 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E5=BA=9F?= =?UTF-8?q?=E5=BC=83=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/RowPermissionsController.java | 105 ------------------ .../server/RowPermissionsTreeController.java | 13 ++- core/frontend/src/api/dataset/dataset.js | 9 -- 3 files changed, 12 insertions(+), 115 deletions(-) delete mode 100644 core/backend/src/main/java/io/dataease/plugins/server/RowPermissionsController.java diff --git a/core/backend/src/main/java/io/dataease/plugins/server/RowPermissionsController.java b/core/backend/src/main/java/io/dataease/plugins/server/RowPermissionsController.java deleted file mode 100644 index b9d4ef1ea6..0000000000 --- a/core/backend/src/main/java/io/dataease/plugins/server/RowPermissionsController.java +++ /dev/null @@ -1,105 +0,0 @@ -package io.dataease.plugins.server; - -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import io.dataease.auth.annotation.DePermission; -import io.dataease.commons.constants.DePermissionType; -import io.dataease.commons.constants.ResourceAuthLevel; -import io.dataease.commons.utils.PageUtils; -import io.dataease.commons.utils.Pager; -import io.dataease.i18n.Translator; -import io.dataease.plugins.common.entity.XpackConditionEntity; -import io.dataease.plugins.common.entity.XpackGridRequest; -import io.dataease.plugins.config.SpringContextUtil; -import io.dataease.plugins.xpack.auth.dto.request.DataSetRowPermissionsDTO; -import io.dataease.plugins.xpack.auth.dto.request.DatasetRowPermissions; -import io.dataease.plugins.xpack.auth.service.RowPermissionService; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import java.util.ArrayList; -import java.util.List; -@ApiIgnore -@RestController -@RequestMapping("plugin/dataset/rowPermissions") -public class RowPermissionsController { - - @DePermission(type = DePermissionType.DATASET, value = "datasetId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) - @ApiOperation("保存") - @PostMapping("save") - public void save(@RequestBody DatasetRowPermissions datasetRowPermissions) throws Exception { - RowPermissionService rowPermissionService = SpringContextUtil.getBean(RowPermissionService.class); - - DataSetRowPermissionsDTO request = new DataSetRowPermissionsDTO(); - request.setAuthTargetType(datasetRowPermissions.getAuthTargetType()); - request.setAuthTargetId(datasetRowPermissions.getAuthTargetId()); - request.setDatasetFieldId(datasetRowPermissions.getDatasetFieldId()); - List rowPermissionsDTOS = rowPermissionService.searchRowPermissions(request); - if(StringUtils.isEmpty(datasetRowPermissions.getId())){ - if(!CollectionUtils.isEmpty(rowPermissionsDTOS)){ - throw new Exception(Translator.get("i18n_rp_exist")); - } - }else { - if(!CollectionUtils.isEmpty(rowPermissionsDTOS) && rowPermissionsDTOS.size() > 1){ - throw new Exception(Translator.get("i18n_rp_exist")); - } - if(rowPermissionsDTOS.size() == 1 && !rowPermissionsDTOS.get(0).getId().equalsIgnoreCase(datasetRowPermissions.getId())){ - throw new Exception(Translator.get("i18n_rp_exist")); - } - } - rowPermissionService.save(datasetRowPermissions); - } - - @DePermission(type = DePermissionType.DATASET, value = "datasetId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) - @ApiOperation("查询") - @PostMapping("/list") - public List rowPermissions(@RequestBody DataSetRowPermissionsDTO request) { - RowPermissionService rowPermissionService = SpringContextUtil.getBean(RowPermissionService.class); - return rowPermissionService.searchRowPermissions(request); - } - - @DePermission(type = DePermissionType.DATASET, value = "datasetId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) - @ApiOperation("删除") - @PostMapping("/delete") - public void dataSetRowPermissionInfo(@RequestBody DatasetRowPermissions datasetRowPermissions) { - RowPermissionService rowPermissionService = SpringContextUtil.getBean(RowPermissionService.class); - rowPermissionService.delete(datasetRowPermissions.getId()); - } - - @DePermission(type = DePermissionType.DATASET, value = "datasetId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) - @ApiOperation("分页查询") - @PostMapping("/pageList/{datasetId}/{goPage}/{pageSize}") - public Pager> rowPermissions(@PathVariable String datasetId, @PathVariable int goPage, @PathVariable int pageSize, @RequestBody XpackGridRequest request) { - Page page = PageHelper.startPage(goPage, pageSize, true); - RowPermissionService rowPermissionService = SpringContextUtil.getBean(RowPermissionService.class); - List conditionEntities = request.getConditions() == null ? new ArrayList<>() : request.getConditions(); - XpackConditionEntity entity = new XpackConditionEntity(); - entity.setField("dataset_row_permissions.dataset_id"); - entity.setOperator("eq"); - entity.setValue(datasetId); - conditionEntities.add(entity); - request.setConditions(conditionEntities); - return PageUtils.setPageInfo(page, rowPermissionService.queryRowPermissions(request)); - } - - @DePermission(type = DePermissionType.DATASET, value = "datasetId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) - @ApiOperation("有权限的对象") - @PostMapping("/authObjs") - public List authObjs(@RequestBody DataSetRowPermissionsDTO request) { - RowPermissionService rowPermissionService = SpringContextUtil.getBean(RowPermissionService.class); - return (List) rowPermissionService.authObjs(request); - } - - @DePermission(type = DePermissionType.DATASET, value = "datasetId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) - @ApiOperation("详情") - @PostMapping("/dataSetRowPermissionInfo") - public DataSetRowPermissionsDTO dataSetRowPermissionInfo(@RequestBody DataSetRowPermissionsDTO request) { - RowPermissionService rowPermissionService = SpringContextUtil.getBean(RowPermissionService.class); - return rowPermissionService.dataSetRowPermissionInfo(request); - } - -} diff --git a/core/backend/src/main/java/io/dataease/plugins/server/RowPermissionsTreeController.java b/core/backend/src/main/java/io/dataease/plugins/server/RowPermissionsTreeController.java index b2801efb44..55e8c6c716 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/RowPermissionsTreeController.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/RowPermissionsTreeController.java @@ -12,6 +12,8 @@ import io.dataease.i18n.Translator; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DatasetRowPermissionsTreeRequest; import io.dataease.plugins.config.SpringContextUtil; +import io.dataease.plugins.xpack.auth.dto.request.DataSetRowPermissionsDTO; +import io.dataease.plugins.xpack.auth.service.RowPermissionService; import io.dataease.plugins.xpack.auth.service.RowPermissionTreeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,7 +23,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -//@ApiIgnore + @Api(tags = "xpack：行权限") @RestController @RequestMapping("plugin/dataset/rowPermissionsTree") @@ -85,4 +87,13 @@ public class RowPermissionsTreeController { Pager> setPageInfo = PageUtils.setPageInfo(page, list); return setPageInfo; } + + @DePermission(type = DePermissionType.DATASET, value = "datasetId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) + @ApiOperation("有权限的对象") + @PostMapping("/authObjs") + public List authObjs(@RequestBody DataSetRowPermissionsDTO request) { + RowPermissionService rowPermissionService = SpringContextUtil.getBean(RowPermissionService.class); + return (List) rowPermissionService.authObjs(request); + } + } diff --git a/core/frontend/src/api/dataset/dataset.js b/core/frontend/src/api/dataset/dataset.js index c0fb52c660..95ba9f0192 100644 --- a/core/frontend/src/api/dataset/dataset.js +++ b/core/frontend/src/api/dataset/dataset.js @@ -258,15 +258,6 @@ export function datasetTaskList(page, size, data, loading) { }) } -export function datasetRowPermissionsList(datasetId, page, size, data, loading) { - return request({ - url: 'plugin/dataset/rowPermissions/pageList/' + datasetId + '/' + page + '/' + size, - method: 'post', - data, - loading: loading - }) -} - export function checkCustomDs() { return request({ url: '/system/checkCustomDs',