public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-23 13:58:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 恢复因为增加日志修改的api

Browse Source
This commit is contained in:
fit2cloud-chenyw
2022-05-28 21:35:06 +08:00
parent 7974ae2abd
commit 6fd3ccf91b
7 changed files with 59 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java
View File

@@ -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

23
backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
View File

@@ -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")

16
backend/src/main/java/io/dataease/controller/datasource/request/DeleteDsRequest.java
View File

@@ -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;
}