From 46f3299f078aa3c5447a9a0265716de26716b812 Mon Sep 17 00:00:00 2001
From: nieziyan <nzyone@qq.com>
Date: Mon, 11 Sep 2023 19:20:09 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9ARLR=20Export?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/jeecg/common/util/ClassUtil.java |  18 +++++
 .../org/jeecg/common/util/ExportUtil.java     |  25 +++---
 .../modules/base/enums/ExportTemplate.java    |   3 +-
 .../main/resources/excelTemplate/Gamma.RLR    |  76 ++++++++++++++++++
 .../main/resources/excelTemplate/RLR-B.xls    | Bin 0 -> 34816 bytes
 .../modules/controller/GammaController.java   |  62 +++-----------
 .../SpectrumAnalysesController.java           |   6 ++
 .../jeecg/modules/service/IGammaService.java  |   3 +-
 .../service/ISpectrumAnalysisService.java     |   2 +
 .../service/impl/GammaServiceImpl.java        |  70 +++++++++++++++-
 .../impl/SpectrumAnalysisServiceImpl.java     |  15 +++-
 11 files changed, 210 insertions(+), 70 deletions(-)
 create mode 100644 jeecg-boot-base-core/src/main/resources/excelTemplate/Gamma.RLR
 create mode 100644 jeecg-boot-base-core/src/main/resources/excelTemplate/RLR-B.xls

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ClassUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ClassUtil.java
index a5569856..eb650c0e 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ClassUtil.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ClassUtil.java
@@ -2,7 +2,12 @@ package org.jeecg.common.util;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import org.jeecgframework.poi.excel.entity.TemplateExportParams;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
 
+import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -47,4 +52,17 @@ public class ClassUtil {
         }
         return objsStr;
     }
