Merge branch 'dev'

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

@@ -660,6 +660,11 @@ public class SoilExperimentController extends ServiceController  {
     }
 
 
+
+
+
+
+
     @ApiOperation(value = "填写开土制备记录", notes = "填写开土制备记录")
     @PostMapping("/save_excel_open_soil_record")
     public RestResult<SoilOpenSoilRecord> saveExcelOpenSoilRecord(@RequestParam("entrustId")Long entrustId, @RequestParam("templateId") Long templateId) {
@@ -675,6 +680,13 @@ public class SoilExperimentController extends ServiceController  {
     }
 
 
+    @ApiOperation(value = "高级实验报告生成", notes = "高级实验报告生成")
+    @PostMapping("/senior_test_report")
+    public RestResult<SoilExpReport> seniorTestReport(@RequestParam("id")Long id) {
+        return success(soilExperimentService.seniorTestReport(id,getAccount()));
+    }
+
+
 
 
 

src/main/java/com/patzn/cloud/service/lims/soil/service/ISoilExperimentService.java

@@ -103,4 +103,6 @@ public interface ISoilExperimentService extends IBaseService<SoilExperiment> {
     boolean uploadGdsFile(MultipartFile file);
 
     boolean uploadDynamicsCollect(MultipartHttpServletRequest httpServletRequest, Long entrustId, Account account);
+
+    SoilExpReport seniorTestReport(Long id, Account account);
 }

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

@@ -7,6 +7,7 @@ import com.patzn.cloud.service.lims.soil.mapper.SoilAppendixMapper;
 import com.patzn.cloud.service.lims.soil.service.ISoilAppendixService;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import com.patzn.cloud.service.soil.entity.SoilAppendix;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -31,6 +32,22 @@ public class SoilAppendixServiceImpl extends BaseServiceImpl<SoilAppendixMapper,
     @Override
     public Page<SoilAppendix> page(Page<SoilAppendix> page, SoilAppendix soilAppendix) {
         Wrapper wrapper = new EntityWrapper<>(soilAppendix);
+        if (StringUtils.isNotBlank(soilAppendix.getTitle())){
+            wrapper.like("title",soilAppendix.getTitle());
+            soilAppendix.setTitle(null);
+        }
+
+        if (StringUtils.isNotBlank(soilAppendix.getRemark())){
+            wrapper.like("remark",soilAppendix.getRemark());
+            soilAppendix.setRemark(null);
+        }
+
+        if (StringUtils.isNotBlank(soilAppendix.getSampleCode())){
+            wrapper.like("sample_code",soilAppendix.getSampleCode());
+            soilAppendix.setSampleCode(null);
+        }
+
+
         wrapper.orderBy("ctime");
         return this.page(page, wrapper);
     }

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

@@ -169,6 +169,10 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
 
 
     @Autowired
+    private ISoilExpRelOriginalRecordService soilExpRelOriginalRecordService;
+
+
+    @Autowired
     private SysOrgClient sysOrgClient;
 
     @Override
@@ -963,6 +967,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                     }
 
                     mapReplace.put("#{sampleCode}",vo.getSampleCode());
+                    mapReplace.put("#{siteNo}",vo.getSiteNo());
                     mapReplace.put("#{sampleDepth}",vo.getSampleDepth());
                     HSSFWorkbookUtil.replaceModel(mapReplace,xssfWorkbook,sheet);
                     nextSample++;
@@ -995,6 +1000,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                 }
 
                 mapReplace.put("#{sampleCode}",firstVO.getSampleCode());
+                mapReplace.put("#{siteNo}",firstVO.getSiteNo());
                 mapReplace.put("#{sampleDepth}",firstVO.getSampleDepth());
                 HSSFWorkbookUtil.replaceModel(mapReplace,xssfWorkbook,xssfSheet);
 
@@ -1613,6 +1619,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                     }
 
                     mapReplace.put("#{sampleCode}",vo.getSampleCode());
+                    mapReplace.put("#{siteNo}",vo.getSiteNo());
                     mapReplace.put("#{sampleDepth}",vo.getSampleDepth());
                     HSSFWorkbookUtil.replaceModel(mapReplace,xssfWorkbook,sheet);
                     nextSample++;
