From dddc473c582e983674913163dd4e93f840effbdb Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 10:54:55 +0800
Subject: [PATCH] fix(search): 修复多处搜索条件未生效的问题
---
yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiChartConfigController.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiChartConfigController.java b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiChartConfigController.java
index aed04a1..a2d3f6e 100644
--- a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiChartConfigController.java
+++ b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/BiChartConfigController.java
@@ -2,17 +2,25 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.bi.controller.admin.config.vo.BiChartConfigImportExcelVO;
+import cn.iocoder.yudao.module.bi.controller.admin.config.vo.BiChartConfigImportReqVO;
+import cn.iocoder.yudao.module.bi.controller.admin.config.vo.BiChartConfigImportRespVO;
import cn.iocoder.yudao.module.bi.dal.dataobject.BiChartConfigDO;
import cn.iocoder.yudao.module.bi.service.config.BiChartConfigService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -62,9 +70,32 @@
@PreAuthorize("@ss.hasPermission('bi:chart-config:query')")
public CommonResult<PageResult<BiChartConfigDO>> getPage(
@RequestParam(value = "dashboardId", required = false) Long dashboardId,
+ @RequestParam(value = "name", required = false) String name,
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
- return success(chartConfigService.getPage(dashboardId, pageNo, pageSize));
+ return success(chartConfigService.getPage(dashboardId, name, pageNo, pageSize));
+ }
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆鍥捐〃閰嶇疆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<BiChartConfigImportExcelVO> list = Arrays.asList(
+ BiChartConfigImportExcelVO.builder().name("绀轰緥鍥捐〃").dashboardName("绀轰緥浠〃鐩�")
+ .chartType("bar").dataSourceName("绀轰緥鏁版嵁婧�").querySql("select 1")
+ .position("").chartOptions("").refreshInterval(0).sort(0).status(1).build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "鍥捐〃閰嶇疆瀵煎叆妯℃澘.xls", "鍥捐〃閰嶇疆鍒楄〃", BiChartConfigImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆鍥捐〃閰嶇疆")
+ @PreAuthorize("@ss.hasPermission('bi:chart-config:import')")
+ public CommonResult<BiChartConfigImportRespVO> importExcel(@Valid BiChartConfigImportReqVO importReqVO)
+ throws Exception {
+ List<BiChartConfigImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), BiChartConfigImportExcelVO.class);
+ return success(chartConfigService.importChartConfigList(list, importReqVO));
}
}
--
Gitblit v1.9.3