From 30c55facc6eefd660cab0d74c8a15a87338120b7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 六月 2020 10:15:05 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MatCodeController.java |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index a75d060..eea80d8 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -13,7 +13,9 @@
 import com.core.common.DateUtils;
 import com.core.common.R;
 import com.zy.asrs.entity.MatCode;
+import com.zy.asrs.entity.MatCodePrint;
 import com.zy.asrs.service.MatCodeService;
+import com.zy.common.CodeRes;
 import com.zy.common.utils.BarcodeUtils;
 import com.zy.common.utils.excel.matcode.MatCodeExcel;
 import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
@@ -142,12 +144,33 @@
         return R.ok();
     }
 
-    // todo resource
-    // 鐗╂枡鎵撳嵃
+    // 鎵撳嵃
     @RequestMapping(value = "/macCode/print/auth")
-//    @ManagerAuth(memo = "鐗╂枡缂栫爜鎵撳嵃")
-    public R matCodePrint(HttpServletResponse response) throws IOException {
-        BufferedImage img = BarcodeUtils.encode("123456789");
+    @ManagerAuth(memo = "鐗╂枡缂栫爜鎵撳嵃")
+    public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
+        if(Cools.isEmpty(param)) {
+            return R.parse(CodeRes.EMPTY);
+        }
+        List<MatCodePrint> res = new ArrayList<>();
+        for (String matNo : param){
+            MatCode matCode = matCodeService.selectById(matNo);
+            // 鎵撳嵃鏁版嵁娉ㄥ叆
+            MatCodePrint print = new MatCodePrint();
+            print.setMatNo(matCode.getMatNo());
+            print.setBarcodeUrl(matCode.getBarcode());
+            print.setMatName(matCode.getMatName());
+            print.setStr1(matCode.getStr1());
+            print.setStr2(matCode.getStr2());
+            res.add(print);
+        }
+        return R.ok().add(res);
+    }
+
+    // todo resource
+    @RequestMapping(value = "/macCode/barcode/auth")
+    @ManagerAuth(memo = "鐗╂枡缂栫爜鏉″舰鐮佽幏鍙�")
+    public R matCodeBarcode(@RequestParam String param, HttpServletResponse response) throws IOException {
+        BufferedImage img = BarcodeUtils.encode(param);
         if (!ImageIO.write(img, "jpg", response.getOutputStream())) {
             throw new IOException("Could not write an image of format jpg");
         }

--
Gitblit v1.9.1