@@ -1645,6 +1652,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
                 }
 
                 mapReplace.put("#{sampleCode}",firstVO.getSampleCode());
+                mapReplace.put("#{siteNo}",firstVO.getSiteNo());
                 HSSFWorkbookUtil.replaceModel(mapReplace,xssfWorkbook,xssfSheet);
 
                 int length = voList.size();
@@ -2491,6 +2499,58 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
     }
 
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public SoilExpReport seniorTestReport(Long id, Account account) {
+        RestAssert.fail(null == id ,"请选择高级试验！");
+        List<SoilExpRelOriginalRecord> relOriginalRecordList =  soilExpRelOriginalRecordService.list(Condition.create().eq("exp_id",id).last(" LIMIT 1 "));
+        RestAssert.fail(CollectionUtils.isEmpty(relOriginalRecordList),"原始记录暂未生成！");
+        SoilExpRelOriginalRecord originalRecord=relOriginalRecordList.get(0);
+        SoilOriginalRecord record =  soilOriginalRecordService.getById(originalRecord.getRecordId());
+        InputStream io = ossClient.download(record.getObjectKey());
+        if (null == io){
+            logger.error("----------------------2");
+            RestAssert.fail("模板不存在");
+        }
+
+        logger.error(" InputStream io 存在");
+        SoilExpReport objectKey=null;
+        XSSFWorkbook xssfWorkbook= null;
+        try {
+            xssfWorkbook=   new XSSFWorkbook(io);
+        }catch (Exception e){
+            logger.error("获取开土制备记录模板错误"+e.getMessage());
+            e.printStackTrace();
+        }
+
+        FileOutputStream os = null;
+        File file = null;
+        String generated="试验项目报告";
+        SoilEntrust entrust = soilEntrustService.getById(record.getEntrustId());
+        SoilExperiment experiment =   getById(id);
+        try {
+            file = File.createTempFile(generated, ".xlsx");
+            os = new FileOutputStream(file);
+            xssfWorkbook.write(os);
+            os.flush();
+            objectKey= soilExpReportService.uploadExpReportGenerate(new Long[]{id},null,entrust,experiment.getName(), account, "报告生成", file);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                os.close();
+                xssfWorkbook.close();
+                io.close();
+                FileUtils.deleteFiles(file);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        }
+        return objectKey;
+    }
+
+
     public boolean parseTxt(MultipartFile smbFile, CollectDataType request) {
         try {
             List<SoilExperimentCollectData> dataList=   CollectUtil.txt2String(smbFile.getInputStream());

src/main/resources/application-zhyf.yml

@@ -11,20 +11,20 @@ service:
 spring:
   datasource:
     username: dbsoiladmin
-    password: ptoil!%&wzhj768
-    url: jdbc:postgresql://127.0.0.1:5432/pc_lims_soil
+    password: ptoilwzhj768
+    url: jdbc:postgresql://db:5432/pc_lims_soil
     driver-class-name: org.postgresql.Driver
     dynamic:
       enabled: false
   # 注册中心配置
   cloud:
     consul:
-      host: 127.0.0.1
+      host: consul
   rabbitmq:
-    host: 127.0.0.1
+    host: rabbitmq
     port: 5672
     username: patznsomq
-    password: mqsoil456#@$5
+    password: mqsoil456!
     virtual-host: /
     topic:
       push-msg: pro.topic.push.msg
@@ -34,12 +34,12 @@ spring:
       report-make-msg: pro.topic.report.make.msg
       soil-work-msg: pro.topic.soil.work.msg
   redis:
-    host: 127.0.0.1
+    host: redis
     password: ptsoil476TMa
   # Mongodb GridFS
   data:
     mongodb:
-      uri: mongodb://mgluser:soild574ld@127.0.0.1:27017/lims
+      uri: mongodb://mgluser:soild574ld@mongodb:27017/lims
       grid-fs-database: lims
 
 # Mongodb GridFS 存储

src/test/java/com/patzn/cloud/service/lims/test/TestDian.java

@@ -17,7 +17,8 @@ import java.util.Random;
 
 public class TestDian {
     public static void main(String[] args) throws Exception{
-        createScatterChart();
+      String a=null;
+      System.out.println("abc".contains(a));
     }
     public static void createScatterChart() throws IOException {
         XSSFWorkbook wb = new XSSFWorkbook();