+
+    public static String classPath(String path){
+        try {
+            String pathPrefix = "classpath:";
+            ResourceLoader loader = new DefaultResourceLoader();
+            String templatePath = pathPrefix + path;
+            Resource resource = loader.getResource(templatePath);
+            return resource.getFile().getAbsolutePath();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
 }
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 d901e1b1..c8e72adb 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
@@ -14,6 +14,7 @@ import org.springframework.core.io.ResourceLoader;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.PrintWriter;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -47,6 +48,13 @@ public class ExportUtil {
         response.setHeader("Content-disposition", "attachment;filename=" + name);
         return response.getOutputStream();
     }
+    public static PrintWriter streamWriter(HttpServletResponse response, String fileName) throws IOException {
+        response.setCharacterEncoding(UTF_8);
+        response.setContentType("application/octet-stream");
+        String name = URLEncoder.encode(fileName, UTF_8);
+        response.setHeader("Content-disposition", "attachment;filename=" + name);
+        return response.getWriter();
+    }
 
     public static <T> void exportXls(HttpServletResponse response, Class<T> target,
                                      List<T> data, String fileName){
@@ -77,18 +85,11 @@ public class ExportUtil {
         exportXls(response, target, data, "file.xls");
     }
 
-    public static TemplateExportParams excelTemplate(String name){
-        try {
-            String pathPrefix = "classpath:excelTemplate/";
-            ResourceLoader loader = new DefaultResourceLoader();
-            String templatePath = pathPrefix + name;
-            Resource resource = loader.getResource(templatePath);
-            String path = resource.getFile().getAbsolutePath();
-            return new TemplateExportParams(path);
-        } catch (IOException e) {
-            e.printStackTrace();
-            return null;
-        }
+    public static TemplateExportParams excelTemplate(String template){
+        String pathPrefix = "excelTemplate/";
+        String path = pathPrefix + template;
+        String templatePath = ClassUtil.classPath(path);
+        return new TemplateExportParams(templatePath);
     }
 
     public static void exportXls(HttpServletResponse response, String template,
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/ExportTemplate.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/ExportTemplate.java
index 1a2375ea..23b2e163 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/ExportTemplate.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/ExportTemplate.java
@@ -12,7 +12,8 @@ public enum ExportTemplate {
     SampleInfo_G("SampleInformation-G.xls"),
     RadionuclideActivity_G("RadionuclideActivity-G.xls"),
     SampleInfo_B("SampleInformation-B.xls"),
-    QcResult_B("QcResult-B.xls");
+    QcResult_B("QcResult-B.xls"),
+    RLR_B("RLR-B.xls"),RLR_G("Gamma.RLR");
 
     ExportTemplate(String name) {
         this.name = name;
diff --git a/jeecg-boot-base-core/src/main/resources/excelTemplate/Gamma.RLR b/jeecg-boot-base-core/src/main/resources/excelTemplate/Gamma.RLR
new file mode 100644
index 00000000..c6c127bf
--- /dev/null
+++ b/jeecg-boot-base-core/src/main/resources/excelTemplate/Gamma.RLR
@@ -0,0 +1,76 @@
+BEGIN IMS2.0
+MSG_TYPE DATA
+MSG_ID ${header_msg_id} ${header_station_code}
+DATA_TYPE MINIRLR
+#Header
+${header_priority_level}
+${header_station_code} ${header_srid}
+${header_lab_code} ${header_lab_detector}
+${header_report_type} ${header_report_number}
+${header_sample_category}
+${header_transmission}
+#Objective
+~AnalysisPurpose
+${Obj_purpose}
+~TestsAuthorized
+${Obj_authorized}
+~SpecialInstructions
+${Obj_instruction}
+#Collection
+${collect_start} ${collect_stop} ${collect_airVolume}
+#SampleReceipt
+${Receipt_srid}
+${Receipt_sealNum}
+${Receipt_sample_dateTime}
+~PackageCondition
+${Receipt_package}
+~SealCondition
+${Receipt_seal}
+~SampleCondition
+${Receipt_sample}
+#Test
+${Test_type}
+${Test_completion}
+${Test_person}
+${Test_purpose}
+#PeaksMethod
+${PeakMethod_software}
+${PeakMethod_location}
+#PeakFit
+${peakFit}
+#g_AnalysisMethods
+${AnalyMethod_software}
+~NuclidesMethod
+${AnalyMethod_nuclide}
+~BaselineMethod
+${AnalyMethod_baseline}
+~LCMethod
+${AnalyMethod_lc}
+~CalibrationMethod
+${AnalyMethod_calib}
+#PeakAssociation
+${Association}
+#References
+~SAMPLEPHD
+${Reference_samplePHD}
+~CALIBPHD
+${Reference_CalibPHD}
+~PhysicalConstants
+${Reference_physical}
+#Results
+${Result_act_ref} ${Result_conc_ref}
+${Result}
+#NuclideRatios
+#g_CoincidenceCorrection
+#MDA
+#Conclusions
+${conclusion_person}
+~IDCSummary
+${Conclusion_IDC}
+~Labsummary
+${Conclusion_Lab}
+~ResultComparison
+${Conclusion_Res}
+#Comment
+${Comment}
+STOP
\ No newline at end of file
diff --git a/jeecg-boot-base-core/src/main/resources/excelTemplate/RLR-B.xls b/jeecg-boot-base-core/src/main/resources/excelTemplate/RLR-B.xls
new file mode 100644
index 0000000000000000000000000000000000000000..747c0bbc44cef78501829982997d4da29e107329
GIT binary patch
literal 34816
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
W(VdOOc|4#AVp^8@|GSxM;C}%6@Vn9g

literal 0
HcmV?d00001

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 cfb6e0c8..d2ed282b 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
@@ -3,13 +3,16 @@ package org.jeecg.modules.controller;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReUtil;
 import cn.hutool.core.util.StrUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.ClassUtil;
+import org.jeecg.common.util.ExportUtil;
 import org.jeecg.modules.base.bizVo.GammaRLR;
+import org.jeecg.modules.base.enums.ExportTemplate;
 import org.jeecg.modules.entity.vo.*;
 import org.jeecg.modules.service.IGammaService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +21,9 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,6 +31,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static org.jeecg.modules.base.enums.ExportTemplate.RLR_B;
+import static org.jeecg.modules.base.enums.ExportTemplate.RLR_G;
+
 @RestController
 @RequestMapping("gamma")
 @Api(value = "gamma人工分析",tags = "gamma人工分析")
@@ -316,57 +325,10 @@ public class GammaController {
         return gammaService.viewRLR(sampleId, fileName);
     }
 
-    @GetMapping("exportRLR")
+    @PostMapping ("exportRLR")
     @ApiOperation(value = "导出RLR页面数据", notes = "导出RLR页面数据")
-    public void exportRLR(Integer sampleId, String fileName, HttpServletResponse response) {
-
-    }
-
-    public static void main(String[] args) {
-        String template = "D:\\Share\\Gamma\\Gamma.RLR";
-        GammaRLR gammaRLR = new GammaRLR();
-        gammaRLR.setAnalyMethod_lc("我是测试数据");
-        List<String> lines = FileUtil.readUtf8Lines(template);
-        // 正则表达式，匹配${}中的内容
-        String regex = "\\$\\{([^}]+)}";
-        List<String> newLines = new ArrayList<>();
-        List<String> list = ListUtil.toList("peakFit","Association","Result");
-        for (String line : lines) {
-            if (StrUtil.isBlank(line)) continue;
-            List<String> fieldNames = ReUtil.findAllGroup1(regex, line);
-            if (CollUtil.isEmpty(fieldNames)){
-                newLines.add(line);
-                continue;
-            }
-            Map<String, Object> fieldValue = ClassUtil.fieldValue(gammaRLR, fieldNames);
-            for (Map.Entry<String, Object> entry : fieldValue.entrySet()) {
-                String fieldName = entry.getKey();
-                Object value = entry.getValue();
-                if (list.contains(fieldName)){
-                    List<String> lineList = new ArrayList<>();
-                    switch (fieldName){
-                        case "peakFit":
-                            lineList = ClassUtil.objsStr((List<TablePeakFit>)value);
-                            break;
-                        case "Association":
-                            lineList = ClassUtil.objsStr((List<TableAssociation>)value);
-                            break;
-                        case "Result":
-                            lineList = ClassUtil.objsStr((List<TableResult>)value);
-                            break;
-                        default:
-                            break;
-                    }
-                    newLines.addAll(lineList);
-                }else {
-                    String search = "${" + fieldName + "}";
-                    String newLine = StrUtil.replace(line, search, value.toString());
-                    newLines.add(newLine);
-                }
-            }
-        }
-
-        String output = "C:\\Users\\a\\Desktop\\";
+    public void exportRLR(@RequestBody GammaRLR gammaRLR, HttpServletResponse response) {
+        gammaService.exportRLR(gammaRLR, response);
     }
 
     @GetMapping("viewAutomaticAnalysisLog")
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java
index ed097a43..dfe1e77d 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java
@@ -128,6 +128,12 @@ public class SpectrumAnalysesController {
         return spectrumAnalysisService.viewRLR(sampleId);
     }
 
+    @GetMapping("exportRLR")
+    @ApiOperation(value = "导出RLR数据", notes = "导出RLR数据")
+    public void exportRLR(Integer sampleId, HttpServletResponse response) {
+        spectrumAnalysisService.exportRLR(sampleId, response);
+    }
+
     @GetMapping("viewGammaDetectorCalibration")
     @ApiOperation(value = "查询GammaDetectorCalibration数据", notes = "查询GammaDetectorCalibration数据")
     public Result viewGammaDetectorCalibration(Integer sampleId) {
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 58544e57..0dc4930e 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
@@ -1,6 +1,7 @@
 package org.jeecg.modules.service;
 
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.base.bizVo.GammaRLR;
 import org.jeecg.modules.entity.vo.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -107,7 +108,7 @@ public interface IGammaService{
 
     Result viewRLR(Integer sampleId, String fileName);
 
-    void exportRLR(Integer sampleId, String fileName, HttpServletResponse response);
+    void exportRLR(GammaRLR gammaRLR, HttpServletResponse response);
 
     void viewAutomaticAnalysisLog(Integer sampleId, HttpServletResponse response);
 
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java
index e13a01a3..e2c56c37 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java
@@ -45,6 +45,8 @@ public interface ISpectrumAnalysisService {
 
     Result viewRLR(Integer sampleId);
 
+    void exportRLR(Integer sampleId, HttpServletResponse response);
+
     Result viewGammaDetectorCalibration(Integer sampleId);
 
     Result viewBetaDetectorCalibration(Integer sampleId);
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 89c6b0fa..c751402c 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
@@ -1,10 +1,13 @@
 package org.jeecg.modules.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ReUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
@@ -19,6 +22,7 @@ import org.jeecg.common.constant.DateConstant;
 import org.jeecg.common.properties.SpectrumPathProperties;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.*;
+import org.jeecg.modules.base.bizVo.GammaRLR;
 import org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib;
 import org.jeecg.modules.base.enums.ExportTemplate;
 import org.jeecg.modules.base.enums.RoleType;
@@ -48,6 +52,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static org.jeecg.modules.base.enums.ExportTemplate.RLR_G;
 import static org.jeecg.modules.base.enums.ExportTemplate.SampleInfo_G;
 
 @Service(value = "gammaService")
@@ -2046,12 +2051,69 @@ public class GammaServiceImpl implements IGammaService {
         result.setResult(map);
         return result;
     }
-
     @Override
-    public void exportRLR(Integer sampleId, String fileName, HttpServletResponse response) {
-
+    public void exportRLR(GammaRLR gammaRLR, HttpServletResponse response) {
+        String pathPrefix = "excelTemplate/";
+        String path = pathPrefix + RLR_G.getName();
+        String template = ClassUtil.classPath(path);
+        List<String> lines = FileUtil.readUtf8Lines(template);
+        // 正则表达式，匹配${}中的内容
+        String regex = "\\$\\{([^}]+)}";
+        List<String> newLines = new ArrayList<>();
+        List<String> list = ListUtil.toList("peakFit","Association","Result");
+        List<String> skip = ListUtil.toList("${peakFit}","${Association}","${Result}");
+        for (String line : lines) {
+            if (StrUtil.isBlank(line)) continue;
+            List<String> fieldNames = ReUtil.findAllGroup1(regex, line);
+            if (CollUtil.isEmpty(fieldNames)){
+                newLines.add(line);
+                continue;
+            }
+            Map<String, Object> fieldValue = ClassUtil.fieldValue(gammaRLR, fieldNames);
+            String newLine = line;
+            for (Map.Entry<String, Object> entry : fieldValue.entrySet()) {
+                String fieldName = entry.getKey();
+                Object value = entry.getValue();
+                if (list.contains(fieldName)){
+                    List<String> lineList = new ArrayList<>();
+                    switch (fieldName){
+                        case "peakFit":
+                            lineList = ClassUtil.objsStr((List<TablePeakFit>)value);
+                            break;
+                        case "Association":
+                            lineList = ClassUtil.objsStr((List<TableAssociation>)value);
+                            break;
+                        case "Result":
+                            lineList = ClassUtil.objsStr((List<TableResult>)value);
+                            break;
+                        default:
+                            break;
+                    }
+                    newLines.addAll(lineList);
+                }else {
+                    String search = "${" + fieldName + "}";
+                    String replacement = StrUtil.toString(value);
+                    replacement = StrUtil.isBlank(replacement) ? "null" : replacement;
+                    newLine = StrUtil.replace(newLine, search, replacement);
+                }
+            }
+            if (!CollUtil.contains(skip, newLine))
+                newLines.add(newLine);
+        }
+        PrintWriter writer = null;
+        try {
+            String export = "Gamma.RLR";
+            writer = ExportUtil.streamWriter(response, export);
+            for (String newLine : newLines) {
+                writer.println(newLine);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }finally {
+            if (ObjectUtil.isNotNull(writer))
+                writer.close();
+        }
     }
-
     @Override
     public void viewAutomaticAnalysisLog(Integer sampleId, HttpServletResponse response) {
         if (Objects.isNull(sampleId)){
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
index 9b474f44..d335357c 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
@@ -45,8 +45,7 @@ import java.util.*;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import static org.jeecg.modules.base.enums.ExportTemplate.QcResult_B;
-import static org.jeecg.modules.base.enums.ExportTemplate.SampleInfo_B;
+import static org.jeecg.modules.base.enums.ExportTemplate.*;
 
 @Service("spectrumAnalysisService")
 @DS("ora")
@@ -1455,6 +1454,18 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
         return result;
     }
 
+    @Override
+    public void exportRLR(Integer sampleId, HttpServletResponse response) {
+        Result<?> result = viewRLR(sampleId);
+        RlrDataValues rlrDataValues = (RlrDataValues)result.getResult();
+        Map<String,Object> dataMap = BeanUtil.beanToMap(rlrDataValues);
+        // 将Null值替换为"",避免空指针异常(或者在模板中进行判断)
+        dataMap.replaceAll((key, value) -> ObjectUtil.isNull(value) ? "" : value);
+        String export = "RLR-Beta.xls";
+        String template = RLR_B.getName();
+        ExportUtil.exportXls(response, template, dataMap,export);
+    }
+
     @Override
     public Result viewGammaDetectorCalibration(Integer sampleId) {
         Result result = new Result();