From 2f1f658d33f21f42ff86f73d14c0e8a533069f5c Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Thu, 18 Jan 2024 17:44:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A8=E6=80=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90excel=E5=86=85=E5=AE=B9=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/common/util/ExportUtil.java     | 45 +++++++++++++++++++
 .../modules/controller/GammaController.java   |  7 ++-
 .../jeecg/modules/service/IGammaService.java  |  2 +-
 .../service/impl/GammaServiceImpl.java        | 19 +++++++-
 4 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ExportUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ExportUtil.java
index 3640f577..b05069da 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ExportUtil.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ExportUtil.java
@@ -4,6 +4,11 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.jeecgframework.poi.excel.ExcelExportUtil;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -183,4 +188,44 @@ public class ExportUtil {
                                      Map<String,Object> dataMap){
         exportXls(response,template,target,dataSet,dataMap,"file.xls");
     }
+
+    public static Workbook createWorkBook(List<String> stationNameList, List<String> columnNameList, List<Map<String, Object>> dataList) {
+        //创建工作簿
+        Workbook workbook = new HSSFWorkbook();
+        //遍历台站数量
+        for (int i=0; i<stationNameList.size(); i++) {
+            String stationName = stationNameList.get(i);
+            //创建工作页
+            Sheet sheet = workbook.createSheet(stationName);
+            //声明行下标
+            int rowIndex = 0;
+            //创建第一行
+            Row row = sheet.createRow(rowIndex);
+            for (int j=0; j<columnNameList.size(); j++) {
+                String columnName = columnNameList.get(j);
+                //创建当前行的单元格
+                Cell cell = row.createCell(j);
+                cell.setCellValue(columnName);
+            }
+            rowIndex+=1;
+            //遍历数据根据字段名称取值赋值
+            for (int j=0; j<dataList.size(); j++) {
+                //创建存储数据的行
+                Row dataRow = sheet.createRow(rowIndex);
+                //数据数组中读取下标对应的数据
+                Map<String, Object> data = dataList.get(j);
+                for (int k=0; k<columnNameList.size(); k++) {
+                    Cell cell = dataRow.createCell(k);
+                    //从列名数组中读取列名
+                    String columnName = columnNameList.get(k);
+                    //根据列名读取对应数据的信息
+                    Object value = data.get(StringUtils.upperCase(columnName));
+                    cell.setCellValue(value.toString());
+                }
+            }
+        }
+        return workbook;
+    }
+
+
 }
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java
index 0a776fbd..999628f0 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java
@@ -436,8 +436,11 @@ public class GammaController {
     }
 
     @GetMapping("exportRadionuclideActivity")
-    public void exportRadionuclideActivity(Integer sampleId, String fileName, HttpServletRequest request, HttpServletResponse response){
-        gammaService.exportRadionuclideActivity(sampleId, fileName, request, response);
+    public void exportRadionuclideActivity(Integer sampleId, String fileName,
+                                           String arTime, String crTime,
+                                           HttpServletRequest request,
+                                           HttpServletResponse response){
+        gammaService.exportRadionuclideActivity(sampleId, fileName, arTime, crTime, request, response);
     }
 
     @GetMapping("Spectrum")
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java
index 7edf6462..ea573b19 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java
@@ -153,7 +153,7 @@ public interface IGammaService{
 
     Result<?> radionuclideActivity(Integer sampleId, String fileName, HttpServletRequest request);
 
-    void exportRadionuclideActivity(Integer sampleId, String fileName, HttpServletRequest request, HttpServletResponse response);
+    void exportRadionuclideActivity(Integer sampleId, String fileName, String arTime, String crTime,HttpServletRequest request, HttpServletResponse response);
 
     Result Spectrum(Integer sampleId, String fileName, HttpServletRequest request);
 
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
index da710b29..46fe3691 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
@@ -214,8 +214,23 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
             }
             //读取redis缓存的计算mdc信息
             Map<String, CalMDCInfo> mdcInfoMap = (Map<String, CalMDCInfo>) redisUtil.get("mdcInfoMap-"+phd.getHeader().getSystem_type());
-            if (CollectionUtils.isNotEmpty(mdcInfoMap)) {
-                phd.setMdcInfoMap(mdcInfoMap);
+            //如果是数据库加载  判断如果mdc计算结果是空的  就加入新的  否则使用数据库加载的mdc数据
+            if (CollectionUtils.isEmpty(phd.getMdcInfoMap())) {
+                if (CollectionUtils.isNotEmpty(mdcInfoMap)) {
+                    phd.setMdcInfoMap(mdcInfoMap);
+                }
+            } else {
+                if (CollectionUtils.isNotEmpty(mdcInfoMap)) {
+                    Map<String, CalMDCInfo> infoMap = phd.getMdcInfoMap();
+                    for (Map.Entry<String, CalMDCInfo> entry:infoMap.entrySet()) {
+                        String nuclName = entry.getKey();
+                        CalMDCInfo info = mdcInfoMap.get(nuclName);
+                        if (Objects.nonNull(info)) {
+                            CalMDCInfo mdcInfo = entry.getValue();
+                            mdcInfo.setHalflife(info.getHalflife());
+                        }
+                    }
+                }
             }
             gammaFileUtil.Qcstate(phd);
             key = fileName + StringPool.DASH + userName;