土工平台修改

src/main/java/com/patzn/cloud/service/lims/collect/handle/PngReportHandle.java

 package com.patzn.cloud.service.lims.collect.handle;
 
+import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.service.lims.collect.core.CollectDataType;
 import com.patzn.cloud.service.lims.collect.core.ICollectHandler;
 import com.patzn.cloud.service.lims.common.StringHandleUtils;
@@ -50,6 +51,8 @@ public class PngReportHandle implements ICollectHandler {
             logger.error("PngReportHandle.process失败，原因："+e.getMessage());
             e.printStackTrace();
         }
+        RestAssert.fail(null == list,"采集失败，试验项目不含有待采集的文件！");
+
         for (SmbFile smbFile:list) {
             String name = StringHandleUtils.getFileNameNoEx(smbFile.getName());
             name = name.replace(request.getExperiment(),"");

src/main/java/com/patzn/cloud/service/lims/common/AsposeUtil.java

 package com.patzn.cloud.service.lims.common;
 
+import com.aspose.cells.License;
 import com.aspose.cells.SaveFormat;
 import com.aspose.cells.Workbook;
 import com.baomidou.mybatisplus.toolkit.CollectionUtils;
@@ -10,11 +11,26 @@ import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.InputStream;
 import java.util.Date;
 import java.util.List;
 
 public class AsposeUtil {
     protected static final Logger logger = LoggerFactory.getLogger(AsposeUtil.class);
+
+    public static boolean getLicense() {
+        boolean result = false;
+        try {
+            InputStream is = Word2Pdf.class.getClassLoader()
+                    .getResourceAsStream("classpath:statis/license.xml");
+            License aposeLic = new License();
+            aposeLic.setLicense(is);
+            result = true;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
     public static File mergeWork(String name,Workbook workbook, List<Workbook> workbooksList){
         if (CollectionUtils.isEmpty(workbooksList)){
             return null;

src/main/java/com/patzn/cloud/service/lims/soil/controller/SoilAppendixController.java

 package com.patzn.cloud.service.lims.soil.controller;
 
 import com.patzn.cloud.service.soil.entity.SoilAppendix;
+import com.patzn.cloud.service.soil.vo.SoilAppendixVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -50,6 +51,20 @@ public class SoilAppendixController extends ServiceController {
         return success(soilAppendixService.page(getPage(), soilAppendix));
 	}
 
+
+    @ApiOperation("分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_for_exp_report")
+    public RestResult<Page<SoilAppendix>> getPageVO(SoilAppendixVO soilAppendix) {
+        return success(soilAppendixService.page(getPage(), soilAppendix));
+    }
+
+
     @ApiOperation("查询 id 信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", required = true, paramType = "path", dataTypeClass = Long.class),

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExpReportServiceImpl.java

@@ -653,13 +653,16 @@ public class SoilExpReportServiceImpl extends BaseServiceImpl<SoilExpReportMappe
 
         logger.error("List<Workbook> bookList = new ArrayList<>();-----");
 
-
+//        if (!AsposeUtil.getLicense()) { // 验证License 若不验证则转化出的PDP文档会有水印产生
+//            logger.error("Aspose 认证失败");
+//        }
         Workbook workbook =null;
-        XSSFWorkbook xssfWorkbook = HSSFWorkbookUtil.getWorkbookByIO(ossClient.download(soilExpReport.getObjectKey()));
+
         logger.error("7-----------------");
-        if (null !=xssfWorkbook){
+        InputStream io =   ossClient.download(soilExpReport.getObjectKey());
+        if (null !=io){
             try {
-                workbook =  new Workbook(exportToExcelInputStream(xssfWorkbook));
+                workbook =  new Workbook(io);
                 logger.error("8-----------------");
             }catch (Exception e){
                 logger.error(" workbook =  new Workbook(exportToExcelInputStream(xssfWorkbook));"+e.getMessage());
@@ -698,7 +701,7 @@ public class SoilExpReportServiceImpl extends BaseServiceImpl<SoilExpReportMappe
             }
 
         }else{
-           RestAssert.fail("改报告不含有附录请确认！");
+           RestAssert.fail("该报告不含有附录请确认！");
         }
 
         return null;

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExperimentServiceImpl.java

@@ -1871,6 +1871,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                                 XSSFCell xssfCell =  row.createCell(j);
                                 XSSFCellStyle cellStyle = zeroRow.getCell(j).getCellStyle();
                                 xssfCell.setCellStyle(cellStyle);
+                                xssfCell.setCellValue("/");
                             }
                             insertRow++;
                         }

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilOriginalTemplateServiceImpl.java

@@ -557,7 +557,12 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                             }
                         }else {
                             XSSFCell itemCell = xssfRow.getCell(collectEntity.getColumnPlace());
-                            String value = formatter.formatCellValue(itemCell, evaluator);
+                            String value = null;
+                            try {
+                                value =  formatter.formatCellValue(itemCell, evaluator);
+                            }catch (Exception e){
+                                value =HSSFWorkbookUtil.getCellValue(itemCell).toString();
+                            }
                             String itemName = collectEntity.getItemName();
                             if (StringUtils.isBlank(value)){
                                 continue;
@@ -758,7 +763,12 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
 
                                 XSSFRow valueNRow  = xssfSheet.getRow(config.getMergeRowNum());
                                 XSSFCell cellN =   valueNRow.getCell(config.getMergeBegin());
-                                String valueN = formatter.formatCellValue(cellN, evaluator);
+                                String valueN = null;
+                                try {
+                                    valueN =  formatter.formatCellValue(cellN, evaluator);
+                                }catch (Exception e){
+                                    valueN =HSSFWorkbookUtil.getCellValue(cellN).toString();
+                                }
 
                                 if (StringUtils.isNotBlank(valueN)){
                                     String keyN= sampleCode+exp.getId()+config.getAttributeName();
@@ -823,7 +833,15 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                                 continue;
                             }
 
-                             String value = formatter.formatCellValue(valueCell, evaluator);
+                             String value =  null;
+
+
+                            try {
+                                value = formatter.formatCellValue(valueCell, evaluator);
+                            }catch (Exception e){
+                                value = HSSFWorkbookUtil.getCellValue(valueCell).toString();
+                            }
+
 
                             if (StringUtils.isBlank(value)){
                                 continue;