From fe4c15ed6045361a6eed1edef605c9c2138e277e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 20 六月 2020 13:42:32 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 00bb494..46b5c06 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -13,15 +13,22 @@
 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.QrCode;
 import com.zy.common.utils.excel.matcode.MatCodeExcel;
 import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
 import com.zy.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 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.*;
@@ -59,7 +66,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()));
             }
         }
     }
@@ -133,12 +140,57 @@
     // 瀵煎叆
     @RequestMapping(value = "/matCode/import/auth")
     @ManagerAuth(memo = "鐗╂枡缂栫爜鏁版嵁瀵煎叆")
+    @Transactional
     public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
         Thread.sleep(2000);
         EasyExcel.read(file.getInputStream(), MatCodeExcel.class, new MatCodeExcelListener()).sheet().doRead();
         return R.ok();
     }
 
+    // 鎵撳嵃
+    @RequestMapping(value = "/macCode/print/auth")
+    @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.setBarcode(matCode.getBarcode());
+            print.setMatName(matCode.getMatName());
+            print.setStr1(matCode.getStr1());
+            print.setStr2(matCode.getStr2());
+            res.add(print);
+        }
+        return R.ok().add(res);
+    }
+
+    @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;
+        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");
+        }
+        response.getOutputStream().flush();
+        response.getOutputStream().close();
+        return R.ok();
+    }
+
     @RequestMapping(value = "/matCodeQuery/auth")
     @ManagerAuth
     public R query(String condition) {

--
Gitblit v1.9.1