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-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java
index 363769d..bc4952c 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java
@@ -5,7 +5,11 @@
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.infra.api.websocket.WebSocketSenderApi;
+import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeImportExcelVO;
+import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeImportReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeImportRespVO;
import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticePageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeRespVO;
import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeSaveReqVO;
@@ -15,11 +19,14 @@
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;
@@ -99,4 +106,25 @@
return success(true);
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆閫氱煡鍏憡妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<NoticeImportExcelVO> list = Arrays.asList(
+ NoticeImportExcelVO.builder().title("绀轰緥鍏憡").type(1).content("鍏憡鍐呭")
+ .status(0).build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "閫氱煡鍏憡瀵煎叆妯℃澘.xls", "閫氱煡鍏憡鍒楄〃", NoticeImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆閫氱煡鍏憡")
+ @PreAuthorize("@ss.hasPermission('system:notice:import')")
+ public CommonResult<NoticeImportRespVO> importExcel(@Valid NoticeImportReqVO importReqVO)
+ throws Exception {
+ List<NoticeImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), NoticeImportExcelVO.class);
+ return success(noticeService.importNoticeList(list, importReqVO));
+ }
+
}
--
Gitblit v1.9.3