From 8b924996c46243b51a2174e85112a002ac0a85ae Mon Sep 17 00:00:00 2001
From: orgin <feixingyuanup@gmail.com>
Date: Tue, 19 Sep 2023 15:54:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20gamma=20=E8=87=AA=E5=8A=A8=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/spectrum/Sample_G_Analysis.java   | 20 ++++++++++++-------
 .../modules/spectrum/SamplephdSpectrum.java   | 12 +++++++----
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
index e1fc6119..fc94021f 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
@@ -3,6 +3,7 @@ package org.jeecg.modules.spectrum;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
@@ -21,6 +22,8 @@ import org.jeecg.modules.base.entity.original.GardsSampleData;
 import org.jeecg.modules.base.entity.rnauto.*;
 import org.jeecg.modules.entity.vo.*;
 import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct;
+
+import java.io.File;
 import java.lang.reflect.Field;
 import java.util.*;
 
@@ -121,21 +124,22 @@ public class Sample_G_Analysis {
             // 获取分析结果ID ==> SELECT IDANALYSIS
             Integer IdAnalysis = getIdAnalysis(sampleId);
             // 修改保存结果状态 ==> UPDATE ORIGINAL.GARDS_SAMPLE_DATA
-            serviceQuotes.getSampleDataService().updateStatus(null,null);
+//            serviceQuotes.getSampleDataService().updateStatus(null,null);
             /* GARDS_CALIBRATION_PAIRS 数据表保存 */
-            saveCalibrationPairs(middleData,sampleId,IdAnalysis);
+//            saveCalibrationPairs(middleData,sampleId,IdAnalysis);
             /* GARDS_CALIBRATION 数据表保存 */
-            saveCalibration(middleData,sampleId,IdAnalysis);
+//            saveCalibration(middleData,sampleId,IdAnalysis);
             /* Gards_Peaks 数据表保存 */
-            savePeaks(middleData);
+//            savePeaks(middleData);
             /* Gards_Nucl_Lines_Ided 数据表保存 */
-            saveNuclLinesIded(middleData,sampleId,IdAnalysis);
+//            saveNuclLinesIded(middleData,sampleId,IdAnalysis);
             /* Gards_Nucl_Ided 数据表保存 */
-            saveNuclIded(middleData,sampleId,IdAnalysis);
+//            saveNuclIded(middleData,sampleId,IdAnalysis);
             /* Gards_Qc_Check 数据表保存 */
-            saveQcCheck(middleData,sampleId,IdAnalysis);
+//            saveQcCheck(middleData,sampleId,IdAnalysis);
             /*  */
             /** 收尾处理 ==> 写日志文件和报告文件 **/
+            writeLog(middleData.getAnalyses_LogPath(), middleData);
         }catch (Exception e){
             e.printStackTrace();
 
@@ -403,6 +407,8 @@ public class Sample_G_Analysis {
         // Sample Analyse Successfully at %1
         String analyseEnd = MyLogFormatUtil.analyseResultsEnd.replace("%1", "date");
         writes.add(MyLogFormatUtil.getTitleFormat(analyseEnd));
+
+        FileUtil.writeLines(writes, logFilePath, "utf8");
     }
 
     private static List<String> getAttribute(List<String> channel, String channelUnit, List<String> energys, String energyUnit,
diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SamplephdSpectrum.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SamplephdSpectrum.java
index e5f849af..b9ab6712 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SamplephdSpectrum.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SamplephdSpectrum.java
@@ -62,10 +62,14 @@ public class SamplephdSpectrum extends S_D_Q_G_SpectrumHandler{
      * @throws Exception
      */
     protected void autoAnalysis() throws Exception {
-        if(this.sourceData.system_type.equals(SystemType.BETA.getType())){
-            Sample_B_Analysis bAnalysis = new Sample_B_Analysis(super.sampleData,super.mailFile.getAbsolutePath(),
-                    super.spectrumServiceQuotes,super.sourceData,super.ftpUtil,super.logFilePath,super.logFileName);
-            bAnalysis.start();
+//        if(this.sourceData.system_type.equals(SystemType.BETA.getType())){
+//            Sample_B_Analysis bAnalysis = new Sample_B_Analysis(super.sampleData,super.mailFile.getAbsolutePath(),
+//                    super.spectrumServiceQuotes,super.sourceData,super.ftpUtil,super.logFilePath,super.logFileName);
+//            bAnalysis.start();
+//        }
+        if (this.sourceData.system_type.equals(SystemType.GAMMA.getType())) {
+            Sample_G_Analysis sample_g_analysis = new Sample_G_Analysis(super.sourceData, super.spectrumServiceQuotes, super.sampleData);
+            sample_g_analysis.analysis();
         }
     }
 }