土工平台修改

src/main/java/com/patzn/cloud/service/lims/collect/core/ICollectHandler.java

 package com.patzn.cloud.service.lims.collect.core;
-
-
-import com.patzn.cloud.service.lims.collect.core.CollectDataType;
 import com.patzn.cloud.service.lims.soil.service.ISoilExperimentService;
 
 public interface ICollectHandler {

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

@@ -5,7 +5,13 @@ import com.patzn.cloud.service.lims.collect.core.ICollectHandler;
 import com.patzn.cloud.service.lims.common.StringHandleUtils;
 import com.patzn.cloud.service.lims.soil.service.ISoilExperimentService;
 import jcifs.smb.SmbFile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class PngReportHandle implements ICollectHandler {
+
+    protected final Logger logger = LoggerFactory.getLogger(PngReportHandle.class);
+
     @Override
     public Boolean process(CollectDataType request, ISoilExperimentService soilExperimentService) {
          String type = request.getType();
@@ -13,6 +19,24 @@ public class PngReportHandle implements ICollectHandler {
          String acquisitionCommand = request.getAcquisitionCommand();
          String entrustCode = request.getEntrustCode();
          String sampleCode = request.getSampleCode();
+         String expName = request.getExperiment();
+         String siteNo = request.getSiteNo();
+
+
+         String checkNameSiteNo = "";
+         String checkNameSampleCode = "";
+
+         if (expName.contains("三轴压缩")&&!expName.contains("重塑")){
+             checkNameSiteNo  = "三轴压缩"+siteNo;
+             checkNameSampleCode  = "三轴压缩"+sampleCode;
+         }else if (expName.contains("三轴压缩")&&expName.contains("重塑")){
+             checkNameSiteNo  = "三轴压缩"+siteNo+"r";
+             checkNameSampleCode  = "三轴压缩"+sampleCode+"r";
+         }else {
+             checkNameSiteNo  = expName+siteNo;
+             checkNameSampleCode  = expName+sampleCode;
+         }
+
          if (!"文件获取".equals(type)){
              return null;
          }
@@ -23,12 +47,13 @@ public class PngReportHandle implements ICollectHandler {
         try {
             list=  getShareFiles(collectionAddress+entrustCode+"/");
         }catch (Exception e){
+            logger.error("PngReportHandle.process失败，原因："+e.getMessage());
             e.printStackTrace();
         }
         for (SmbFile smbFile:list) {
             String name = StringHandleUtils.getFileNameNoEx(smbFile.getName());
             name = name.replace(request.getExperiment(),"");
-            if (!name.equals(sampleCode)){
+            if (!name.equals(checkNameSiteNo)&&!name.equals(checkNameSampleCode)){
                 continue;
             }
             if (smbFile.getName().contains(".png")||smbFile.getName().contains(".bmp")){

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

@@ -120,6 +120,7 @@ public class SoilExperimentRelEquipServiceImpl extends BaseServiceImpl<SoilExper
                 collectDataType.setLabNum(equip.getLabNum());
                 collectDataType.setType(equip.getCollectionType());
                 collectDataType.setSampleCode(experimentVO.getSampleCode());
+                collectDataType.setSiteNo(experimentVO.getSiteNo());
                 collectDataType.setEntrustCode(experimentVO.getEntrustCode());
                 collectDataType.setExpId(equip.getExpId());
                 collectDataType.setExperiment(experimentVO.getName());

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

@@ -2794,6 +2794,8 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                             appendix.setRemark("直剪");
                         }else if (name.contains("无侧限")){
                             appendix.setRemark("无侧限");
+                        }else{
+                            appendix.setRemark(type.getExperiment());
                         }
 
                         appendix.setEntrustCode(type.getEntrustCode());
@@ -3061,10 +3063,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                     fos.write(bytes, 0, index);
                     fos.flush();
                 }
-
-
                     String name =  smbFile.getName();
-                if (name.contains(type.getExperiment())){
                     SoilSample sample = soilSampleService.getBySampleCode(type.getSampleCode());
                     if (null !=sample){
                         XSSFWorkbook xssfWorkbook= exportService.getXSSFWorkbook("AttachmentTemplateSZYS.xlsx");
@@ -3116,15 +3115,27 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                         appendix.setName("附录"+count+" "+type.getExperiment()+"试验成果图");
                         appendix.setTitle("附录"+count);
                         appendix.setExpId(type.getExpId());
-                        appendix.setSampleCode(type.getSampleCode());
+                        appendix.setSampleCode(type.getSiteNo());
                         appendix.setEntrustCode(type.getEntrustCode());
-                        soilAppendixService.save(appendix);
 
+                        if (name.contains("三轴")){
+                            appendix.setRemark("三轴");
+                        }else if (name.contains("固结")){
+                            appendix.setRemark("固结");
+                        }else if (name.contains("直剪")||name.contains("直接剪切")){
+                            appendix.setRemark("直剪");
+                        }else if (name.contains("无侧限")){
+                            appendix.setRemark("无侧限");
+                        }else{
+                            appendix.setRemark(type.getExperiment());
                         }
 
+                        soilAppendixService.save(appendix);
+
                     }
 
 
+
                 is.close();
                 fos.close();
 
@@ -3141,6 +3152,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                     FileUtils.deleteFiles(fileNew);
                 }
             }catch (Exception e){
+                logger.error("uploadCollectPng采集失败，原因："+e.getMessage());
                 e.printStackTrace();
             }
         }
@@ -3247,6 +3259,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
              return    soilExperimentCollectDataService.saveBatch(dataList);
             }
         }catch (Exception e){
+            logger.error("parseTxt失败，原因："+e.getMessage());
             e.printStackTrace();
         }
         return false;