diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java
index 7379928d79..d6d8620060 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java
@@ -7,8 +7,10 @@ import io.dataease.auth.annotation.DePermissions;
import io.dataease.commons.constants.DePermissionType;
import io.dataease.commons.constants.ResourceAuthLevel;
import io.dataease.commons.constants.SysLogConstants;
+import io.dataease.commons.utils.DeLogUtils;
import io.dataease.controller.dataset.request.DeleteGroupRequest;
import io.dataease.controller.request.dataset.DataSetGroupRequest;
+import io.dataease.dto.SysLogDTO;
import io.dataease.dto.dataset.DataSetGroupDTO;
import io.dataease.plugins.common.base.domain.DatasetGroup;
import io.dataease.service.dataset.DataSetGroupService;
@@ -60,15 +62,12 @@ public class DataSetGroupController {
@DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
@ApiOperation("删除")
- @PostMapping("/delete")
- @DeLog(
- operatetype = SysLogConstants.OPERATE_TYPE.DELETE,
- sourcetype = SysLogConstants.SOURCE_TYPE.DATASET,
- positionIndex = 0,positionKey = "pid",
- value = "id"
- )
- public void tree(@RequestBody DeleteGroupRequest request) throws Exception {
- dataSetGroupService.delete(request.getId());
+ @PostMapping("/delete/{id}")
+ public void delete(@PathVariable String id) throws Exception {
+ DatasetGroup datasetGroup = dataSetGroupService.getScene(id);
+ SysLogDTO sysLogDTO = DeLogUtils.buildLog(SysLogConstants.OPERATE_TYPE.DELETE, SysLogConstants.SOURCE_TYPE.DATASET, id, datasetGroup.getPid(), null, null);
+ dataSetGroupService.delete(id);
+ DeLogUtils.save(sysLogDTO);
}
@ApiIgnore
diff --git a/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java b/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
index c8de6b1d16..060d9b4e60 100644
--- a/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
+++ b/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
@@ -4,7 +4,8 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.auth.annotation.DeLog;
import io.dataease.auth.annotation.DePermission;
import io.dataease.commons.constants.SysLogConstants;
-import io.dataease.controller.datasource.request.DeleteDsRequest;
+import io.dataease.commons.utils.DeLogUtils;
+import io.dataease.dto.SysLogDTO;
import io.dataease.plugins.common.base.domain.Datasource;
import io.dataease.commons.constants.DePermissionType;
import io.dataease.commons.constants.ResourceAuthLevel;
@@ -14,13 +15,12 @@ import io.dataease.controller.datasource.request.UpdataDsRequest;
import io.dataease.controller.request.DatasourceUnionRequest;
import io.dataease.controller.request.datasource.ApiDefinition;
import io.dataease.dto.datasource.DBTableDTO;
-import io.dataease.plugins.common.dto.datasource.DataSourceType;
import io.dataease.service.datasource.DatasourceService;
import io.dataease.dto.DatasourceDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.pentaho.di.core.database.DataSourceProviderInterface;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -90,15 +90,14 @@ public class DatasourceController {
@RequiresPermissions("datasource:read")
@DePermission(type = DePermissionType.DATASOURCE, level = ResourceAuthLevel.DATASOURCE_LEVEL_MANAGE, value = "id")
@ApiOperation("删除数据源")
- @PostMapping("/delete")
- @DeLog(
- operatetype = SysLogConstants.OPERATE_TYPE.DELETE,
- sourcetype = SysLogConstants.SOURCE_TYPE.DATASOURCE,
- positionIndex = 0,positionKey = "type",
- value = "id"
- )
- public ResultHolder deleteDatasource(@RequestBody DeleteDsRequest request) throws Exception {
- return datasourceService.deleteDatasource(request.getId());
+ @PostMapping("/delete/{datasourceID}")
+ public ResultHolder deleteDatasource(@PathVariable(value = "datasourceID") String datasourceID) throws Exception {
+ Datasource datasource = datasourceService.get(datasourceID);
+ SysLogDTO sysLogDTO = DeLogUtils.buildLog(SysLogConstants.OPERATE_TYPE.DELETE, SysLogConstants.SOURCE_TYPE.DATASOURCE, datasourceID, datasource.getType(), null, null);
+ ResultHolder resultHolder = datasourceService.deleteDatasource(datasourceID);
+ if (ObjectUtils.isNotEmpty(resultHolder) && resultHolder.isSuccess())
+ DeLogUtils.save(sysLogDTO);
+ return resultHolder;
}
@RequiresPermissions("datasource:read")
diff --git a/backend/src/main/java/io/dataease/controller/datasource/request/DeleteDsRequest.java b/backend/src/main/java/io/dataease/controller/datasource/request/DeleteDsRequest.java
deleted file mode 100644
index c31818bbf8..0000000000
--- a/backend/src/main/java/io/dataease/controller/datasource/request/DeleteDsRequest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.dataease.controller.datasource.request;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class DeleteDsRequest implements Serializable {
-
- @ApiModelProperty(value = "ID",required = true)
- private String id;
-
- @ApiModelProperty(value = "类型", required = true)
- private String type;
-}
diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js
index 0a18529a89..5a8d5d891b 100644
--- a/frontend/src/api/dataset/dataset.js
+++ b/frontend/src/api/dataset/dataset.js
@@ -26,12 +26,11 @@ export function addGroup(data) {
})
}
-export function delGroup(data) {
+export function delGroup(groupId) {
return request({
- url: '/dataset/group/delete',
+ url: '/dataset/group/delete/' + groupId,
loading: true,
- method: 'post',
- data
+ method: 'post'
})
}
diff --git a/frontend/src/api/system/datasource.js b/frontend/src/api/system/datasource.js
index f7ff85e801..346bdadbf4 100644
--- a/frontend/src/api/system/datasource.js
+++ b/frontend/src/api/system/datasource.js
@@ -61,12 +61,11 @@ export function editDs(data) {
})
}
-export function delDs(data) {
+export function delDs(id) {
return request({
- url: 'datasource/delete',
+ url: 'datasource/delete/' + id,
loading: true,
- method: 'post',
- data
+ method: 'post'
})
}
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index 5f31e07346..91b952da3d 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -461,8 +461,7 @@ export default {
cancelButtonText: this.$t('dataset.cancel'),
type: 'warning'
}).then(() => {
- const param = { id: data.id, pid: data.pid }
- delGroup(param).then(response => {
+ delGroup(data.id).then(response => {
this.$message({
type: 'success',
message: this.$t('dataset.delete_success'),
diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue
index aa0b557a72..98e9c4e011 100644
--- a/frontend/src/views/system/datasource/DsTree.vue
+++ b/frontend/src/views/system/datasource/DsTree.vue
@@ -2,13 +2,12 @@
-
-
-
+
+
-
+
@@ -39,16 +38,16 @@
-
+
-
+
-
+
-
+
-
+
-
+
-