From 41b22601227fa44de14737309e559e0d3909b5d6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 18 六月 2021 10:24:28 +0800
Subject: [PATCH] Merge branch 'htasrs0' of https://gitee.com/luxiaotao1123/zy-asrs into htasrs0
---
src/main/java/com/zy/common/web/FileController.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/web/FileController.java b/src/main/java/com/zy/common/web/FileController.java
index 3074912..934b131 100644
--- a/src/main/java/com/zy/common/web/FileController.java
+++ b/src/main/java/com/zy/common/web/FileController.java
@@ -2,16 +2,23 @@
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.service.MatCodeService;
+import com.zy.common.config.AdminInterceptor;
+import com.zy.common.utils.BarcodeUtils;
+import com.zy.common.utils.QrCode;
import com.zy.common.utils.excel.matcode.MatCodeExcel;
import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.ArrayList;
@@ -22,7 +29,7 @@
* Created by vincent on 2019-11-25
*/
@RestController
-@RequestMapping("excel/")
+@RequestMapping("file/")
public class FileController {
@Autowired
@@ -62,4 +69,29 @@
EasyExcel.write(response.getOutputStream(), MatCodeExcel.class).sheet("妯℃澘").doWrite(excels);
}
+ @RequestMapping(value = "/barcode/qrcode/auth")
+// @ManagerAuth(memo = "鍟嗗搧缂栧彿鏉″舰鐮佽幏鍙�(type:1(鏉″舰鐮�);2(浜岀淮鐮�)")
+ public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
+ , @RequestParam String param
+ , @RequestParam(required = false) Integer width
+ , @RequestParam(required = false) Integer height
+ , HttpServletResponse response) throws Exception {
+ AdminInterceptor.cors(response);
+ if (Cools.isEmpty(param)){
+ return R.parse(BaseRes.EMPTY);
+ }
+ BufferedImage img;
+ if (type == 1) {
+ img = BarcodeUtils.encode(param, width, height);
+ } else {
+ img = QrCode.createImg(param, width, height);
+ }
+ if (!ImageIO.write(img, "jpg", response.getOutputStream())) {
+ throw new IOException("Could not write an image of format jpg");
+ }
+ response.getOutputStream().flush();
+ response.getOutputStream().close();
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1