From d79692c7b03e3b96016598ac03766c29ca094709 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 22 六月 2020 15:34:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 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..f7e8bd8 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;
@@ -49,11 +50,16 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
excludeTrash(param);
EntityWrapper<MatCode> wrapper = new EntityWrapper<>();
convert(param, wrapper);
+ allLike(MatCode.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ else {
+ wrapper.orderBy("modi_time", false);
+ }
return R.ok(matCodeService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -64,7 +70,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()));
}
}
}
@@ -119,7 +125,6 @@
excel.setBarcode(matCode.getBarcode());
excel.setMatName(matCode.getMatName());
excel.setStr1(matCode.getStr1());
- excel.setStr2(matCode.getStr2());
excels.add(excel);
if (rowCount != null && excels.size() >= rowCount){
break;
@@ -139,9 +144,9 @@
@RequestMapping(value = "/matCode/import/auth")
@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();
+ MatCodeExcelListener listener = new MatCodeExcelListener(getUserId());
+ EasyExcel.read(file.getInputStream(), MatCodeExcel.class, listener).sheet().doRead();
+ return R.ok("鎴愬姛瀵煎叆"+listener.getTotal()+"鏉＄墿鏂欎俊鎭�");
}
// 鎵撳嵃
@@ -157,7 +162,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 +171,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