From 54cce185f383849322d5cc309d2ee5d155d15915 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 18:57:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mes-basic/src/main/java/com/chinaztt/mes/basic/controller/StaffController.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/StaffController.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/StaffController.java
index 28e7da0..5413c49 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/StaffController.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/StaffController.java
@@ -17,12 +17,17 @@
package com.chinaztt.mes.basic.controller;
+import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaztt.mes.basic.entity.Division;
import com.chinaztt.mes.basic.entity.Factory;
import com.chinaztt.mes.basic.entity.Location;
import com.chinaztt.mes.basic.entity.Staff;
+import com.chinaztt.mes.basic.excel.DivisionData;
+import com.chinaztt.mes.basic.excel.DivisionUploadListener;
+import com.chinaztt.mes.basic.excel.StaffData;
+import com.chinaztt.mes.basic.excel.StaffUploadListener;
import com.chinaztt.mes.basic.service.DivisionService;
import com.chinaztt.mes.basic.service.StaffService;
import com.chinaztt.mes.common.wrapper.QueryWrapperUtil;
@@ -34,7 +39,9 @@
import lombok.AllArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.io.IOException;
import java.util.List;
@@ -168,4 +175,19 @@
return R.ok(staffService.list(Wrappers.query(staff)));
}
+ /**
+ * excel涓婁紶
+ *
+ * @return
+ */
+ @PostMapping("/upload")
+ public R upload(@RequestParam("file") MultipartFile file) {
+ try {
+ EasyExcel.read(file.getInputStream(), StaffData.class, new StaffUploadListener(staffService)).sheet().doRead();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.3