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/decision/DecisionKpiDefinitionController.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/decision/DecisionKpiDefinitionController.java b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/decision/DecisionKpiDefinitionController.java
index f8d1963..ec14709 100644
--- a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/decision/DecisionKpiDefinitionController.java
+++ b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/decision/DecisionKpiDefinitionController.java
@@ -2,16 +2,26 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.bi.controller.admin.decision.vo.DecisionKpiDefinitionImportExcelVO;
+import cn.iocoder.yudao.module.bi.controller.admin.decision.vo.DecisionKpiDefinitionImportReqVO;
+import cn.iocoder.yudao.module.bi.controller.admin.decision.vo.DecisionKpiDefinitionImportRespVO;
import cn.iocoder.yudao.module.bi.controller.admin.decision.vo.DecisionKpiDefinitionPageReqVO;
import cn.iocoder.yudao.module.bi.dal.dataobject.decision.BiKpiDefinitionDO;
import cn.iocoder.yudao.module.bi.service.decision.BiKpiDefinitionService;
import io.swagger.v3.oas.annotations.Operation;
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.math.BigDecimal;
+import java.util.Arrays;
+import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -68,4 +78,27 @@
return success(kpiDefinitionService.getKpiPage(new DecisionKpiDefinitionPageReqVO()));
}
-}
\ No newline at end of file
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆KPI鎸囨爣妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<DecisionKpiDefinitionImportExcelVO> list = Arrays.asList(
+ DecisionKpiDefinitionImportExcelVO.builder().code("绀轰緥KPI缂栫爜").name("绀轰緥KPI鍚嶇О")
+ .category("power_supply").unit("").dataSource("sql").querySql("select 1")
+ .chartType("bar").thresholdWarn(BigDecimal.ZERO).thresholdCritical(BigDecimal.ZERO)
+ .comparisonOperator(">").refreshInterval(0).sort(0).status(1).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "KPI鎸囨爣瀵煎叆妯℃澘.xls", "KPI鎸囨爣鍒楄〃", DecisionKpiDefinitionImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆KPI鎸囨爣")
+ @PreAuthorize("@ss.hasPermission('bi:decision:kpi:import')")
+ public CommonResult<DecisionKpiDefinitionImportRespVO> importExcel(@Valid DecisionKpiDefinitionImportReqVO importReqVO)
+ throws Exception {
+ List<DecisionKpiDefinitionImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), DecisionKpiDefinitionImportExcelVO.class);
+ return success(kpiDefinitionService.importKpiDefinitionList(list, importReqVO));
+ }
+
+}
--
Gitblit v1.9.3