联调环境启动

src/main/java/net/vtstar/zhongtong/avi/laboratory/domain/DailyItemRecord.java

@@ -35,8 +35,8 @@ public class DailyItemRecord {
     private String name;
 
     @Column(name = "check_result")
-    @ApiModelProperty(notes = "检测结果")
-    private Float checkResult;
+    @ApiModelProperty(notes = "检测指标")
+    private String checkResult;
 
     @Column(name = "range_upper")
     @ApiModelProperty(notes = "控制范围(上限)")

src/main/java/net/vtstar/zhongtong/avi/laboratory/service/DailyCheckService.java

@@ -2,6 +2,7 @@ package net.vtstar.zhongtong.avi.laboratory.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
+import lombok.extern.slf4j.Slf4j;
 import net.vtstar.user.mybatis.provider.Operation;
 import net.vtstar.user.mybatis.provider.WhereFilter;
 import net.vtstar.user.search.service.SearchService;
@@ -15,20 +16,29 @@ import net.vtstar.zhongtong.avi.laboratory.mapper.DailyCheckModelMapper;
 import net.vtstar.zhongtong.avi.laboratory.mapper.DailyCheckRecordMapper;
 import net.vtstar.zhongtong.avi.laboratory.mapper.DailyItemModelMapper;
 import net.vtstar.zhongtong.avi.laboratory.mapper.DailyItemRecordMapper;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ResourceUtils;
 
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.net.URLEncoder;
 import java.util.*;
 
 /**
  * @Author: xiadongwei
  * @Date: 2019/10/20 15:52
  */
+@Slf4j
 @Service
 public class DailyCheckService {
 
@@ -47,8 +57,6 @@ public class DailyCheckService {
     @Autowired
     private DailyItemRecordMapper itemRecordMapper;
 
-//    @Value("${project.basedir}/src/main/resources/")
-    private String tempFileHomePath;
     /**
      * 根据类型查询点检模板, 关联查询点检项模板;
      * 1.根据type查询点检模板, 若点检模板不存在, 则创建该类型的点检模板;
@@ -84,6 +92,7 @@ public class DailyCheckService {
 
     /**
      * 新增/编辑检测项模板
+     *
      * @param itemModel 检测项模板
      */
     public void saveCheckItemModel(DailyItemModel itemModel) {
@@ -102,6 +111,7 @@ public class DailyCheckService {
 
     /**
      * 新增检测记录
+     *
      * @param checkRecordVo
      */
     @Transactional
@@ -109,7 +119,7 @@ public class DailyCheckService {
         DailyCheckRecord checkRecord = checkRecordVo.getCheckRecord();
         int recordId = checkRecordMapper.insert(checkRecord);
         List<DailyItemRecord> itemRecords = checkRecordVo.getItemRecords();
-        for (DailyItemRecord itemRecord : itemRecords){
+        for (DailyItemRecord itemRecord : itemRecords) {
             itemRecord.setCheckRecordId(recordId);
         }
         itemRecordMapper.insertList(itemRecords);
@@ -117,6 +127,7 @@ public class DailyCheckService {
 
     /**
      * 根据查询条件搜索检测记录
+     *
      * @param pageFilter 条件
      */
     public List<DailyCheckRecord> getCheckRecord(String type, JSONObject pageFilter) {
@@ -128,6 +139,7 @@ public class DailyCheckService {
 
     /**
      * 根据检测记录ID 查询对应的检测报告
+     *
      * @param checkId 检测报告ID
      */
     public Map<String, Object> getCheckRecordDetailsByID(Long checkId) {
@@ -156,7 +168,31 @@ public class DailyCheckService {
         List<DailyItemRecord> itemModelList = itemRecordMapper.findList(new WhereFilter() {{
             addFilter("check_record_id", Operation.EQUAL, recordById.getId());
         }}, DailyItemRecord.class);
-        String fileName = "化验室检测模板";
-        File file = new File(tempFileHomePath, fileName + ".xls");
+        try {
+            File file = ResourceUtils.getFile("classpath:template/化验室检测模板.xlsx");
+            //将检测数据写入检测报告，并下载
+            XSSFWorkbook workbook = null;
+            XSSFSheet sheet = null;
+            InputStream is = new FileInputStream(file);
+            workbook = new XSSFWorkbook(is);
+            sheet = workbook.getSheetAt(0);
+            if (sheet != null) {
+                XSSFRow row = sheet.getRow(4);
+                XSSFCell cell = row.getCell(1);
+            }
+            ServletOutputStream outputStream = response.getOutputStream();
+            String filename = "检测报告";
+            String codedFileName = URLEncoder.encode(filename, "UTF-8");
+            response.setContentType("application/vnd.ms-excel");
+            response.setCharacterEncoding("utf-8");
+            response.setHeader("Content-disposition", "attachment;filename=" + codedFileName + ".xls");
+            response.setHeader("fileName", codedFileName + ".xls");
+            workbook.write(outputStream);
+            outputStream.flush();
+            outputStream.close();
+            is.close();
+        } catch (Exception e) {
+            log.error("检测报告模板导出失败!原因: {}", e.getMessage());
+        }
     }
 }