NameStandUtil移动到公用工具类中

修改Gamma模块下SaveToDB接口问题

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java

@@ -4111,7 +4111,6 @@ public class GammaFileUtil {
                 data1.getPointlist().add(seriseData);
             }
             datalist.add(data1);
-
             if(vEnergy.size() == size) {
                 ChartData data2 = new ChartData();
                 data2.setName("Compare");
@@ -4130,4 +4129,38 @@ public class GammaFileUtil {
         return datalist;
     }
 
+    public List<ChartData> StripData(List<Long> m_vecCompare, List<Long> m_vCount, long m_nCount, Map<String, String> colorMap, List<Double> vEnergy, Double ratioRate) {
+        List<ChartData> datalist = new LinkedList<>();
+        int size = m_vecCompare.size();
+        if(size == m_nCount) {
+            ChartData data1 = new ChartData();
+            data1.setName("Compare");
+            data1.setGroup("channel");
+            data1.setColor(colorMap.get("Color_Strip"));
+            // type: 1 Add a Spectrum in Channel; -1 Cut a Spectrum in Channel
+            for(int i=0; i<size; ++i) {
+                SeriseData seriseData = new SeriseData();
+                seriseData.setX(i+1);
+                seriseData.setY(m_vCount.get(i) + ratioRate * m_vecCompare.get(i));
+                data1.getPointlist().add(seriseData);
+            }
+            datalist.add(data1);
+            if(vEnergy.size() == size) {
+                ChartData data2 = new ChartData();
+                data2.setName("Compare");
+                data2.setGroup("energy");
+                data2.setColor(colorMap.get("Color_Strip"));
+                // type: 1 Add a Spectrum in Energy; -1 Cut a Spectrum in Energy
+                for(int i=0; i<size; ++i) {
+                    SeriseData seriseData = new SeriseData();
+                    seriseData.setX(vEnergy.get(i));
+                    seriseData.setY(m_vCount.get(i) + ratioRate * m_vecCompare.get(i));
+                    data2.getPointlist().add(seriseData);
+                }
+                datalist.add(data2);
+            }
+        }
+        return datalist;
+    }
+
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java

@@ -43,6 +43,11 @@ public class GammaController {
         return gammaService.Compare(fileName, compareFileName, request);
     }
 
+    @GetMapping("Strip")
+    public Result Strip(String fileName, String stripFileName, Double ratioRate, HttpServletRequest request) {
+        return gammaService.Strip(fileName, stripFileName, ratioRate, request);
+    }
+
     @GetMapping("configure")
     @ApiOperation(value = "analyze菜单下configure页面数据", notes = "analyze菜单下configure页面数据")
     public Result configure(Integer sampleId, String fileName) {

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java

@@ -19,6 +19,8 @@ public interface IGammaService{
 
     Result Compare(String fileName, String compareFileName, HttpServletRequest request);
 
+    Result Strip(String fileName, String stripFileName, Double ratioRate, HttpServletRequest request);
+
     Result configure(Integer sampleId, String fileName);
 
     Result Reprocessing(ConfigureData configureData, HttpServletRequest request);

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationPairsOrigSpectrumService.java

@@ -11,6 +11,6 @@ public interface IGardsCalibrationPairsOrigSpectrumService extends IService<Gard
 
     Integer saveGardsCalibrationPairsOrig(EnergySpectrumStruct sourceData, Integer sampleId, List<String> readLines);
 
-    boolean saveCalibrationPairsOrigGamma(PHDFile phd, Integer sampleId);
+    Integer saveCalibrationPairsOrigGamma(PHDFile phd, Integer sampleId);
 
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleAuxSpectrumService.java

@@ -11,6 +11,6 @@ public interface IGardsSampleAuxSpectrumService extends IService<GardsSampleAux>
 
     Integer saveSampleAux(EnergySpectrumStruct sourceData, Integer sampleId, List<String> readLines);
 
-    boolean saveSampleAuxGamma(PHDFile phd, Integer sampleId);
+    Integer saveSampleAuxGamma(PHDFile phd, Integer sampleId);
 
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleCertLineSpectrumService.java

@@ -9,6 +9,6 @@ public interface IGardsSampleCertLineSpectrumService extends IService<GardsSampl
 
     Integer saveSampleCertLine(EnergySpectrumStruct sourceData, Integer sampleId);
 
-    boolean saveSampleCertLineGamma(PHDFile phd, Integer sampleId);
+    Integer saveSampleCertLineGamma(PHDFile phd, Integer sampleId);
 
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleCertSpectrumService.java

@@ -9,6 +9,6 @@ public interface IGardsSampleCertSpectrumService extends IService<GardsSampleCer
 
     Integer saveSampleCert(EnergySpectrumStruct sourceData, Integer sampleId);
 
-    boolean saveSampleCertGamma(PHDFile phd, Integer sampleId);
+    Integer saveSampleCertGamma(PHDFile phd, Integer sampleId);
 
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleDataSpectrumService.java

@@ -11,6 +11,6 @@ public interface IGardsSampleDataSpectrumService extends IService<GardsSampleDat
 
     Integer saveSampleData(EnergySpectrumStruct sourceData, Integer stationId, Integer detectorId, String filePathName, List<String> readLines);
 
-    boolean saveSampleDataGamma(PHDFile phd, String input_file_name, Integer station_id, Integer detect_id);
+    Integer saveSampleDataGamma(PHDFile phd, String input_file_name, Integer station_id, Integer detect_id);
 
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSpectrumSpectrumService.java

@@ -11,6 +11,6 @@ public interface IGardsSpectrumSpectrumService extends IService<GardsSpectrum> {
 
     Integer saveSpectrum(EnergySpectrumStruct sourceData, Integer sampleId, List<String> readLines, String filePathName);
 
-    boolean saveSpectrumGamma(PHDFile phd, Integer sampleId, String input_file_name);
+    Integer saveSpectrumGamma(PHDFile phd, Integer sampleId, String input_file_name);
 
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsTotalEfficiencyPairsSpectrumService.java

@@ -9,6 +9,6 @@ public interface IGardsTotalEfficiencyPairsSpectrumService extends IService<Gard
 
     Integer saveTotalEfficiencyPairs(EnergySpectrumStruct sourceData, Integer sampleId);
 
-    boolean saveTotalEfficiencyPairsGamma(PHDFile phd, Integer sampleId);
+    Integer saveTotalEfficiencyPairsGamma(PHDFile phd, Integer sampleId);
 
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java

@@ -249,6 +249,40 @@ public class GammaServiceImpl implements IGammaService {
         return result;
     }
 
+    @Override
+    public Result Strip(String fileName, String stripFileName, Double ratioRate, HttpServletRequest request) {
+        Result result = new Result();
+        String userName = JwtUtil.getUserNameByToken(request);
+        //获取当前角色配置的颜色信息
+        Map<String, String> colorMap = sysUserColorService.initColor(userName);
+        //获取缓存的phd数据
+        Cache<String, PHDFile> phdCache = localCache.getPHDCache();
+        PHDFile phd = phdCache.getIfPresent(fileName);
+        long m_nCount = phd.getSpec().getNum_g_channel();
+        List<Double> vEnergy = phd.getVEnergy();
+        long m_nSChan = phd.getSpec().getBegin_channel();
+        List<Long> m_vCount = new LinkedList<>();
+        // 确保绘制曲线时所有谱都是从1道开始
+        int i = 0;
+        if(m_nSChan == 0) {
+            i = 1;
+        }
+        for(; i<m_nCount; ++i) {
+            m_vCount.add(phd.getSpec().getCounts().get(i));
+        }
+        if(m_nSChan == 0) {
+            m_vCount.add(0L);
+        }
+        //获取Compare数据
+        List<Long> m_vecCompare = gammaFileUtil.loadCompareData(stripFileName, userName, m_nCount, result);
+        if (CollectionUtils.isNotEmpty(m_vecCompare)) {
+            List<ChartData> chartDataList = gammaFileUtil.StripData(m_vecCompare, m_vCount, m_nCount, colorMap, vEnergy, ratioRate);
+            result.setSuccess(true);
+            result.setResult(chartDataList);
+        }
+        return result;
+    }
+
     @Override
     public Result configure(Integer sampleId, String fileName) {
         Result result = new Result();
@@ -2842,7 +2876,7 @@ public class GammaServiceImpl implements IGammaService {
             phd.setStatus(sampleData.getStatus());
         } else {
             //如果sampleData为空  存储数据
-            bRet = SaveSampleToDB(phd, middleData.analyses_save_filePath);
+            SaveSampleToDB(phd, middleData.analyses_save_filePath);
         }
         if(!bRet) {
             result.error500("The Database hasn't this Spectrum("+phd.getFilename()+") and Insert it to Database failed.");
@@ -2936,8 +2970,7 @@ public class GammaServiceImpl implements IGammaService {
     }
 
     @Transactional
-    public boolean SaveSampleToDB(PHDFile phd, String input_file_name) {
+    public void SaveSampleToDB(PHDFile phd, String input_file_name) {
-        boolean bRet = true;
         String sit_det_code = phd.getHeader().getSite_code();
         String detect_code = phd.getHeader().getDetector_code();
         // 查询 station_id 和 detect_id
@@ -2948,54 +2981,26 @@ public class GammaServiceImpl implements IGammaService {
         // 查询新增后的 sample_id 的值赋给变量 DECLARESAMPLEID
         Integer sampleId = spectrumAnalysisMapper.getSampleId(input_file_name);
         // ORIGINAL.GARDS_SAMPLE_AUX 表数据
-        bRet = sampleAuxSpectrumService.saveSampleAuxGamma(phd, sampleId);
+        sampleAuxSpectrumService.saveSampleAuxGamma(phd, sampleId);
-        if (!bRet) {
-            String Warning = "Save "+phd.getFilename()+" to original DB failed.";
-            return bRet;
-        }
         // ORIGINAL.gards_sample_description 数据表
-        bRet = sampleDescriptionSpectrumService.saveSampleDescriptionGamma(phd, sampleId);
+        sampleDescriptionSpectrumService.saveSampleDescriptionGamma(phd, sampleId);
-        if (!bRet) {
-            String Warning = "Save "+phd.getFilename()+" to original DB failed.";
-            return bRet;
-        }
         // ORIGINAL.GARDS_SAMPLE_CERT 和 ORIGINAL.GARDS_SAMPLE_CERT_LINE 数据表
         if(phd.getCertificate().getRecord_count() > 0) {
-            bRet = sampleCertSpectrumService.saveSampleCertGamma(phd, sampleId);
+            sampleCertSpectrumService.saveSampleCertGamma(phd, sampleId);
-            if (!bRet) {
+            sampleCertLineSpectrumService.saveSampleCertLineGamma(phd, sampleId);
-                String Warning = "Save "+phd.getFilename()+" to original DB failed.";
-                return bRet;
-            }
-            bRet = sampleCertLineSpectrumService.saveSampleCertLineGamma(phd, sampleId);
-            if (!bRet) {
-                String Warning = "Save "+phd.getFilename()+" to original DB failed.";
-                return bRet;
-            }
         }
         //gards_ calibration_pairs_orig数据表
-        bRet = calibrationPairsOrigSpectrumService.saveCalibrationPairsOrigGamma(phd, sampleId);
+        calibrationPairsOrigSpectrumService.saveCalibrationPairsOrigGamma(phd, sampleId);
-        if (!bRet) {
-            String Warning = "Save "+phd.getFilename()+" to original DB failed.";
-            return bRet;
-        }
         // gards_total_efficiency _pairs数据表(IDC没有)
-        bRet = totalEfficiencyPairsSpectrumService.saveTotalEfficiencyPairsGamma(phd, sampleId);
+        totalEfficiencyPairsSpectrumService.saveTotalEfficiencyPairsGamma(phd, sampleId);
-        if (!bRet) {
-            String Warning = "Save "+phd.getFilename()+" to original DB failed.";
-            return bRet;
-        }
         //gards_spectrum数据表
-        bRet = spectrumService.saveSpectrumGamma(phd, sampleId, input_file_name);
+        spectrumService.saveSpectrumGamma(phd, sampleId, input_file_name);
-        if(bRet) {
+        //根据文件名称获取sample基础数据信息
         GardsSampleDataSpectrum samplData = spectrumAnalysisMapper.findSampleByFilePath(input_file_name);
         if(Objects.nonNull(samplData)) {
             phd.setId_sample(samplData.getSampleId().toString());
             phd.setStatus(samplData.getStatus());
         }
-        } else {
-            String Warning = "Save "+phd.getFilename()+" to original DB failed.";
-        }
-        return bRet;
     }
 
 

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationPairsOrigSpectrumServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 
 @Service("gardsCalibrationPairsOrigSpectrumService")
 @DS("ora")
@@ -109,9 +110,9 @@ public class GardsCalibrationPairsOrigSpectrumServiceImpl extends ServiceImpl<Ga
 
     @Override
     @Transactional
-    public boolean saveCalibrationPairsOrigGamma(PHDFile phd, Integer sampleId) {
+    public Integer saveCalibrationPairsOrigGamma(PHDFile phd, Integer sampleId) {
-        boolean bRet = false;
         List<GardsCalibrationPairsOrig> calibrationPairsOrigList = new LinkedList<>();
+        if (Objects.nonNull(phd.getMapEnerKD().get(CalName.CalPHD.getType()).getG_energy())) {
             int t_size = phd.getMapEnerKD().get(CalName.CalPHD.getType()).getG_energy().size();
             if(t_size > 0) {
                 GEnergyBlock g_ener = phd.getMapEnerKD().get(CalName.CalPHD.getType());
@@ -128,7 +129,9 @@ public class GardsCalibrationPairsOrigSpectrumServiceImpl extends ServiceImpl<Ga
                     calibrationPairsOrigList.add(calibrationPairsOrig);
                 }
             }
-        t_size = phd.getMapResoKD().get(CalName.CalPHD.getType()).getG_energy().size();
+        }
+        if (Objects.nonNull(phd.getMapResoKD().get(CalName.CalPHD.getType()).getG_energy())) {
+            int t_size = phd.getMapResoKD().get(CalName.CalPHD.getType()).getG_energy().size();
             if(t_size > 0) {
                 GResolutionBlock g_reso = phd.getMapResoKD().get(CalName.CalPHD.getType());
                 for (int i=0; i<t_size; i++) {
@@ -144,7 +147,9 @@ public class GardsCalibrationPairsOrigSpectrumServiceImpl extends ServiceImpl<Ga
                     calibrationPairsOrigList.add(calibrationPairsOrig);
                 }
             }
-        t_size = phd.getMapEffiKD().get(CalName.CalPHD.getType()).getG_energy().size();
+        }
+        if (Objects.nonNull(phd.getMapEffiKD().get(CalName.CalPHD.getType()).getG_energy())) {
+            int t_size = phd.getMapEffiKD().get(CalName.CalPHD.getType()).getG_energy().size();
             if(t_size > 0) {
                 GEfficiencyBlock g_effi = phd.getMapEffiKD().get(CalName.CalPHD.getType());
                 for (int i=0; i<t_size; i++){
@@ -160,10 +165,11 @@ public class GardsCalibrationPairsOrigSpectrumServiceImpl extends ServiceImpl<Ga
                     calibrationPairsOrigList.add(calibrationPairsOrig);
                 }
             }
-        if (CollectionUtils.isNotEmpty(calibrationPairsOrigList)) {
-            bRet = this.saveBatch(calibrationPairsOrigList);
         }
-        return bRet;
+        if (CollectionUtils.isNotEmpty(calibrationPairsOrigList)) {
+            this.saveBatch(calibrationPairsOrigList);
+        }
+        return calibrationPairsOrigList.size();
     }
 
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleAuxSpectrumServiceImpl.java

@@ -88,8 +88,7 @@ public class GardsSampleAuxSpectrumServiceImpl extends ServiceImpl<GardsSampleAu
 
     @Override
     @Transactional
-    public boolean saveSampleAuxGamma(PHDFile phd, Integer sampleId) {
+    public Integer saveSampleAuxGamma(PHDFile phd, Integer sampleId) {
-        boolean bRet = false;
         GardsSampleAux sampleAux = new GardsSampleAux();
         String calibTime = "";
         if(StringUtils.isNotBlank(phd.getCalibration().getDate_calibration())) {
@@ -114,9 +113,6 @@ public class GardsSampleAuxSpectrumServiceImpl extends ServiceImpl<GardsSampleAu
             throw new RuntimeException(e);
         }
         int insert = this.baseMapper.insert(sampleAux);
-        if (insert>0) {
+        return insert;
-            bRet = true;
-        }
-        return bRet;
     }
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleCertLineSpectrumServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 
 @Service("gardsSampleCertLineSpectrumService")
 @DS("ora")
@@ -45,9 +46,9 @@ public class GardsSampleCertLineSpectrumServiceImpl extends ServiceImpl<GardsSam
 
     @Override
     @Transactional
-    public boolean saveSampleCertLineGamma(PHDFile phd, Integer sampleId) {
+    public Integer saveSampleCertLineGamma(PHDFile phd, Integer sampleId) {
-        boolean bRet = false;
         List<GardsSampleCertLine> sampleCertLineList = new LinkedList<>();
+        if (Objects.nonNull(phd.getCertificate())) {
             for (int i=0; i<phd.getCertificate().getRecord_count(); i++) {
                 GardsSampleCertLine sampleCertLine = new GardsSampleCertLine();
                 sampleCertLine.setSampleId(sampleId);
@@ -64,9 +65,10 @@ public class GardsSampleCertLineSpectrumServiceImpl extends ServiceImpl<GardsSam
                 sampleCertLineList.add(sampleCertLine);
             }
             if (CollectionUtils.isNotEmpty(sampleCertLineList)) {
-            bRet = this.saveBatch(sampleCertLineList);
+                this.saveBatch(sampleCertLineList);
             }
-        return bRet;
+        }
+        return sampleCertLineList.size();
     }
 
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleCertSpectrumServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.ParseException;
+import java.util.Objects;
 
 @Service("gardsSampleCertSpectrumService")
 @DS("ora")
@@ -35,8 +36,9 @@ public class GardsSampleCertSpectrumServiceImpl extends ServiceImpl<GardsSampleC
 
     @Override
     @Transactional
-    public boolean saveSampleCertGamma(PHDFile phd, Integer sampleId) {
+    public Integer saveSampleCertGamma(PHDFile phd, Integer sampleId) {
-        boolean bRet = false;
+        int insert = 0;
+        if (Objects.nonNull(phd.getCertificate())) {
             String assay_date = phd.getCertificate().getAssay_date() + " " + phd.getCertificate().getAssay_time();
             try {
                 GardsSampleCert sampleCert = new GardsSampleCert();
@@ -44,14 +46,12 @@ public class GardsSampleCertSpectrumServiceImpl extends ServiceImpl<GardsSampleC
                 sampleCert.setQuantity(phd.getCertificate().getTotal_source_activity());
                 sampleCert.setAssayDate(DateUtils.parseDate(assay_date));
                 sampleCert.setUnit(phd.getCertificate().getUnits_activity());
-            int insert = this.baseMapper.insert(sampleCert);
+                insert = this.baseMapper.insert(sampleCert);
-            if (insert>0) {
-                bRet = true;
-            }
             } catch (ParseException e) {
                 throw new RuntimeException(e);
             }
-        return bRet;
+        }
+        return insert;
     }
 
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataSpectrumServiceImpl.java

@@ -96,8 +96,7 @@ public class GardsSampleDataSpectrumServiceImpl extends ServiceImpl<GardsSampleD
 
     @Override
     @Transactional
-    public boolean saveSampleDataGamma(PHDFile phd, String input_file_name, Integer station_id, Integer detect_id) {
+    public Integer saveSampleDataGamma(PHDFile phd, String input_file_name, Integer station_id, Integer detect_id) {
-        boolean bRet = false;
         // ORIGINAL.GARDS_SAMPLE_DATA 表数据
         String status = "U";
         String transmit_dtg = phd.getHeader().getTransmit_date()+" "+phd.getHeader().getTransmit_time();
@@ -137,10 +136,7 @@ public class GardsSampleDataSpectrumServiceImpl extends ServiceImpl<GardsSampleD
             throw new RuntimeException(e);
         }
         int insert = this.baseMapper.insert(sampleData);
-        if (insert > 0) {
+        return insert;
-            bRet = true;
-        }
-        return bRet;
     }
 
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSpectrumSpectrumServiceImpl.java

@@ -55,8 +55,8 @@ public class GardsSpectrumSpectrumServiceImpl extends ServiceImpl<GardsSpectrumS
 
     @Override
     @Transactional
-    public boolean saveSpectrumGamma(PHDFile phd, Integer sampleId, String input_file_name) {
+    public Integer saveSpectrumGamma(PHDFile phd, Integer sampleId, String input_file_name) {
-        boolean bRet = false;
+        int insert = 0;
         int t_size = (int) phd.getSpec().getNum_g_channel();
         if(t_size > 0) {
             GSpectrumBlock g_spec = phd.getSpec();
@@ -67,12 +67,9 @@ public class GardsSpectrumSpectrumServiceImpl extends ServiceImpl<GardsSpectrumS
             spectrum.setChannels((int) g_spec.getNum_g_channel());
             spectrum.setEnergySpan((int) g_spec.getG_energy_span());
             spectrum.setStartChannel((int) g_spec.getBegin_channel());
-            int insert = this.baseMapper.insert(spectrum);
+            insert = this.baseMapper.insert(spectrum);
-            if (insert>0) {
-                bRet = true;
         }
-        }
+        return insert;
-        return bRet;
     }
 
 }

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsTotalEfficiencyPairsSpectrumServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 
 @Service("gardsTotalEfficiencyPairsSpectrumService")
 @DS("ora")
@@ -40,10 +41,9 @@ public class GardsTotalEfficiencyPairsSpectrumServiceImpl extends ServiceImpl<Ga
 
     @Override
     @Transactional
-    public boolean saveTotalEfficiencyPairsGamma(PHDFile phd, Integer sampleId) {
+    public Integer saveTotalEfficiencyPairsGamma(PHDFile phd, Integer sampleId) {
-        boolean bRet = false;
         List<GardsTotalEfficiencyPairs> totalEfficiencyPairsList = new LinkedList<>();
-        int t_size = phd.getMapTotEKD().get(CalName.CalPHD.getType()).getG_energy().size();
+        int t_size = Objects.nonNull(phd.getMapTotEKD().get(CalName.CalPHD.getType()).getG_energy())?phd.getMapTotEKD().get(CalName.CalPHD.getType()).getG_energy().size():0;
         if(t_size > 0) {
             TotaleffBlock g_tote = phd.getMapTotEKD().get(CalName.CalPHD.getType());
             for (int i=0; i<t_size; i++){
@@ -58,7 +58,7 @@ public class GardsTotalEfficiencyPairsSpectrumServiceImpl extends ServiceImpl<Ga
         if (CollectionUtils.isNotEmpty(totalEfficiencyPairsList)) {
             this.saveBatch(totalEfficiencyPairsList);
         }
-        return bRet;
+        return totalEfficiencyPairsList.size();
     }
 
 }