Commit 1d47b444 by 陈健智

词云再调整

parent e18eeece
...@@ -16,6 +16,7 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -16,6 +16,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.net.URLEncoder; import java.net.URLEncoder;
...@@ -66,6 +67,10 @@ public class EasyExcelUtil { ...@@ -66,6 +67,10 @@ public class EasyExcelUtil {
} }
} }
public static void readWithoutTryCatch(MultipartFile file, ReadExcelDTO readExcelDTO) throws IOException {
EasyExcel.read(file.getInputStream(), readExcelDTO.getClazz(), readExcelDTO.getAnalysisEventListener()).sheet().doRead();
}
/** /**
* 读取多个sheet * 读取多个sheet
* *
......
...@@ -310,7 +310,7 @@ public class ToolsetServiceImpl implements ToolsetService { ...@@ -310,7 +310,7 @@ public class ToolsetServiceImpl implements ToolsetService {
ReadExcelDTO<UploadHighWordKeywordDTO> readExcel = new ReadExcelDTO<>(); ReadExcelDTO<UploadHighWordKeywordDTO> readExcel = new ReadExcelDTO<>();
readExcel.setClazz(UploadHighWordKeywordDTO.class); readExcel.setClazz(UploadHighWordKeywordDTO.class);
readExcel.setAnalysisEventListener(new HighWordKeywordListener(map)); readExcel.setAnalysisEventListener(new HighWordKeywordListener(map));
EasyExcelUtil.read(file, readExcel); EasyExcelUtil.readWithoutTryCatch(file, readExcel);
}catch (Exception e){ }catch (Exception e){
return ResponseResult.failure("表格格式有误"); return ResponseResult.failure("表格格式有误");
} }
...@@ -340,7 +340,7 @@ public class ToolsetServiceImpl implements ToolsetService { ...@@ -340,7 +340,7 @@ public class ToolsetServiceImpl implements ToolsetService {
ReadExcelDTO<UploadHighWordArticleDTO> readExcel = new ReadExcelDTO<>(); ReadExcelDTO<UploadHighWordArticleDTO> readExcel = new ReadExcelDTO<>();
readExcel.setClazz(UploadHighWordArticleDTO.class); readExcel.setClazz(UploadHighWordArticleDTO.class);
readExcel.setAnalysisEventListener(new HighWordArticleListener(contents)); readExcel.setAnalysisEventListener(new HighWordArticleListener(contents));
EasyExcelUtil.read(file, readExcel); EasyExcelUtil.readWithoutTryCatch(file, readExcel);
}catch (Exception e){ }catch (Exception e){
return ResponseResult.failure("表格格式有误"); return ResponseResult.failure("表格格式有误");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment