From 8421512018a876ef192cd787fb30a452892632a3 Mon Sep 17 00:00:00 2001
From: duwenyuan <15600000461@163.com>
Date: Wed, 20 May 2026 21:40:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9C=AA=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/SpectrumAnalysisMapper.java        |   2 +-
 .../mapper/xml/SpectrumAnalysisMapper.xml     | 212 +-----------------
 .../impl/SpectrumAnalysisServiceImpl.java     |  30 +--
 3 files changed, 11 insertions(+), 233 deletions(-)

diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java
index ec802c5a..a630ac79 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java
@@ -213,6 +213,6 @@ public interface SpectrumAnalysisMapper {
                                                    @Param("sampleId") String sampleId,
                                                    @Param(value = "userName") String userName,
                                                    @Param("startTime") LocalDateTime startTime,
-                                                   @Param("endTime ") LocalDateTime endTime);
+                                                   @Param("endTime") LocalDateTime endTime);
 
 }
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml
index 966aaa46..0a73e42b 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml
@@ -390,12 +390,6 @@
         where SAMPLE_ID = #{sampleId}
     </select>
 
-    <select id="findStationIdBySampleId" resultType="java.lang.Integer">
-        SELECT STATION_ID
-        FROM ORIGINAL.GARDS_SAMPLE_DATA
-        where SAMPLE_ID = #{sampleId}
-    </select>
-
     <select id="viewARR" resultType="java.lang.String">
         SELECT REPORT_PAHT
         FROM RNAUTO.GARDS_ANALYSES
@@ -528,6 +522,7 @@
         </where>
         ORDER BY GXR.NUCLIDE_NAME, GSD.COLLECT_START
     </select>
+
     <select id="statisticsQueryCollection" resultType="org.jeecg.modules.entity.vo.StatisticsData">
         SELECT
         gsd.COLLECT_START AS collectStart,
@@ -742,45 +737,6 @@
         WHERE idanalysis = #{idAnalysis}
     </select>
 
-    <select id="getNuclideLines" resultType="org.jeecg.modules.entity.vo.NuclideLine">
-        SELECT FULLNAME      as fullName,
-               ENERGY        as energy,
-               ENERGY_UNCERT as energyUncert,
-               YIELD         as yield,
-               YIELD_UNCERT  as yieldUncert,
-               KEY_FLAG      as keyFlag
-        from CONFIGURATION.GARDS_NUCL_LINES_LIB
-        WHERE NAME = #{name}
-        ORDER BY ENERGY
-    </select>
-
-    <select id="getHalf" resultType="org.jeecg.modules.entity.vo.HalfData">
-        SELECT
-        NAME as name,
-        HALFLIFE as half
-        FROM
-        CONFIGURATION.GARDS_NUCL_LIB
-        WHERE NAME IN
-        <foreach collection="names" item="name" open="(" separator="," close=")">
-            #{name}
-        </foreach>
-    </select>
-
-    <select id="getOneHalf" resultType="org.jeecg.modules.entity.vo.HalfData">
-        SELECT NAME     as name,
-               HALFLIFE as half
-        FROM CONFIGURATION.GARDS_NUCL_LIB
-        WHERE NAME = #{name}
-    </select>
-
-    <select id="UserNuclide" resultType="java.lang.String">
-        SELECT nuclide_name
-        FROM sys_default_nuclide
-        where use_type = 3
-          and nuclide_type = #{systemType}
-          and create_by = #{userName}
-    </select>
-
     <select id="getAnalysisID" resultType="java.lang.Integer">
         SELECT ANALYSIS_DB.IDANALYSIS
         FROM ${dbName}.GARDS_ANALYSES ANALYSIS_DB
@@ -884,19 +840,6 @@
           AND XE_RESULTS.SAMPLE_ID = #{sampleId}
     </select>
 
-    <select id="getUserNuclideNames" resultType="java.lang.String">
-        select
-        distinct a.name
-        from
-        CONFIGURATION.GARDS_NUCL_LINES_LIB a
-        where a.name in
-        <foreach collection="nuclides" item="nuclide" open="(" close=")" separator=",">
-            #{nuclide}
-        </foreach>
-        and a.energy > #{min}
-        and a.energy &lt; #{max}
-    </select>
-
     <select id="getFULLNuclideNames" resultType="java.lang.String">
         select distinct a.name
         from CONFIGURATION.GARDS_NUCL_LINES_LIB a
@@ -976,45 +919,6 @@
         WHERE SAMPLE_ID = #{sampleId}
     </select>
 
