Skip to content

Commit fd27cd6

Browse files
author
zhuoda
committed
【V3.2.0】1、左侧菜单Logo和标题固定;2、Excel导出添加水印;3、长时间不在线自动返回登录页;4、移除sa-token的 token-prefix 配置;5、升级 ant deign vue到最新版4.2;6、登录页面引入登录类型图标方式;7、文件预览组件的文件下载方式为接口方式下载;
1 parent 9c44fe3 commit fd27cd6

File tree

27 files changed

+731
-282
lines changed

27 files changed

+731
-282
lines changed

smart-admin-api/pom.xml

+7
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<xerces.version>2.12.0</xerces.version>
4040
<easy-excel.version>3.3.2</easy-excel.version>
4141
<poi.version>5.2.4</poi.version>
42+
<ooxml-schemas.version>1.4</ooxml-schemas.version>
4243
<aws-java-sdk.version>1.11.842</aws-java-sdk.version>
4344
<log4j-spring-boot.version>2.17.2</log4j-spring-boot.version>
4445
<hutool.version>5.7.22</hutool.version>
@@ -288,6 +289,12 @@
288289
<version>${poi.version}</version>
289290
</dependency>
290291

292+
<dependency>
293+
<groupId>org.apache.poi</groupId>
294+
<artifactId>ooxml-schemas</artifactId>
295+
<version>${ooxml-schemas.version}</version>
296+
</dependency>
297+
291298
<dependency>
292299
<groupId>com.fasterxml.jackson.datatype</groupId>
293300
<artifactId>jackson-datatype-jsr310</artifactId>

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/controller/GoodsController.java

+3-13
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package net.lab1024.sa.admin.module.business.goods.controller;
22

33
import cn.dev33.satoken.annotation.SaCheckPermission;
4-
import com.alibaba.excel.EasyExcel;
5-
import io.swagger.v3.oas.annotations.tags.Tag;
64
import io.swagger.v3.oas.annotations.Operation;
5+
import io.swagger.v3.oas.annotations.tags.Tag;
76
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
87
import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsAddForm;
98
import net.lab1024.sa.admin.module.business.goods.domain.form.GoodsQueryForm;
@@ -14,7 +13,7 @@
1413
import net.lab1024.sa.base.common.domain.PageResult;
1514
import net.lab1024.sa.base.common.domain.ResponseDTO;
1615
import net.lab1024.sa.base.common.domain.ValidateList;
17-
import net.lab1024.sa.base.common.util.SmartResponseUtil;
16+
import net.lab1024.sa.base.common.util.SmartExcelUtil;
1817
import org.springframework.web.bind.annotation.*;
1918
import org.springframework.web.multipart.MultipartFile;
2019

@@ -88,17 +87,8 @@ public ResponseDTO<String> importGoods(@RequestParam MultipartFile file) {
8887
@GetMapping("/goods/exportGoods")
8988
@SaCheckPermission("goods:exportGoods")
9089
public void exportGoods(HttpServletResponse response) throws IOException {
91-
9290
List<GoodsExcelVO> goodsList = goodsService.getAllGoods();
93-
94-
// 设置下载消息头
95-
SmartResponseUtil.setDownloadFileHeader(response, "商品列表.xls", null);
96-
97-
// 下载
98-
EasyExcel.write(response.getOutputStream(), GoodsExcelVO.class)
99-
.autoCloseStream(Boolean.FALSE)
100-
.sheet("商品")
101-
.doWrite(goodsList);
91+
SmartExcelUtil.exportExcel(response,"商品列表.xlsx","商品",GoodsExcelVO.class, goodsList);
10292
}
10393

10494
}

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/enterprise/EnterpriseController.java

+7-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package net.lab1024.sa.admin.module.business.oa.enterprise;
22

