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/DecisionAlertRuleController.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/decision/DecisionAlertRuleController.java b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/decision/DecisionAlertRuleController.java
index 6fba522..54607b2 100644
--- a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/decision/DecisionAlertRuleController.java
+++ b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/decision/DecisionAlertRuleController.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.DecisionAlertRuleImportExcelVO;
+import cn.iocoder.yudao.module.bi.controller.admin.decision.vo.DecisionAlertRuleImportReqVO;
+import cn.iocoder.yudao.module.bi.controller.admin.decision.vo.DecisionAlertRuleImportRespVO;
import cn.iocoder.yudao.module.bi.controller.admin.decision.vo.DecisionAlertRulePageReqVO;
import cn.iocoder.yudao.module.bi.dal.dataobject.decision.BiAlertRuleDO;
import cn.iocoder.yudao.module.bi.service.decision.BiAlertRuleService;
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;
@@ -61,4 +71,26 @@
return success(alertRuleService.getRulePage(pageReq));
}
-}
\ No newline at end of file
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆棰勮瑙勫垯妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<DecisionAlertRuleImportExcelVO> list = Arrays.asList(
+ DecisionAlertRuleImportExcelVO.builder().name("绀轰緥棰勮瑙勫垯").kpiCode("绀轰緥KPI缂栫爜")
+ .severity(1).comparisonOperator(">").thresholdValue(BigDecimal.ZERO)
+ .notificationType("system").enabled(1).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "棰勮瑙勫垯瀵煎叆妯℃澘.xls", "棰勮瑙勫垯鍒楄〃", DecisionAlertRuleImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆棰勮瑙勫垯")
+ @PreAuthorize("@ss.hasPermission('bi:decision:alert-rule:import')")
+ public CommonResult<DecisionAlertRuleImportRespVO> importExcel(@Valid DecisionAlertRuleImportReqVO importReqVO)
+ throws Exception {
+ List<DecisionAlertRuleImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), DecisionAlertRuleImportExcelVO.class);
+ return success(alertRuleService.importAlertRuleList(list, importReqVO));
+ }
+
+}
--
Gitblit v1.9.3