From f0b0771aeae85d8ae7bd1bb50ca89f22ba1718d0 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 12 Sep 2023 11:09:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=8C=E5=88=97=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3sql-inject?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/ColumnPermissionsController.java | 29 +- .../server/RowPermissionsController.java | 29 +- .../dataease/plugins/server/XDeptServer.java | 2 - .../plugins/server/XEmailTaskServer.java | 2 - .../common/entity/XpackConditionEntity.java | 17 -- .../common/entity/XpackGridExample.java | 271 ------------------ .../common/entity/XpackGridRequest.java | 29 -- .../plugins/common/mapper/PluginGridSql.java | 4 - .../plugins/common/mapper/PluginGridSql.xml | 35 --- .../datasource/service/DatasourceService.java | 3 - .../auth/service/ColumnPermissionService.java | 5 +- .../auth/service/RowPermissionService.java | 3 +- .../email/service/EmailXpackService.java | 6 +- 13 files changed, 26 insertions(+), 409 deletions(-) delete mode 100644 sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/entity/XpackConditionEntity.java delete mode 100644 sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/entity/XpackGridExample.java delete mode 100644 sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/entity/XpackGridRequest.java delete mode 100644 sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/mapper/PluginGridSql.java delete mode 100644 sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/mapper/PluginGridSql.xml diff --git a/core/backend/src/main/java/io/dataease/plugins/server/ColumnPermissionsController.java b/core/backend/src/main/java/io/dataease/plugins/server/ColumnPermissionsController.java index 20d75b4e89..bb8d7fe090 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/ColumnPermissionsController.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/ColumnPermissionsController.java @@ -8,8 +8,6 @@ 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.DataSetColumnPermissionsDTO; import io.dataease.plugins.xpack.auth.dto.request.DatasetColumnPermissions; @@ -19,8 +17,9 @@ import org.apache.commons.lang3.StringUtils; 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/columnPermissions") @@ -36,15 +35,15 @@ public class ColumnPermissionsController { request.setAuthTargetId(datasetColumnPermissions.getAuthTargetId()); request.setDatasetId(datasetColumnPermissions.getDatasetId()); List columnPermissionsDTOS = columnPermissionService.searchPermissions(request); - if(StringUtils.isEmpty(datasetColumnPermissions.getId())){ - if(!CollectionUtils.isEmpty(columnPermissionsDTOS)){ + if (StringUtils.isEmpty(datasetColumnPermissions.getId())) { + if (!CollectionUtils.isEmpty(columnPermissionsDTOS)) { throw new Exception(Translator.get("i18n_cp_exist")); } - }else { - if(!CollectionUtils.isEmpty(columnPermissionsDTOS) && columnPermissionsDTOS.size() > 1){ + } else { + if (!CollectionUtils.isEmpty(columnPermissionsDTOS) && columnPermissionsDTOS.size() > 1) { throw new Exception(Translator.get("i18n_cp_exist")); } - if(columnPermissionsDTOS.size() == 1 && !columnPermissionsDTOS.get(0).getId().equalsIgnoreCase(datasetColumnPermissions.getId())){ + if (columnPermissionsDTOS.size() == 1 && !columnPermissionsDTOS.get(0).getId().equalsIgnoreCase(datasetColumnPermissions.getId())) { throw new Exception(Translator.get("i18n_cp_exist")); } } @@ -56,7 +55,7 @@ public class ColumnPermissionsController { @PostMapping("/list") public List searchPermissions(@RequestBody DataSetColumnPermissionsDTO request) { ColumnPermissionService columnPermissionService = SpringContextUtil.getBean(ColumnPermissionService.class); - return columnPermissionService.searchPermissions(request); + return columnPermissionService.searchPermissions(request); } @DePermission(type = DePermissionType.DATASET, value = "datasetId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) @@ -70,17 +69,11 @@ public class ColumnPermissionsController { @DePermission(type = DePermissionType.DATASET, 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) { + public Pager> rowPermissions(@PathVariable String datasetId, @PathVariable int goPage, @PathVariable int pageSize) { Page page = PageHelper.startPage(goPage, pageSize, true); ColumnPermissionService columnPermissionService = SpringContextUtil.getBean(ColumnPermissionService.class); - List conditionEntities = request.getConditions() == null ? new ArrayList<>() : request.getConditions(); - XpackConditionEntity entity = new XpackConditionEntity(); - entity.setField("dataset_column_permissions.dataset_id"); - entity.setOperator("eq"); - entity.setValue(datasetId); - conditionEntities.add(entity); - request.setConditions(conditionEntities); - return PageUtils.setPageInfo(page, columnPermissionService.queryPermissions(request)); + + return PageUtils.setPageInfo(page, columnPermissionService.queryPermissions(datasetId)); } @DePermission(type = DePermissionType.DATASET, value = "datasetId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) 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 index b9d4ef1ea6..9eaf127e37 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/RowPermissionsController.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/RowPermissionsController.java @@ -8,21 +8,18 @@ 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") @@ -39,15 +36,15 @@ public class RowPermissionsController { request.setAuthTargetId(datasetRowPermissions.getAuthTargetId()); request.setDatasetFieldId(datasetRowPermissions.getDatasetFieldId()); List rowPermissionsDTOS = rowPermissionService.searchRowPermissions(request); - if(StringUtils.isEmpty(datasetRowPermissions.getId())){ - if(!CollectionUtils.isEmpty(rowPermissionsDTOS)){ + 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){ + } 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())){ + if (rowPermissionsDTOS.size() == 1 && !rowPermissionsDTOS.get(0).getId().equalsIgnoreCase(datasetRowPermissions.getId())) { throw new Exception(Translator.get("i18n_rp_exist")); } } @@ -59,7 +56,7 @@ public class RowPermissionsController { @PostMapping("/list") public List rowPermissions(@RequestBody DataSetRowPermissionsDTO request) { RowPermissionService rowPermissionService = SpringContextUtil.getBean(RowPermissionService.class); - return rowPermissionService.searchRowPermissions(request); + return rowPermissionService.searchRowPermissions(request); } @DePermission(type = DePermissionType.DATASET, value = "datasetId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) @@ -73,17 +70,11 @@ public class RowPermissionsController { @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) { + public Pager> rowPermissions(@PathVariable String datasetId, @PathVariable int goPage, @PathVariable int pageSize) { 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)); + + return PageUtils.setPageInfo(page, rowPermissionService.queryRowPermissions(datasetId)); } @DePermission(type = DePermissionType.DATASET, value = "datasetId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java index cc9b697be1..76c1236bc9 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java @@ -20,7 +20,6 @@ import io.dataease.commons.utils.Pager; import io.dataease.controller.sys.response.DeptNodeResponse; import io.dataease.dto.SysLogDTO; import io.dataease.listener.util.CacheUtils; -import io.dataease.plugins.common.entity.XpackGridRequest; import io.dataease.plugins.config.SpringContextUtil; import io.dataease.plugins.xpack.dept.dto.request.*; import io.dataease.plugins.xpack.dept.dto.response.DeptUserItemDTO; @@ -33,7 +32,6 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.CacheEvict; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; diff --git a/core/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java b/core/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java index 128c25467e..d25c7d4dac 100644 --- a/core/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java +++ b/core/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java @@ -14,8 +14,6 @@ import io.dataease.commons.utils.*; import io.dataease.i18n.Translator; import io.dataease.plugins.common.entity.GlobalTaskEntity; import io.dataease.plugins.common.entity.GlobalTaskInstance; -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.email.dto.request.*; import io.dataease.plugins.xpack.email.dto.response.XpackTaskEntity; diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/entity/XpackConditionEntity.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/entity/XpackConditionEntity.java deleted file mode 100644 index 4ab07f9d96..0000000000 --- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/entity/XpackConditionEntity.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.dataease.plugins.common.entity; - -import io.dataease.plugins.common.annotation.PluginResultMap; -import lombok.Data; - -import java.io.Serializable; - -@Data -@PluginResultMap -public class XpackConditionEntity implements Serializable { - - private String field; - - private String operator; - - private Object value; -} diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/entity/XpackGridExample.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/entity/XpackGridExample.java deleted file mode 100644 index c626fee8e3..0000000000 --- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/entity/XpackGridExample.java +++ /dev/null @@ -1,271 +0,0 @@ -package io.dataease.plugins.common.entity; - -import io.dataease.plugins.common.annotation.PluginResultMap; -import org.springframework.util.StringUtils; - -import java.util.ArrayList; -import java.util.List; - -@PluginResultMap -public class XpackGridExample { - - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - protected String extendCondition; - - public XpackGridExample() { - oredCriteria = new ArrayList(); - } - - public String getExtendCondition() { - return extendCondition; - } - - public void setExtendCondition(String extendCondition) { - this.extendCondition = extendCondition; - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - - - public Criteria addCondition(XpackConditionEntity conditionEntity){ - String field = conditionEntity.getField(); - Object value = conditionEntity.getValue(); - String operator = conditionEntity.getOperator(); - if (StringUtils.isEmpty(operator)) - operator = "like"; - switch (operator){ - case "eq": - addCriterion(field+" = ", value, field); - break; - case "ne": - addCriterion(field+" <> ", value, field); - break; - case "like": - addCriterion(field+" like ", "%"+value+"%", field); - break; - case "not like": - addCriterion(field+" not like ", "%"+value+"%", field); - break; - case "in": - List invalues = (List)value; - addCriterion(field+" in", invalues, field); - break; - case "not in": - List notinvalues = (List)value; - addCriterion(field+" not in", notinvalues, field); - break; - case "between": - List values = (List)value; - Object v1 = values.get(0); - Object v2 = values.get(1); - addCriterion(field+" between", v1, v2, field); - break; - case "gt": - addCriterion(field+" > ", value, field); - break; - case "ge": - addCriterion(field+" >= ", value, field); - break; - case "lt": - addCriterion(field+" < ", value, field); - break; - case "le": - addCriterion(field+" <= ", value, field); - break; - } - return (Criteria) this; - } - - - - - - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/entity/XpackGridRequest.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/entity/XpackGridRequest.java deleted file mode 100644 index 7898f20831..0000000000 --- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/entity/XpackGridRequest.java +++ /dev/null @@ -1,29 +0,0 @@ -package io.dataease.plugins.common.entity; - -import lombok.Data; -import org.springframework.util.CollectionUtils; - -import java.io.Serializable; -import java.util.List; - -@Data -public class XpackGridRequest implements Serializable { - - private List conditions; - - private List orders; - - public XpackGridExample convertExample(){ - XpackGridExample gridExample = new XpackGridExample(); - if (!CollectionUtils.isEmpty(conditions)){ - XpackGridExample.Criteria criteria = gridExample.createCriteria(); - conditions.forEach(criteria::addCondition); - } - if (!CollectionUtils.isEmpty(orders)) { - String orderByClause = String.join(", ", orders); - gridExample.setOrderByClause(orderByClause); - } - - return gridExample; - } -} diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/mapper/PluginGridSql.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/mapper/PluginGridSql.java deleted file mode 100644 index 4e72d3c698..0000000000 --- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/mapper/PluginGridSql.java +++ /dev/null @@ -1,4 +0,0 @@ -package io.dataease.plugins.common.mapper; - -public interface PluginGridSql { -} diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/mapper/PluginGridSql.xml b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/mapper/PluginGridSql.xml deleted file mode 100644 index 4d61c8ac80..0000000000 --- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/mapper/PluginGridSql.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - diff --git a/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/service/DatasourceService.java b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/service/DatasourceService.java index bc76a78e0a..9931579c9b 100644 --- a/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/service/DatasourceService.java +++ b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/service/DatasourceService.java @@ -1,11 +1,8 @@ package io.dataease.plugins.datasource.service; import io.dataease.plugins.common.dto.datasource.DataSourceType; -import io.dataease.plugins.common.entity.XpackGridRequest; import io.dataease.plugins.common.service.PluginComponentService; -import java.util.List; - public abstract class DatasourceService extends PluginComponentService { abstract public DataSourceType getDataSourceType(); diff --git a/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/auth/service/ColumnPermissionService.java b/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/auth/service/ColumnPermissionService.java index cecf010176..318c817385 100644 --- a/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/auth/service/ColumnPermissionService.java +++ b/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/auth/service/ColumnPermissionService.java @@ -1,6 +1,5 @@ package io.dataease.plugins.xpack.auth.service; -import io.dataease.plugins.common.entity.XpackGridRequest; import io.dataease.plugins.common.service.PluginComponentService; import io.dataease.plugins.xpack.auth.dto.request.DataSetColumnPermissionsDTO; import io.dataease.plugins.xpack.auth.dto.request.DatasetColumnPermissions; @@ -9,9 +8,9 @@ import java.util.List; public abstract class ColumnPermissionService extends PluginComponentService { public abstract List searchPermissions(DataSetColumnPermissionsDTO request); - public abstract List queryPermissions(XpackGridRequest arg0) ; + public abstract List queryPermissions(String tableId) ; public abstract DatasetColumnPermissions save(DatasetColumnPermissions datasetColumnPermissions); public abstract void delete(String id); - public abstract List authObjs(DataSetColumnPermissionsDTO request); + public abstract List authObjs(DataSetColumnPermissionsDTO request); public abstract DataSetColumnPermissionsDTO permissionInfo(DataSetColumnPermissionsDTO datasetRowPermissions); } diff --git a/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/auth/service/RowPermissionService.java b/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/auth/service/RowPermissionService.java index 8b08e72b9b..c7297fa88a 100644 --- a/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/auth/service/RowPermissionService.java +++ b/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/auth/service/RowPermissionService.java @@ -1,6 +1,5 @@ package io.dataease.plugins.xpack.auth.service; -import io.dataease.plugins.common.entity.XpackGridRequest; import io.dataease.plugins.common.service.PluginComponentService; import io.dataease.plugins.xpack.auth.dto.request.DataSetRowPermissionsDTO; import io.dataease.plugins.xpack.auth.dto.request.DatasetRowPermissions; @@ -9,7 +8,7 @@ import java.util.List; public abstract class RowPermissionService extends PluginComponentService { public abstract List searchRowPermissions(DataSetRowPermissionsDTO request); - public abstract List queryRowPermissions(XpackGridRequest arg0) ; + public abstract List queryRowPermissions(String tableId) ; public abstract void save(DatasetRowPermissions datasetRowPermissions); public abstract void delete(String id); public abstract List authObjs(DataSetRowPermissionsDTO request); diff --git a/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/email/service/EmailXpackService.java b/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/email/service/EmailXpackService.java index 9619dfaae7..acd90f66ab 100644 --- a/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/email/service/EmailXpackService.java +++ b/sdk/dataease-plugin-interface/src/main/java/io/dataease/plugins/xpack/email/service/EmailXpackService.java @@ -1,10 +1,7 @@ package io.dataease.plugins.xpack.email.service; -import java.util.List; - import io.dataease.plugins.common.entity.GlobalTaskEntity; import io.dataease.plugins.common.entity.GlobalTaskInstance; -import io.dataease.plugins.common.entity.XpackGridRequest; import io.dataease.plugins.common.service.PluginMenuService; import io.dataease.plugins.xpack.email.dto.request.XpackEmailInstanceGridRequest; import io.dataease.plugins.xpack.email.dto.request.XpackEmailTaskGridRequest; @@ -15,6 +12,8 @@ import io.dataease.plugins.xpack.email.dto.response.XpackTaskEntity; import io.dataease.plugins.xpack.email.dto.response.XpackTaskGridDTO; import io.dataease.plugins.xpack.email.dto.response.XpackTaskInstanceDTO; +import java.util.List; + public abstract class EmailXpackService extends PluginMenuService { public abstract int save(XpackEmailTaskRequest request) throws Exception; @@ -53,7 +52,6 @@ public abstract class EmailXpackService extends PluginMenuService { public abstract void batchDel(List taskIds); - public abstract void export(XpackGridRequest request); public abstract Boolean status(Long taskId);