33
import cn.dev33.satoken.annotation.SaCheckPermission;
4-
import com.alibaba.excel.EasyExcel;
54
import io.swagger.v3.oas.annotations.Operation;
65
import io.swagger.v3.oas.annotations.tags.Tag;
76
import lombok.extern.slf4j.Slf4j;
@@ -11,11 +10,11 @@
1110
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseExcelVO;
1211
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseListVO;
1312
import net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseVO;
13+
import net.lab1024.sa.admin.util.AdminRequestUtil;
1414
import net.lab1024.sa.base.common.domain.PageResult;
1515
import net.lab1024.sa.base.common.domain.RequestUser;
1616
import net.lab1024.sa.base.common.domain.ResponseDTO;
17-
import net.lab1024.sa.base.common.util.SmartRequestUtil;
18-
import net.lab1024.sa.base.common.util.SmartResponseUtil;
17+
import net.lab1024.sa.base.common.util.*;
1918
import net.lab1024.sa.base.module.support.operatelog.annotation.OperateLog;
2019
import org.apache.commons.collections.CollectionUtils;
2120
import org.springframework.web.bind.annotation.*;
@@ -24,6 +23,7 @@
2423
import javax.servlet.http.HttpServletResponse;
2524
import javax.validation.Valid;
2625
import java.io.IOException;
26+
import java.time.LocalDateTime;
2727
import java.util.List;
2828

