add合作单位导入

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamSongController.java

@@ -16,6 +16,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.tomcat.util.http.fileupload.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -95,7 +96,7 @@ public class ExamSongController extends BaseController {
     @ApiOperation("根据专业获取曲目")
     @GetMapping(value = "/getWithSubject")
     @PreAuthorize("@pcs.hasPermissions('examSong/getWithSubject')")
-    public HttpResponseResult<List<ExamSong>> getWithSubject(Integer subjectId){
+    public HttpResponseResult<List<ExamSong>> getWithSubject(Integer subjectId) {
         return succeed(examSongService.getWithSubject(subjectId));
     }
 
@@ -112,21 +113,14 @@ public class ExamSongController extends BaseController {
     @GetMapping(value = "getImportTemplate")
     @PreAuthorize("@pcs.hasPermissions('examSong/getImportTemplate')")
     public void getImportTemplate(HttpServletResponse response) throws IOException {
-        InputStream inputStream = new ClassPathResource("columnMapper.ini").getInputStream();
-        List<IniFileEntity> columns = IniFileUtil.readIniFile(inputStream).get("examSong");
-
+        InputStream inputStream = new ClassPathResource("examSong.xls").getInputStream();
         OutputStream outputStream = response.getOutputStream();
         try {
-            String[] header = columns.stream().map(IniFileEntity::getKey).toArray(String[]::new);
-
-            List<Teacher> teachers = new ArrayList<>();
-
-            HSSFWorkbook workbook = POIUtil.exportExcel(header, null, teachers);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=examSong-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();
             outputStream = response.getOutputStream();
-            workbook.write(outputStream);
+            IOUtils.copy(inputStream, outputStream);
             outputStream.flush();
         } catch (Exception e) {
             e.printStackTrace();
@@ -142,5 +136,4 @@ public class ExamSongController extends BaseController {
     }
 
 
-
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/OrganizationController.java

@@ -18,6 +18,7 @@ import com.keao.edu.util.iniFile.IniFileUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.tomcat.util.http.fileupload.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -121,21 +122,14 @@ public class OrganizationController extends BaseController {
     @GetMapping(value = "getImportTemplate")
     @PreAuthorize("@pcs.hasPermissions('organization/getImportTemplate')")
     public void getImportTemplate(HttpServletResponse response) throws IOException {
-        InputStream inputStream = new ClassPathResource("columnMapper.ini").getInputStream();
-        List<IniFileEntity> organizationColumns = IniFileUtil.readIniFile(inputStream).get("organization");
-
+        InputStream inputStream = new ClassPathResource("organization.xls").getInputStream();
         OutputStream outputStream = response.getOutputStream();
         try {
-            String[] header = organizationColumns.stream().map(IniFileEntity::getKey).toArray(String[]::new);
-
-            List<Organization> organizations = new ArrayList<>();
-
-            HSSFWorkbook workbook = POIUtil.exportExcel(header, null, organizations);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=organization-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();
             outputStream = response.getOutputStream();
-            workbook.write(outputStream);
+            IOUtils.copy(inputStream, outputStream);
             outputStream.flush();
         } catch (Exception e) {
             e.printStackTrace();

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/TeacherController.java

@@ -11,24 +11,17 @@ import com.keao.edu.user.entity.Teacher;
 import com.keao.edu.user.page.TeacherQueryInfo;
 import com.keao.edu.user.service.TeacherService;
 import com.keao.edu.util.date.DateUtil;
-import com.keao.edu.util.excel.POIUtil;
-import com.keao.edu.util.iniFile.IniFileEntity;
-import com.keao.edu.util.iniFile.IniFileUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.tomcat.util.http.fileupload.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.util.*;
 
 /**
@@ -100,21 +93,14 @@ public class TeacherController extends BaseController {
     @GetMapping(value = "getImportTemplate")
     @PreAuthorize("@pcs.hasPermissions('teacher/getImportTemplate')")
     public void getImportTemplate(HttpServletResponse response) throws IOException {
-        InputStream inputStream = new ClassPathResource("columnMapper.ini").getInputStream();
-        List<IniFileEntity> columns = IniFileUtil.readIniFile(inputStream).get("teacher");
-
+        InputStream inputStream = new ClassPathResource("excelTemplate/teacher.xls").getInputStream();
         OutputStream outputStream = response.getOutputStream();
         try {
-            String[] header = columns.stream().map(IniFileEntity::getKey).toArray(String[]::new);
-
-            List<Teacher> teachers = new ArrayList<>();
-
-            HSSFWorkbook workbook = POIUtil.exportExcel(header, null, teachers);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=teacher-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();
             outputStream = response.getOutputStream();
-            workbook.write(outputStream);
+            IOUtils.copy(inputStream, outputStream);
             outputStream.flush();
         } catch (Exception e) {
             e.printStackTrace();

edu-user/edu-user-server/src/main/resources/columnMapper.ini

@@ -6,7 +6,7 @@
 曲目类别(练习曲or演奏曲) = type
 
 [organization]
-合作单位名字 = name
+合作机构名字 = name
 联系人名字 = contactName
 联系人电话 = contactPhone
 角色 = roleName
@@ -17,7 +17,7 @@
 老师姓名 = realName
 手机号 = phone
 职称 = title
-专业(,分隔) = subjectIdList
+专业(英文逗号分隔) = subjectIdList
 结算方式 = salarySettlementType
 薪酬 = salary
 证书编号 = certificateNo

pom.xml

@@ -283,6 +283,8 @@
 						<nonFilteredFileExtension>pfx</nonFilteredFileExtension>
 						<nonFilteredFileExtension>ttc</nonFilteredFileExtension>
 						<nonFilteredFileExtension>ttf</nonFilteredFileExtension>
+						<nonFilteredFileExtension>xls</nonFilteredFileExtension>
+						<nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
 					</nonFilteredFileExtensions>
 				</configuration>
 			</plugin>