From ebc766304439d72c69b580eaef83681096e4ee3d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 18 六月 2020 16:06:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 20db897..34cdc89 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;
@@ -64,7 +65,7 @@
} else if (entry.getKey().endsWith("<")) {
wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
} else {
- wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
}
}
}
@@ -157,7 +158,7 @@
// 鎵撳嵃鏁版嵁娉ㄥ叆
MatCodePrint print = new MatCodePrint();
print.setMatNo(matCode.getMatNo());
- print.setBarcodeUrl(matCode.getBarcode());
+ print.setBarcode(matCode.getBarcode());
print.setMatName(matCode.getMatName());
print.setStr1(matCode.getStr1());
print.setStr2(matCode.getStr2());
@@ -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");
}
--
Gitblit v1.9.1