-    <select id="findNuclideList" resultType="java.lang.String">
-        select
-        distinct a.name
-        from
-        CONFIGURATION.GARDS_NUCL_LINES_LIB a
-        where a.name in
-        <foreach collection="nuclides" item="nuclide" open="(" close=")" separator=",">
-            #{nuclide}
-        </foreach>
-        and a.energy > #{min}
-        and a.energy &lt; #{max}
-    </select>
-
-    <select id="getNuclideTable" resultType="org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib">
-        select a.fullname      fullName,
-               a.energy        energy,
-               a.energy_uncert energyUncert,
-               a.yield         yield,
-               a.yield_uncert  yieldUncert
-        from CONFIGURATION.GARDS_NUCL_LINES_LIB a
-        where a.name = #{name}
-          and a.energy >= 30
-          and a.energy &lt;= #{span}
-        order by a.yield
-    </select>
-
-    <select id="getPossibleNuclide" resultType="java.lang.String">
-        select
-        distinct a.name
-        from
-        CONFIGURATION.GARDS_NUCL_LINES_LIB a
-        where a.name in
-        <foreach collection="nuclides" item="nuclide" open="(" close=")" separator=",">
-            #{nuclide}
-        </foreach>
-        and a.energy > #{min}
-        and a.energy &lt; #{max}
-    </select>
-
     <select id="SampleIsExist" resultType="java.lang.Integer">
         SELECT IDANALYSIS
         FROM RNMAN.GARDS_ANALYSES
@@ -1192,133 +1096,30 @@
         WHERE IDANALYSIS = #{idAnalysis}
     </delete>
 
