From 510510acc4215ac4b43eb7e31b3450ab9fa3f9fe Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 05 六月 2020 17:06:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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..97bcf76 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -12,14 +13,15 @@
import com.core.common.R;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.service.MatCodeService;
+import com.zy.common.utils.excel.EnInitData;
+import com.zy.common.utils.excel.EnInitDataListener;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
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 java.io.IOException;
+import java.util.*;
@RestController
public class MatCodeController extends BaseController {
@@ -62,6 +64,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 +78,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,6 +97,7 @@
return R.ok();
}
+ // 瀵煎嚭
@RequestMapping(value = "/matCode/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
@@ -100,6 +109,15 @@
return R.ok(exportSupport(list, fields));
}
+ // 瀵煎叆
+ @RequestMapping(value = "/matCode/import/auth")
+ @ManagerAuth
+ public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
+ Thread.sleep(2000);
+// EasyExcel.read(file.getInputStream(), EnInitData.class, new EnInitDataListener()).sheet().doRead();
+ return R.ok();
+ }
+
@RequestMapping(value = "/matCodeQuery/auth")
@ManagerAuth
public R query(String condition) {
--
Gitblit v1.9.1