2929
/**
@@ -60,14 +60,11 @@ public void exportExcel(@RequestBody @Valid EnterpriseQueryForm queryForm, HttpS
6060
return;
6161
}
6262

63-
// 设置下载消息头
64-
SmartResponseUtil.setDownloadFileHeader(response, "企业基本信息.xls", null);
63+
String watermark = AdminRequestUtil.getRequestUser().getActualName();
64+
watermark += SmartLocalDateUtil.format(LocalDateTime.now(), SmartDateFormatterEnum.YMD_HMS);
65+
66+
SmartExcelUtil.exportExcelWithWatermark(response,"企业基本信息.xlsx","企业信息",EnterpriseExcelVO.class,data,watermark);
6567

66-
// 下载
67-
EasyExcel.write(response.getOutputStream(), EnterpriseExcelVO.class)
68-
.autoCloseStream(Boolean.FALSE)
69-
.sheet("企业信息")
70-
.doWrite(data);
7168
}
7269

7370
@Operation(summary = "查询企业详情 @author 开云")

smart-admin-api/sa-base/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,11 @@
248248
<artifactId>poi-scratchpad</artifactId>
249249
</dependency>
250250

251+
<dependency>
252+
<groupId>org.apache.poi</groupId>
253+
<artifactId>ooxml-schemas</artifactId>
254+
</dependency>
255+
251256
<dependency>
252257
<groupId>com.fasterxml.jackson.datatype</groupId>
253258
<artifactId>jackson-datatype-jsr310</artifactId>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,226 @@
1+
package net.lab1024.sa.base.common.util;
2+
3+
import com.alibaba.excel.EasyExcel;
4+
import com.alibaba.excel.write.handler.SheetWriteHandler;
5+
import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
6+
import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
7+
import lombok.Data;
8+
import lombok.extern.slf4j.Slf4j;
9+
import org.apache.poi.openxml4j.opc.PackagePartName;
10+
import org.apache.poi.openxml4j.opc.PackageRelationship;
11+
import org.apache.poi.openxml4j.opc.TargetMode;
12+
import org.apache.poi.xssf.usermodel.XSSFPictureData;
13+
import org.apache.poi.xssf.usermodel.XSSFRelation;
14+
import org.apache.poi.xssf.usermodel.XSSFSheet;
15+
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
16+
17+
import javax.imageio.ImageIO;
18+
import javax.servlet.http.HttpServletResponse;
19+
import javax.swing.*;
20+
import java.awt.*;
21+
import java.awt.geom.AffineTransform;
22+
import java.awt.image.BufferedImage;
23+
import java.io.ByteArrayOutputStream;
24+
import java.io.IOException;
25+
import java.util.Collection;
26+
27+
/**
28+
*
29+
* excel 工具类
30+
*
31+
* @Author 1024创新实验室-主任:卓大
32+
* @Date 2024/4/22 22:49:07
33+
* @Wechat zhuoda1024
34+
35+
* @Copyright 1024创新实验室 ( https://1024lab.net ),2012-2024
36+
*/
37+
public final class SmartExcelUtil {
38+
39+
/**
40+
* 通用单sheet导出
41+
*/
42+
public static void exportExcel(HttpServletResponse response, String fileName, String sheetName, Class head,Collection<?> data) throws IOException {
43+
// 设置下载消息头
44+
SmartResponseUtil.setDownloadFileHeader(response, fileName, null);
45+
// 下载
46+
EasyExcel.write(response.getOutputStream(), head)
47+
.autoCloseStream(Boolean.FALSE)
48+
.sheet(sheetName)
49+
.doWrite(data);
50+
}
51+
52+
/**
53+
* 通用单 sheet水印 导出
54+
*/
55+
public static void exportExcelWithWatermark(HttpServletResponse response, String fileName, String sheetName, Class head,Collection<?> data, String watermarkString) throws IOException {
56+
// 设置下载消息头
57+
SmartResponseUtil.setDownloadFileHeader(response, fileName, null);
58+
// 水印
59+
Watermark watermark = new Watermark(watermarkString);
60+
// 一定要inMemory
61+
EasyExcel.write(response.getOutputStream(), head)
62+
.inMemory(true)
63+
.sheet(sheetName)
64+
.registerWriteHandler(new CustomWaterMarkHandler(watermark))
65+
.doWrite(data);
66+
}
67+
68+
69+
@Slf4j
70+
private static class CustomWaterMarkHandler implements SheetWriteHandler {
71+
72+
private final Watermark watermark;
73+
74+
public CustomWaterMarkHandler(Watermark watermark) {
75+
this.watermark = watermark;
76+
}
77+
78+
@Override
79+
public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {
80+
BufferedImage bufferedImage = createWatermarkImage();
81+
XSSFWorkbook workbook = (XSSFWorkbook) writeSheetHolder.getParentWriteWorkbookHolder().getWorkbook();
82+
try {
83+
// 添加水印的具体操作
84+
addWatermarkToSheet(workbook, bufferedImage);
85+
} catch (Exception e) {
86+
log.error("添加水印出错:", e);
87+
}
88+
89+
}
90+
91+
/**
92+
* 创建水印图片
93+
*
94+
* @return
95+
*/
96+
private BufferedImage createWatermarkImage() {
97+
// 获取水印相关参数
98+
Font font = watermark.getFont();
99+
int width = watermark.getWidth();
100+
int height = watermark.getHeight();
101+
Color color = watermark.getColor();
102+
String text = watermark.getContent();
103+
104+
// 创建带有透明背景的 BufferedImage
105+
BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
106+
Graphics2D g = image.createGraphics();
107+
108+
// 设置画笔字体、平滑、颜色
109+
g.setFont(font);
110+
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
111+
g.setColor(color);
112+
113+
// 计算水印位置和角度
114+
int y = watermark.getYAxis();
115+
int x = watermark.getXAxis();
116+
AffineTransform transform = AffineTransform.getRotateInstance(Math.toRadians(-watermark.getAngle()), 0, y);
117+
g.setTransform(transform);
118+
// 绘制水印文字
119+
g.drawString(text, x, y);
120+
121+
// 释放资源
122+
g.dispose();
123+
124+
return image;
125+
}
126+
127+
private void addWatermarkToSheet(XSSFWorkbook workbook, BufferedImage watermarkImage) {
128+
try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
129+
ImageIO.write(watermarkImage, "png", os);
130+
int pictureIdx = workbook.addPicture(os.toByteArray(), XSSFWorkbook.PICTURE_TYPE_PNG);
131+
XSSFPictureData pictureData = workbook.getAllPictures().get(pictureIdx);
132+
for (int i = 0; i < workbook.getNumberOfSheets(); i++) {
133+
// 获取每个Sheet表
134+
XSSFSheet sheet = workbook.getSheetAt(i);
135+
PackagePartName ppn = pictureData.getPackagePart().getPartName();
136+
String relType = XSSFRelation.IMAGES.getRelation();
137+
PackageRelationship pr = sheet.getPackagePart().addRelationship(ppn, TargetMode.INTERNAL, relType, null);
138+
sheet.getCTWorksheet().addNewPicture().setId(pr.getId());
139+
}
140+
} catch (Exception e) {
141+
// 处理ImageIO.write可能抛出的异常
142+
log.error("添加水印图片时发生错误", e);
143+
}
144+
}
145+
}
146+
147+
@Data
148+
private static class Watermark {
149+
150+
public Watermark(String content) {
151+
this.content = content;
152+
init();
153+
}
154+
155+
public Watermark(String content, Color color, Font font, double angle) {
156+
this.content = content;
157+
this.color = color;
158+
this.font = font;
159+
this.angle = angle;
160+
init();
161+
}
162+
163+
/**
164+
* 根据水印内容长度自适应水印图片大小,简单的三角函数
165+
*/
166+
private void init() {
167+
FontMetrics fontMetrics = new JLabel().getFontMetrics(this.font);
168+
int stringWidth = fontMetrics.stringWidth(this.content);
169+
int charWidth = fontMetrics.charWidth('A');
170+
this.width = (int) Math.abs(stringWidth * Math.cos(Math.toRadians(this.angle))) + 5 * charWidth;
171+
this.height = (int) Math.abs(stringWidth * Math.sin(Math.toRadians(this.angle))) + 5 * charWidth;
172+
this.yAxis = this.height;
173+
this.xAxis = charWidth;
174+
}
175+
176+
/**
177+
* 水印内容
178+
*/
179+
private String content;
180+
181+
/**
182+
* 画笔颜色
183+
*/
184+
private Color color = new Color(239,239,239);
185+
186+
/**
187+
* 字体样式
188+
*/
189+
private Font font = new Font("Microsoft YaHei", Font.BOLD, 26);
190+
191+
/**
192+
* 水印宽度
193+
*/
194+
private int width;
195+
196+
/**
197+
* 水印高度
198+
*/
199+
private int height;
200+
201+
/**
202+
* 倾斜角度,非弧度制
203+
*/
204+
private double angle = 25;
205+
206+
/**
207+
* 字体的y轴位置
208+
*/
209+
private int yAxis = 50;
210+
211+
/**
212+
* 字体的X轴位置
213+
*/
214+
private int xAxis;
215+
216+
/**
217+
* 水平倾斜度
218+
*/
219+
private double shearX = 0.1;
220+
221+
/**
222+
* 垂直倾斜度
223+
*/
224+
private double shearY = -0.26;
225+
}
226+
}