-    <insert id="insertCalibrationPairs" parameterType="java.util.List">
-        INSERT INTO RNMAN.GARDS_CALIBRATION_PAIRS(SAMPLE_ID, IDANALYSIS, SAMPLE_TYPE, CALTYPE, INPUT, IDCALPOINT,
-                                                  XVALUE, YVALUE)
-        VALUES (#{calibrationPairs.sampleId}, #{calibrationPairs.idAnalysis}, #{calibrationPairs.sampleType},
-                #{calibrationPairs.caltype}, #{calibrationPairs.input}, #{calibrationPairs.idCalPoint},
-                #{calibrationPairs.xValue}, #{calibrationPairs.yValue})
-    </insert>
-
     <delete id="deleteCalibration">
         DELETE
         FROM RNMAN.GARDS_CALIBRATION
         WHERE IDANALYSIS = #{idAnalysis}
     </delete>
 
-    <insert id="insertCalibration">
-        INSERT INTO RNMAN.GARDS_CALIBRATION(SAMPLE_ID,
-                                            IDANALYSIS,
-                                            SAMPLE_TYPE,
-                                            CALTYPE,
-                                            FUNCTION,
-                                            FUNCTIONDEF,
-                                            STARTOFRANGE,
-                                            ENDOFRANGE,
-                                            COEFF1,
-                                            COEFF2,
-                                            COEFF3)
-        VALUES (#{calibration.sampleId},
-                #{calibration.idAnalysis},
-                #{calibration.sampleType},
-                #{calibration.calType},
-                #{calibration.function},
-                #{calibration.functionDef},
-                #{calibration.startOfRange},
-                #{calibration.endOfRange},
-                #{calibration.coeff1},
-                #{calibration.coeff2},
-                #{calibration.coeff3})
-
-    </insert>
-
     <delete id="deleteROIChannels">
         DELETE
         FROM RNMAN.GARDS_ROI_CHANNELS
         WHERE IDANALYSIS = #{idAnalysis}
     </delete>
 
-    <insert id="insertROIChannels">
-        INSERT INTO RNMAN.GARDS_ROI_CHANNELS(SAMPLE_ID,
-                                             IDANALYSIS,
-                                             ROI,
-                                             B_CHAN_START,
-                                             B_CHAN_STOP,
-                                             G_CHAN_START,
-                                             G_CHAN_STOP)
-        VALUES (#{roiChannels.sampleId},
-                #{roiChannels.idAnalysis},
-                #{roiChannels.roi},
-                #{roiChannels.bChanStart},
-                #{roiChannels.bChanStop},
-                #{roiChannels.gChanStart},
-                #{roiChannels.gChanStop})
-    </insert>
-
     <delete id="deleteXeResult">
         DELETE
         FROM RNMAN.GARDS_XE_RESULTS
         WHERE IDANALYSIS = #{idAnalysis}
     </delete>
 
-    <insert id="insertXeResult">
-        INSERT INTO RNMAN.GARDS_XE_RESULTS(SAMPLE_ID,
-                                           IDANALYSIS,
-                                           NUCLIDE_NAME,
-                                           CONC,
-                                           CONC_ERR,
-                                           MDC,
-                                           LC,
-                                           NID_FLAG)
-        VALUES (#{xeResult.sampleId},
-                #{xeResult.idAnalysis},
-                #{xeResult.nuclideName},
-                #{xeResult.conc},
-                #{xeResult.concErr},
-                #{xeResult.mdc},
-                #{xeResult.lc},
-                #{xeResult.nidFlag})
-    </insert>
-
     <delete id="deleteROIResults">
         DELETE
         FROM RNMAN.GARDS_ROI_RESULTS
         WHERE IDANALYSIS = #{idAnalysis}
     </delete>
 
-    <insert id="insertROIResults">
-        INSERT INTO RNMAN.GARDS_ROI_RESULTS(SAMPLE_ID,
-                                            IDANALYSIS,
-                                            ROI,
-                                            LC,
-                                            S_GROSS,
-                                            G_GROSS,
-                                            B_GROSS,
-                                            S_NET,
-                                            G_NET,
-                                            NET,
-                                            NET_ERR,
-                                            CONC,
-                                            CONC_ERR,
-                                            MDC,
-                                            NID_FLAG)
-        VALUES (#{roiResultsSpectrum.sampleId},
-                #{roiResultsSpectrum.idAnalysis},
-                #{roiResultsSpectrum.roi},
-                #{roiResultsSpectrum.lc},
-                #{roiResultsSpectrum.sGross},
-                #{roiResultsSpectrum.gGross},
-                #{roiResultsSpectrum.bGross},
-                #{roiResultsSpectrum.sNet},
-                #{roiResultsSpectrum.gNet},
-                #{roiResultsSpectrum.net},
-                #{roiResultsSpectrum.netErr},
-                #{roiResultsSpectrum.conc},
-                #{roiResultsSpectrum.concErr},
-                #{roiResultsSpectrum.mdc},
-                #{roiResultsSpectrum.nidFlag})
-    </insert>
-
     <select id="getIdAnalysisByIdAnalyst" resultType="java.lang.String">
         SELECT IDANALYSIS
         FROM RNMAN.GARDS_ANALYSES
@@ -1362,17 +1163,6 @@
         WHERE IDANALYSIS = #{idAnalysis}
     </delete>
 
-    <select id="getSampleIdLikeFileName" resultType="java.lang.Integer">
-        select SAMPLE_ID
-        from ORIGINAL.GARDS_SAMPLE_DATA
-        WHERE INPUT_FILE_NAME LIKE CONCAT('%', #{fileName})
-    </select>
-
-    <select id="findNuclidesAnalysis" resultType="java.lang.String">
-        select NAME
-        from CONFIGURATION.GARDS_NUCL_LIB
-    </select>
-
     <select id="selectThresholdDataBySampleId" resultType="java.util.Map">
         SELECT gtr.NUCLIDENAME     AS "NUCLIDENAME",
                gtr.THRESHOLD_VALUE AS "THRESHOLD_VALUE"
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 16b0bf0f..1b68865d 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,7 +45,6 @@ import org.jeecg.modules.entity.*;
 import org.jeecg.modules.entity.vo.*;
 import org.jeecg.modules.entity.vo.QCFlagParmData.Rule;
 import org.jeecg.modules.mapper.SpectrumAnalysisMapper;
-import org.jeecg.modules.mapper.SpectrumAnalysisPostgresMapper;
 import org.jeecg.modules.native_jni.EnergySpectrumHandler;
 import org.jeecg.modules.native_jni.struct.BgAnalyseResult;
 import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct;
@@ -155,18 +154,6 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport
     @Autowired
     private IRnManGardsThresholdService gardsThresholdService;
 
-    @Autowired
-    private DataSource dataSource;
-    private DbType databaseType;
-
-    @PostConstruct
-    public void initDbType() throws SQLException {
-        DynamicRoutingDataSource ds = (DynamicRoutingDataSource) dataSource;
-        String databaseProductName =
-                ds.getDataSource("ora").getConnection().getMetaData().getDatabaseProductName();
-        databaseType = DbType.getDbType(databaseProductName);
-
-    }
 
     @Override
     public void initValue(String dbName, Integer sampleId, String analyst, String sampleFileName,
@@ -2894,11 +2881,11 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport
                 LocalDateTime startTime = LocalDateTime.now().minusYears(1);
                 LocalDateTime endTime = LocalDateTime.now();
                 List<ThresholdResultHistory> thresholdHistoryValues =
-                                spectrumAnalysisMapper.selectThresholdHistoryBySampleId(schemaName,
-                                        rrrLogInfo.getSampleId().toString(),startTime);
+                        spectrumAnalysisMapper.selectThresholdHistoryBySampleId(schemaName,
+                                rrrLogInfo.getSampleId().toString(), startTime);
                 List<NuclideAnalysisInfo> xeHistoryAllData =
-                                spectrumAnalysisMapper.selectXeDataPastYear(schemaName,
-                                        rrrLogInfo.getSampleId().toString(), userName,startTime,endTime);
+                        spectrumAnalysisMapper.selectXeDataPastYear(schemaName,
+                                rrrLogInfo.getSampleId().toString(), userName, startTime, endTime);
 
 
                 //region 获取当前样品的核素分级
@@ -6171,10 +6158,11 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport
         Integer isExist = spectrumAnalysisMapper.SampleIsExist(sampleFilePathName,
                 anlyseResultIn.getUserName());
         //如果当前分析员在当天没有排班任务 并且 没有历史分析过当前文件 则不允许进行保存操作
-//        if (!bAnalysisResultWriteAuthority && Objects.isNull(isExist)) {
-//            result.error500("You have no permission to save " + anlyseResultIn.getStationName() + " results to DB!");
-//            return result;
-//        }
+        if (!bAnalysisResultWriteAuthority && Objects.isNull(isExist)) {
+            result.error500("You have no permission to save " + anlyseResultIn.getStationName() +
+                    " results to DB!");
+            return result;
+        }
         //处理数据 获取对应的channel/energy值
         getChannelAndEnergy(anlyseResultIn, betaList, gammaList, betaDataFile);
         //分析文件内容