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/CrewController.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/CrewController.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/CrewController.java
index 9b1c136..b4e4abb 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/CrewController.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/CrewController.java
@@ -1,9 +1,12 @@
 package com.chinaztt.mes.basic.controller;
 
+import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaztt.mes.basic.dto.CrewDTO;
 import com.chinaztt.mes.basic.entity.Crew;
 import com.chinaztt.mes.basic.entity.Staff;
+import com.chinaztt.mes.basic.excel.CrewData;
+import com.chinaztt.mes.basic.excel.CrewUploadListener;
 import com.chinaztt.mes.basic.service.CrewService;
 import com.chinaztt.mes.common.wrapper.QueryWrapperUtil;
 import com.chinaztt.ztt.common.core.util.R;
@@ -13,6 +16,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;
 
 
 /**
@@ -160,4 +166,19 @@
 		return R.ok(crewService.deleteStaff(crewDTO));
 	}
 
+
+	/**
+	 * excel涓婁紶
+	 *
+	 * @return
+	 */
+	@PostMapping("/upload")
+	public R upload(@RequestParam("file") MultipartFile file) {
+		try {
+			EasyExcel.read(file.getInputStream(), CrewData.class, new CrewUploadListener(crewService)).sheet().doRead();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return R.ok();
+	}
 }

--
Gitblit v1.9.3