From 9b6a841844210ceb76084c9ebcb51e4650cef934 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 26 四月 2024 08:52:02 +0800
Subject: [PATCH] 1、完善代码； 2、加入EasyExcel依赖。
---
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/qrCode/MarkQrCodeCtrl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/code/MarkCodeCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/qrCode/MarkQrCodeCtrl.java
similarity index 70%
rename from pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/code/MarkCodeCtrl.java
rename to pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/qrCode/MarkQrCodeCtrl.java
index 96c9e08..7022f51 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/code/MarkCodeCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/qrCode/MarkQrCodeCtrl.java
@@ -1,4 +1,4 @@
-package com.dy.pmsBase.code;
+package com.dy.pmsBase.qrCode;
import cn.hutool.core.codec.Base64;
@@ -7,6 +7,8 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pmsGlobal.util.QrCodeConstant;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -22,9 +24,9 @@
*/
@Slf4j
@RestController
-@RequestMapping(path = "markCode")
+@RequestMapping(path = "markQrCode")
@SuppressWarnings("unchecked")//java鐗堟湰瓒婇珮锛屽娉涘瀷绾︽潫瓒婁弗锛屾墍浠ラ厤缃甋uppressWarnings("unchecked")
-public class MarkCodeCtrl {
+public class MarkQrCodeCtrl {
/**
* 瀹㈡埛绔姹傚緱鍒伴粯璁ゅ瘑鐮�
@@ -34,18 +36,21 @@
public BaseResponse<List<ResultVo>> show() {
try{
List<ResultVo> list = new ArrayList<>() ;
- URL logoUrl = MarkCodeCtrl.class.getResource("/images/logo.png") ;
+ Resource resource = new ClassPathResource("/images/logo.png");
+ File logoPngFile = resource.getFile() ;
String[][] marks = QrCodeConstant.Marks() ;
for(String[] mark : marks){
ResultVo vo = new ResultVo() ;
vo.code = mark[0] ;
vo.name = mark[1] ;
- BufferedImage bufferedImage = QrCodeGenerator.toBufferedImage(QrCodeGenerator.createBitMatrix(mark[0], QrCodeConstant.MarkQrCodeWidth, QrCodeConstant.MarkQrCodeHeight));
- if(logoUrl != null){
- bufferedImage = QrCodeGenerator.addQrCodeLogo(bufferedImage, new File(logoUrl.getFile()));
+ //vo.code = "1234567890123456789012" ;
+ //BufferedImage bufferedImage = QrCodeGenerator.toBufferedImage(QrCodeGenerator.createBitMatrix(vo.code, 30, 30));
+ BufferedImage bufferedImage = QrCodeGenerator.toBufferedImage(QrCodeGenerator.createBitMatrix(vo.code, QrCodeConstant.MarkQrCodeWidth, QrCodeConstant.MarkQrCodeHeight));
+ if(logoPngFile != null && logoPngFile.exists()){
+ bufferedImage = QrCodeGenerator.addQrCodeLogo(bufferedImage, logoPngFile);
}
byte[] codes = QrCodeGenerator.bufferedImageToByteArray(bufferedImage, "JPG");
- vo.imgBase64 = Base64.encode(codes);
+ vo.imgBase64 = "data:image/jpeg;base64," + Base64.encode(codes);
list.add(vo) ;
}
return BaseResponseUtils.buildSuccess(list);
--
Gitblit v1.8.0