From 377fba33b54de574b044514c772f6268f485e6bf Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 六月 2020 15:03:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 16 ++++++++++++----
src/main/webapp/views/matCode/matCode.html | 9 +++++----
src/main/webapp/static/js/matCode/matCode.js | 2 +-
3 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 59b91c1..a3669e4 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -17,6 +17,7 @@
import com.zy.asrs.service.MatCodeService;
import com.zy.common.CodeRes;
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 com.zy.common.web.BaseController;
@@ -166,13 +167,20 @@
return R.ok().add(res);
}
- @RequestMapping(value = "/macCode/barcode/auth")
-// @ManagerAuth(memo = "鐗╂枡缂栫爜鏉″舰鐮佽幏鍙�")
- public R matCodeBarcode(@RequestParam String param, HttpServletResponse response) throws IOException {
+ @RequestMapping(value = "/macCode/code/auth")
+// @ManagerAuth(memo = "鐗╂枡缂栫爜鏉″舰鐮佽幏鍙�(type:1(鏉″舰鐮�);2(浜岀淮鐮�)")
+ public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
+ , @RequestParam String param
+ , HttpServletResponse response) throws Exception {
if (Cools.isEmpty(param)){
return R.parse(BaseRes.EMPTY);
}
- BufferedImage img = BarcodeUtils.encode(param);
+ BufferedImage img;
+ if (type == 1) {
+ img = BarcodeUtils.encode(param);
+ } else {
+ img = QrCode.createImg(param);
+ }
if (!ImageIO.write(img, "jpg", response.getOutputStream())) {
throw new IOException("Could not write an image of format jpg");
}
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 42d1273..630d5e7 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -345,7 +345,7 @@
if (res.code === 200){
layer.closeAll();
for (let i=0;i<res.data.length;i++){
- res.data[i]["barcodeUrl"]=baseUrl+"/macCode/barcode/auth?param="+res.data[i].barcode;
+ res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=1¶m="+res.data[i].barcode;
}
var tpl = $("#templatePreview"+templateNo).html();
var template = Handlebars.compile(tpl);
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 7642881..1738de0 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -138,7 +138,7 @@
<tr>
<td colspan="1" align="center" scope="col">鏉＄爜</td>
<td class="barcode" colspan="3" align="center" scope="col">
- <img class="template-qrcode" src="" width="80%">
+ <img class="template-code" src="" width="80%">
<div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
<span>xxxxxx</span>
</div>
@@ -180,7 +180,7 @@
</tr>
<tr>
<td align="center" colspan="6" style="border: none">
- <img class="template-qrcode" src="" width="80%">
+ <img class="template-code" src="" width="80%">
<div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
<span>xxxxxx</span>
</div>
@@ -205,7 +205,7 @@
<!-- 鍒濆鍖栨墦鍗版ā鏉跨殑鏉″舰鐮� -->
<script type="text/javascript">
- $('.template-qrcode').attr("src", baseUrl+"/macCode/barcode/auth?param=123");
+ $('.template-code').attr("src", baseUrl+"/macCode/code/auth?type=1¶m=123");
</script>
<!-- 妯℃澘寮曟搸 -->
@@ -259,7 +259,7 @@
</tr>
<tr>
<td align="center" colspan="6" style="border: none">
- <img class="template-qrcode" src="{{this.barcodeUrl}}" width="80%">
+ <img class="template-code" src="{{this.barcodeUrl}}" width="80%">
<div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
<span>{{this.matNo}}</span>
</div>
@@ -270,6 +270,7 @@
</script>
<!-- 妯℃澘3 -->
<script type="text/template" id="templatePreview3">
+
</script>
</body>
--
Gitblit v1.9.1