Merge remote-tracking branch 'origin/master' into master

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeContractController.java

@@ -1,11 +1,16 @@
 package org.springblade.manager.controller;
 
+import com.aspose.cells.LoadFormat;
+import com.aspose.cells.LoadOptions;
+import com.aspose.cells.SaveFormat;
+import com.aspose.cells.Workbook;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.google.common.collect.Lists;
-import com.spire.xls.*;
+import com.spire.xls.FileFormat;
+import com.spire.xls.Worksheet;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
@@ -258,7 +263,7 @@ public class WbsTreeContractController extends BladeController {
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "客户端-下载元素表对应的excel模板", notes = "传入表的pKeyId")
     public void downloadExcel(@RequestParam String pKeyId, HttpServletResponse response) {
-        com.spire.xls.Workbook workbook = null;
+        Workbook workbook = null;
         String htmlUrl = "";
         String fileName = "";
         try {
@@ -281,10 +286,13 @@ public class WbsTreeContractController extends BladeController {
 
             //将html转换为excel
             ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-            InputStream inputStreamByUrl = FileUtils.getInputStreamByUrl(htmlUrl);
-            workbook = new com.spire.xls.Workbook();
-            workbook.loadFromHtml(inputStreamByUrl);
-            workbook.saveToStream(byteArrayOutputStream, FileFormat.Version2007);
+            LoadOptions lo = new LoadOptions(LoadFormat.HTML);
+            workbook = new Workbook(htmlUrl,lo);
+//            InputStream inputStreamByUrl = FileUtils.getInputStreamByUrl(htmlUrl);
+//            workbook = new com.spire.xls.Workbook();
+//            workbook.loadFromHtml(inputStreamByUrl);
+//            workbook.loadFromHtml("D:\\BaiduNetdiskDownload\\1783381225877012480.html");
+            workbook.save(byteArrayOutputStream, SaveFormat.XLSX);
             //将转换的spireExcel存储到流中
             byte[] excelBytes = byteArrayOutputStream.toByteArray();