From 714dd2f9c80961d0832ab67321065913b11c3ff2 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 31 May 2024 18:07:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/exportCenter/manage/ExportCenterManage.java | 2 +- .../src/views/visualized/data/dataset/ExportExcel.vue | 2 +- .../api/permissions/dataset/api/ColumnPermissionsApi.java | 4 +--- .../api/permissions/dataset/api/RowPermissionsApi.java | 4 ++-- .../api/permissions/variable/api/SysVariablesApi.java | 6 +++--- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java index 2d435bc732..744f79da9e 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java +++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java @@ -160,7 +160,7 @@ public class ExportCenterManage { exportTaskMapper.updateById(exportTask); FileUtils.deleteDirectoryRecursively(exportData_path + id); if (exportTask.getExportFromType().equalsIgnoreCase("chart")) { - ChartExcelRequest request = JsonUtil.parse(exportTask.getParams(), ChartExcelRequest.class); + ChartExcelRequest request = JsonUtil.parseObject(exportTask.getParams(), ChartExcelRequest.class); startViewTask(exportTask, request); } } diff --git a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue index f2a393432f..cf28672629 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue @@ -426,7 +426,7 @@ defineExpose({ - + diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/ColumnPermissionsApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/ColumnPermissionsApi.java index c8db52666b..2c0b4e9c31 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/ColumnPermissionsApi.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/ColumnPermissionsApi.java @@ -2,8 +2,6 @@ package io.dataease.api.permissions.dataset.api; import com.baomidou.mybatisplus.core.metadata.IPage; import io.dataease.api.permissions.dataset.dto.DataSetColumnPermissionsDTO; -import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO; -import io.dataease.api.permissions.dataset.dto.Item; import io.dataease.auth.DeApiPath; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -19,7 +17,7 @@ import static io.dataease.constant.AuthResourceEnum.DATASET; public interface ColumnPermissionsApi { @GetMapping("/pager/{datasetId}/{goPage}/{pageSize}") - public IPage columnPermissions(@PathVariable Long datasetId, @PathVariable int goPage, @PathVariable int pageSize); + public IPage columnPermissions(@PathVariable("datasetId") Long datasetId, @PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize); @PostMapping("save") public void save(@RequestBody DataSetColumnPermissionsDTO dataSetColumnPermissionsDTO); diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/RowPermissionsApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/RowPermissionsApi.java index 11c4108f41..da2d1b0cf2 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/RowPermissionsApi.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/api/RowPermissionsApi.java @@ -18,7 +18,7 @@ import static io.dataease.constant.AuthResourceEnum.DATASET; public interface RowPermissionsApi { @GetMapping("/pager/{datasetId}/{goPage}/{pageSize}") - public IPage rowPermissions(@PathVariable Long datasetId, @PathVariable int goPage, @PathVariable int pageSize); + public IPage rowPermissions(@PathVariable("datasetId") Long datasetId, @PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize); @PostMapping("save") @@ -30,7 +30,7 @@ public interface RowPermissionsApi { @GetMapping("/authObjs/{datasetId}/{type}") - public List authObjs(@PathVariable Long datasetId, @PathVariable String type); + public List authObjs(@PathVariable("datasetId") Long datasetId, @PathVariable("type") String type); @PostMapping("/dataSetRowPermissionInfo") public DataSetRowPermissionsTreeDTO dataSetRowPermissionInfo(@RequestBody DataSetRowPermissionsTreeDTO request); diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/api/SysVariablesApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/api/SysVariablesApi.java index 11be8eae9c..0c094f74b1 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/api/SysVariablesApi.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/variable/api/SysVariablesApi.java @@ -32,11 +32,11 @@ public interface SysVariablesApi { @Operation(summary = "删除") @GetMapping("/delete/{id}") - void delete(@PathVariable Long id); + void delete(@PathVariable("id") Long id); @Operation(summary = "详细信息") @GetMapping("/detail/{id}") - SysVariableDto detail(@PathVariable Long id); + SysVariableDto detail(@PathVariable("id") Long id); @Operation(summary = "查询") @PostMapping("/query") @@ -52,7 +52,7 @@ public interface SysVariablesApi { @Operation(summary = "删除") @GetMapping("/value/delete/{id}") - void deleteValue(@PathVariable String id); + void deleteValue(@PathVariable("id") String id); @GetMapping("/value/selected/{id}") List selectVariableValue(@PathVariable("id") Long id);