From b91baa10885833f98ff982af326b5fedf3ed5ce1 Mon Sep 17 00:00:00 2001
From: 陈杰 <504987307@qq.com>
Date: Mon, 4 Nov 2019 09:51:01 +0800
Subject: [PATCH] excel 下载并获取流  修改

---
 src/main/java/com/jevon/controller/LearnController.java        |  7 -------
 src/main/java/com/jevon/controller/ScheduleInitController.java | 16 ++++++++++------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/jevon/controller/LearnController.java b/src/main/java/com/jevon/controller/LearnController.java
index 0f5d31c..28267c9 100644
--- a/src/main/java/com/jevon/controller/LearnController.java
+++ b/src/main/java/com/jevon/controller/LearnController.java
@@ -18,14 +18,12 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.*;
 
@@ -63,11 +61,6 @@ public class LearnController {
     @Autowired
     ChapterService chapterService;
 
-    @Value("${remoting.url}")
-    private String url ;
-    @Value("${remoting.prefixFile}")
-    private String staticUrl ;
-
     @ApiOperation("获取列表")
     @RequestMapping(value = "getList", method = RequestMethod.POST)
     public List<Analyse> getList(){
diff --git a/src/main/java/com/jevon/controller/ScheduleInitController.java b/src/main/java/com/jevon/controller/ScheduleInitController.java
index d715e95..c192cd3 100644
--- a/src/main/java/com/jevon/controller/ScheduleInitController.java
+++ b/src/main/java/com/jevon/controller/ScheduleInitController.java
@@ -29,6 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.InputStream;
 import java.util.*;
 
 @RestController
@@ -62,8 +63,6 @@ public class ScheduleInitController {
 
     @Value("${remoting.url}")
     private String url ;
-    @Value("${remoting.prefixFile}")
-    private String staticUrl ;
 
     @ApiOperation("创建排课计划 ")
     @RequestMapping(value = "createSchedule", method = RequestMethod.POST)
@@ -207,15 +206,20 @@ public class ScheduleInitController {
                     teacherClassService.deleteBySchoolAndTeam(temp);
                 }
                 String fileUrl = initTeacherCourseReqVo.getUrl();
-                fileUrl = fileUrl.replace(url, staticUrl);
                 File excelFile = new File(fileUrl);
                 // 获得工作簿
-                String file = excelFile.getName();
                 Workbook workbook = null;
+                String file = excelFile.getName();
+                InputStream inputStream = HttpClientUtils.GetFileInputStream(initTeacherCourseReqVo.getUrl());
+                if(inputStream == null){
+                    baseVo.setMessage("路径不存在");
+                    baseVo.setSuccess(false);
+                    return baseVo;
+                }
                 if (file.endsWith("xls")) {
-                    workbook = new HSSFWorkbook(new FileInputStream(excelFile));
+                    workbook = new HSSFWorkbook(inputStream);
                 } else {
-                    workbook = new XSSFWorkbook(new FileInputStream(excelFile));
+                    workbook = new XSSFWorkbook(inputStream);
                 }
                 // 获得工作表
                 Sheet sheet = workbook.getSheetAt(0);
--
libgit2 0.21.0