From fb038d05d9144494888fb688374e5157873434a9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 18 六月 2020 09:38:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index b36c779..34cdc89 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.controller;
import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -12,7 +13,11 @@
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;
@@ -20,7 +25,9 @@
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.*;
@@ -58,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()));
}
}
}
@@ -101,6 +108,7 @@
// 瀵煎嚭
@RequestMapping(value = "/matCode/export/auth")
+ @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐗╂枡缂栫爜鏁版嵁瀵煎嚭")
public void export(@RequestParam(required = false) String fileName,
@RequestParam(required = false) Integer rowCount,
HttpServletResponse response) throws Exception {
@@ -122,18 +130,65 @@
response.setCharacterEncoding("utf-8");
fileName = URLEncoder.encode(Cools.isEmpty(fileName)?"鐗╂枡缂栫爜":fileName, "UTF-8");
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
- EasyExcel.write(response.getOutputStream(), MatCodeExcel.class).sheet("琛�1").doWrite(excels);
+ EasyExcel.write(response.getOutputStream(), MatCodeExcel.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .sheet("琛�1")
+ .doWrite(excels);
}
// 瀵煎叆
@RequestMapping(value = "/matCode/import/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鐗╂枡缂栫爜鏁版嵁瀵煎叆")
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