From 0fc796b90d3f44b81ef30285edb897223df439f7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:04:09 +0800
Subject: [PATCH] update 适配 javax.servlet 替换为 jakarta.servlet 更新所有代码 update 适配 ServletUtils 更换继承 JakartaServletUtil
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java
index b241cc8..2bce8a7 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java
@@ -2,14 +2,13 @@
import cn.hutool.core.collection.CollUtil;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Data;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -20,7 +19,6 @@
*
* @author Lion Li
*/
-@Tag(name ="娴嬭瘯Excel鍔熻兘", description = "娴嬭瘯Excel鍔熻兘")
@RestController
@RequestMapping("/demo/excel")
public class TestExcelController {
@@ -30,18 +28,18 @@
*/
@GetMapping("/exportTemplateOne")
public void exportTemplateOne(HttpServletResponse response) {
- Map<String,String> map = new HashMap<>();
- map.put("title","鍗曞垪琛ㄥ鏁版嵁");
- map.put("test1","鏁版嵁娴嬭瘯1");
- map.put("test2","鏁版嵁娴嬭瘯2");
- map.put("test3","鏁版嵁娴嬭瘯3");
- map.put("test4","鏁版嵁娴嬭瘯4");
- map.put("testTest","666");
+ Map<String, String> map = new HashMap<>();
+ map.put("title", "鍗曞垪琛ㄥ鏁版嵁");
+ map.put("test1", "鏁版嵁娴嬭瘯1");
+ map.put("test2", "鏁版嵁娴嬭瘯2");
+ map.put("test3", "鏁版嵁娴嬭瘯3");
+ map.put("test4", "鏁版嵁娴嬭瘯4");
+ map.put("testTest", "666");
List<TestObj> list = new ArrayList<>();
list.add(new TestObj("鍗曞垪琛ㄦ祴璇�1", "鍒楄〃娴嬭瘯1", "鍒楄〃娴嬭瘯2", "鍒楄〃娴嬭瘯3", "鍒楄〃娴嬭瘯4"));
list.add(new TestObj("鍗曞垪琛ㄦ祴璇�2", "鍒楄〃娴嬭瘯5", "鍒楄〃娴嬭瘯6", "鍒楄〃娴嬭瘯7", "鍒楄〃娴嬭瘯8"));
list.add(new TestObj("鍗曞垪琛ㄦ祴璇�3", "鍒楄〃娴嬭瘯9", "鍒楄〃娴嬭瘯10", "鍒楄〃娴嬭瘯11", "鍒楄〃娴嬭瘯12"));
- ExcelUtil.exportTemplate(CollUtil.newArrayList(map,list),"鍗曞垪琛�.xlsx", "excel/鍗曞垪琛�.xlsx", response);
+ ExcelUtil.exportTemplate(CollUtil.newArrayList(map, list), "鍗曞垪琛�.xlsx", "excel/鍗曞垪琛�.xlsx", response);
}
/**
@@ -49,12 +47,12 @@
*/
@GetMapping("/exportTemplateMuliti")
public void exportTemplateMuliti(HttpServletResponse response) {
- Map<String,String> map = new HashMap<>();
- map.put("title1","鏍囬1");
- map.put("title2","鏍囬2");
- map.put("title3","鏍囬3");
- map.put("title4","鏍囬4");
- map.put("author","Lion Li");
+ Map<String, String> map = new HashMap<>();
+ map.put("title1", "鏍囬1");
+ map.put("title2", "鏍囬2");
+ map.put("title3", "鏍囬3");
+ map.put("title4", "鏍囬4");
+ map.put("author", "Lion Li");
List<TestObj1> list1 = new ArrayList<>();
list1.add(new TestObj1("list1娴嬭瘯1", "list1娴嬭瘯2", "list1娴嬭瘯3"));
list1.add(new TestObj1("list1娴嬭瘯4", "list1娴嬭瘯5", "list1娴嬭瘯6"));
@@ -69,12 +67,12 @@
list4.add(new TestObj1("list4娴嬭瘯4", "list4娴嬭瘯5", "list4娴嬭瘯6"));
list4.add(new TestObj1("list4娴嬭瘯7", "list4娴嬭瘯8", "list4娴嬭瘯9"));
list4.add(new TestObj1("list4娴嬭瘯10", "list4娴嬭瘯11", "list4娴嬭瘯12"));
- Map<String,Object> multiListMap = new HashMap<>();
- multiListMap.put("map",map);
- multiListMap.put("data1",list1);
- multiListMap.put("data2",list2);
- multiListMap.put("data3",list3);
- multiListMap.put("data4",list4);
+ Map<String, Object> multiListMap = new HashMap<>();
+ multiListMap.put("map", map);
+ multiListMap.put("data1", list1);
+ multiListMap.put("data2", list2);
+ multiListMap.put("data3", list3);
+ multiListMap.put("data4", list4);
ExcelUtil.exportTemplateMultiList(multiListMap, "澶氬垪琛�.xlsx", "excel/澶氬垪琛�.xlsx", response);
}
--
Gitblit v1.9.3