smart-admin-api/sa-base/src/main/resources/dev/sa-base.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ spring:
33
datasource:
44
url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
55
username: root
6-
password: Zhuoda.123
6+
password: Zhuoda1024lab
77
initial-size: 2
88
min-idle: 2
99
max-active: 10
@@ -120,8 +120,6 @@ reload:
120120
sa-token:
121121
# token 名称(同时也是 cookie 名称)
122122
token-name: x-access-token
123-
# token 前缀 例如:Bear
124-
token-prefix:
125123
# token 有效期(单位:秒) 默认30天(2592000秒),-1 代表永久有效
126124
timeout: 2592000
127125
# token 最低活跃频率(单位:秒),如果 token 超过此时间没有访问系统就会被冻结,默认-1 代表不限制,永不冻结

smart-admin-api/sa-base/src/main/resources/pre/sa-base.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ reload:
122122
sa-token:
123123
# token 名称(同时也是 cookie 名称)
124124
token-name: x-access-token
125-
# token 前缀 例如:Bear
126-
token-prefix:
127125
# token 有效期(单位:秒) 默认30天(2592000秒),-1 代表永久有效
128126
timeout: 2592000
129127
# token 最低活跃频率(单位:秒),如果 token 超过此时间没有访问系统就会被冻结,默认-1 代表不限制,永不冻结

smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ reload:
122122
sa-token:
123123
# token 名称(同时也是 cookie 名称)
124124
token-name: x-access-token
125-
# token 前缀 例如:Bear
126-
token-prefix:
127125
# token 有效期(单位:秒) 默认30天(2592000秒),-1 代表永久有效
128126
timeout: 2592000
129127
# token 最低活跃频率(单位:秒),如果 token 超过此时间没有访问系统就会被冻结,默认-1 代表不限制,永不冻结

smart-admin-api/sa-base/src/main/resources/test/sa-base.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ reload:
122122
sa-token:
123123
# token 名称(同时也是 cookie 名称)
124124
token-name: x-access-token
125-
# token 前缀 例如:Bear
126-
token-prefix:
127125
# token 有效期(单位:秒) 默认30天(2592000秒),-1 代表永久有效
128126
timeout: 2592000
129127
# token 最低活跃频率(单位:秒),如果 token 超过此时间没有访问系统就会被冻结,默认-1 代表不限制,永不冻结

0 commit comments

Comments
 (0)