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 f39c51ebc3..a8b5335cd0 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/backend/src/main/java/io/dataease/service/sys/log/LogService.java b/backend/src/main/java/io/dataease/service/sys/log/LogService.java index 634f6f3305..b3687f1cbc 100644 --- a/backend/src/main/java/io/dataease/service/sys/log/LogService.java +++ b/backend/src/main/java/io/dataease/service/sys/log/LogService.java @@ -48,7 +48,10 @@ public class LogService { // 排除驱动和驱动文件的公共操作的资源类型 - private static Integer[] COMMON_SOURCE = {1, 2,3,4,6,7,8,9}; + // 暂时屏蔽视图日志 + // private static Integer[] COMMON_SOURCE = {1, 2,3,4,6,7,8,9}; + + private static Integer[] COMMON_SOURCE = {1, 2,3,6,7,8,9}; // 增 改 删 针对公共资源的操作 private static Integer[] COMMON_SOURCE_OPERATE = {1 ,2 , 3}; diff --git a/backend/src/main/resources/db/migration/V35__1.11.sql b/backend/src/main/resources/db/migration/V35__1.11.sql index f8681985aa..8d60fec0e5 100644 --- a/backend/src/main/resources/db/migration/V35__1.11.sql +++ b/backend/src/main/resources/db/migration/V35__1.11.sql @@ -57,6 +57,8 @@ UPDATE `chart_view` SET `view_fields` = '[]'; ALTER TABLE `chart_view_cache` ADD COLUMN `view_fields` LONGTEXT COMMENT '视图字段集合'; UPDATE `chart_view_cache` SET `view_fields` = '[]'; +INSERT INTO `my_plugin`(`plugin_id`, `name`, `store`, `free`, `cost`, `category`, `descript`, `version`, `install_type`, `creator`, `load_mybatis`, `release_time`, `install_time`, `module_name`, `icon`, `ds_type`) VALUES (11, '符号地图插件', 'default', 0, 10000, 'view', '请购买正式许可', '1.0-SNAPSHOT', NULL, 'DATAEASE', 0, NULL, 1652174790928, 'view-symbolmap-backend', NULL, NULL); + INSERT INTO `my_plugin` (`name`, `store`, `free`, `cost`, `category`, `descript`, `version`, `creator`, `load_mybatis`, `install_time`, `module_name`, `ds_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/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue index 0c3b8a8293..bf683a80d9 100644 --- a/frontend/src/components/DeDrag/index.vue +++ b/frontend/src/components/DeDrag/index.vue @@ -759,7 +759,7 @@ export default { elementMouseDown(e) { // private 设置当前组件数据及状态 this.$store.commit('setClickComponentStatus', true) - if (this.element.component !== 'v-text' && this.element.component !== 'de-rich-text' && this.element.component !== 'rect-shape' && this.element.component !== 'de-input-search' && this.element.component !== 'de-select-grid' && this.element.component !== 'de-number-range' && this.element.component !== 'de-date') { + if (this.element.component !== 'de-frame' && this.element.component !== 'v-text' && this.element.component !== 'de-rich-text' && this.element.component !== 'rect-shape' && this.element.component !== 'de-input-search' && this.element.component !== 'de-select-grid' && this.element.component !== 'de-number-range' && this.element.component !== 'de-date') { e.preventDefault() } // 阻止冒泡事件 diff --git a/frontend/src/components/canvas/custom-component/DeStreamMedia.vue b/frontend/src/components/canvas/custom-component/DeStreamMedia.vue index 23ec89cc24..dfc68d2a41 100644 --- a/frontend/src/components/canvas/custom-component/DeStreamMedia.vue +++ b/frontend/src/components/canvas/custom-component/DeStreamMedia.vue @@ -2,7 +2,7 @@