From b3cc369a3c0e4b8e92ce7607629aaa3c40e19fb6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 30 七月 2020 15:31:23 +0800
Subject: [PATCH] #当前本版十分完美、冻结
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 137 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 119 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index 6019326..e001475 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -1,5 +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;
@@ -11,15 +13,27 @@
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.asrs.utils.VersionUtils;
+import com.zy.common.CodeRes;
+import com.zy.common.config.AdminInterceptor;
+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 java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+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.*;
@RestController
public class MatCodeController extends BaseController {
@@ -33,28 +47,40 @@
return R.ok(matCodeService.selectById(String.valueOf(id)));
}
+ @RequestMapping(value = "/matCode/auth")
+ @ManagerAuth
+ public R find(@RequestParam("id") String id) {
+ return R.ok(matCodeService.selectById(String.valueOf(id)));
+ }
+
@RequestMapping(value = "/matCode/list/auth")
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@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));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@@ -62,6 +88,10 @@
@RequestMapping(value = "/matCode/add/auth")
@ManagerAuth
public R add(MatCode matCode) {
+ matCode.setModiUser(getUserId());
+ matCode.setModiTime(new Date());
+ matCode.setAppeUser(getUserId());
+ matCode.setAppeTime(new Date());
matCodeService.insert(matCode);
return R.ok();
}
@@ -72,6 +102,8 @@
if (Cools.isEmpty(matCode) || null==matCode.getMatNo()){
return R.error();
}
+ matCode.setModiUser(getUserId());
+ matCode.setModiTime(new Date());
matCodeService.updateById(matCode);
return R.ok();
}
@@ -89,15 +121,84 @@
return R.ok();
}
+ // 瀵煎嚭
@RequestMapping(value = "/matCode/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<MatCode> wrapper = new EntityWrapper<>();
- Map<String, Object> map = excludeTrash(param.getJSONObject("matCode"));
- convert(map, wrapper);
- List<MatCode> list = matCodeService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
+ @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐗╂枡缂栫爜鏁版嵁瀵煎嚭")
+ public void export(@RequestParam(required = false) String fileName,
+ @RequestParam(required = false) Integer rowCount,
+ HttpServletResponse response) throws Exception {
+ List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
+ List<MatCodeExcel> excels = new ArrayList<>();
+ for (MatCode matCode : list) {
+ MatCodeExcel excel = VersionUtils.getExcel(matCode);
+ excels.add(excel);
+ if (rowCount != null && excels.size() >= rowCount){
+ break;
+ }
+ }
+ response.setContentType("application/vnd.ms-excel");
+ 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)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .sheet("琛�1")
+ .doWrite(excels);
+ }
+
+ // 瀵煎叆
+ @RequestMapping(value = "/matCode/import/auth")
+ @ManagerAuth(memo = "鐗╂枡缂栫爜鏁版嵁瀵煎叆")
+ @Transactional
+ public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
+ MatCodeExcelListener listener = new MatCodeExcelListener(getUserId());
+ EasyExcel.read(file.getInputStream(), MatCodeExcel.class, listener).sheet().doRead();
+ return R.ok("鎴愬姛瀵煎叆"+listener.getTotal()+"鏉＄墿鏂欎俊鎭�");
+ }
+
+ // 鎵撳嵃
+ @RequestMapping(value = "/matCode/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 {
+ AdminInterceptor.cors(response);
+ 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")
--
Gitblit v1.9.1