Merge remote-tracking branch 'origin/station' into station

jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java

@@ -253,30 +253,32 @@ public class GammaFileUtil extends AbstractLogOrReport {
                 String lcFileName = prefixName+"_"+subFileName + ".lc";
                 String fromPathLc = pathName + StringPool.SLASH + lcFileName;
                 lcFile = ftpUtil.downloadFile(fromPathLc, "betaGamma");
-
+                if (Objects.nonNull(lcFile)) {
                     List<String> readLinesLc = FileUtils.readLines(lcFile, "UTF-8");
                     //得到行数据处理后的数据结果
                     List<Double> vDataLc = ReadLcScacInfo(readLinesLc);
                     //将数据结果赋值给 phdFile的vLc
                     phd.setVLc(vDataLc);
-
+                }
                 String scacFileName = prefixName+"_"+subFileName + ".scac";
                 String fromPathScac = pathName + StringPool.SLASH + scacFileName;
                 scacFile = ftpUtil.downloadFile(fromPathScac, "betaGamma");
-
+                if (Objects.nonNull(scacFile)) {
                     List<String> readLinesScac = FileUtils.readLines(scacFile, "UTF-8");
                     //得到行数据处理后的数据结果
                     List<Double> vDataScac = ReadLcScacInfo(readLinesScac);
                     //将数据结果赋值给 phdFile的vLc
                     phd.setVScac(vDataScac);
-
+                }
                 String baselineFileName = prefixName+"_"+subFileName + ".baseline";
                 String fromPathBase = pathName + StringPool.SLASH + baselineFileName;
                 inputStreamBase = ftpUtil.downloadFileStream(fromPathBase);
+                if (Objects.nonNull(inputStreamBase)) {
                     // 调用处理BaseCtrl的方法
                     ReadBaseCtrlInfo(phd, inputStreamBase);
                     // 将phdFile的BaseCtrls的BaseLine部分数据  赋值给 phdFile的vBase
                     phd.setVBase(phd.getBaseCtrls().getBaseline());
+                }
             }catch (IOException e){
                 e.printStackTrace();
             } finally {

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

@@ -24,12 +24,6 @@ public class GammaController {
     @Autowired
     private IGammaService gammaService;
 
-    @Autowired
-    private RedisTemplate<String, Object> redisTemplate;
-
-    @Autowired
-    private SystemClient systemClient;
-
     @GetMapping("initValue")
     @ApiOperation(value = "初始化gamma数据", notes = "初始化gamma数据")
     public Result initValue(Integer sampleId, String dbName, String analyst, String fileName, HttpServletRequest request) {
@@ -83,8 +77,8 @@ public class GammaController {
 
     @PostMapping("Reprocessing")
     @ApiOperation(value = "analyze菜单下Reprocessing页面数据", notes = "analyze菜单下Reprocessing页面数据")
-    public Result Reprocessing(String fileName, HttpServletRequest request) {
+    public Result Reprocessing(String fileName, String processKey, HttpServletRequest request) {
-        return gammaService.Reprocessing(fileName, request);
+        return gammaService.Reprocessing(fileName, processKey, request);
     }
 
     @GetMapping("InteractiveTool")

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

@@ -24,6 +24,12 @@ public class SpectrumAnalysesController {
     @Autowired
     private ISpectrumAnalysisService spectrumAnalysisService;
 
+    @GetMapping("initValue")
+    @ApiOperation(value = "初始化数据", notes = "初始化数据")
+    public Result initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request) {
+        return spectrumAnalysisService.initValue(dbName, sampleId, analyst, sampleFileName, gasFileName, detFileName, qcFileName, request);
+    }
+
     @GetMapping("getDBSearchList")
     @ApiOperation(value = "查询查询条件数据接口", notes = "查询查询条件数据接口")
     public Result getDBSearchList(HttpServletRequest request, boolean AllUsers) {

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java

@@ -34,6 +34,9 @@ public class GardsSampleDataSpectrum extends GardsSampleData {
     @TableField(exist = false)
     private String analyst;
 
+    @TableField(exist = false)
+    private Integer analysitId;
+
     @TableField(exist = false)
     @Excel(name = "NO" ,orderNum = "1")
     private Integer no;

jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml

@@ -42,6 +42,7 @@
                c.acquisition_start acquisitionStart,
                c.acquisition_real_sec acquisitionRealSec,
                c.acquisition_live_sec acquisitionLiveSec,
+               d.IDANALYSIS analysitId,
                d.analyst analyst,
                c.status status,
                c.input_file_name inputFileName

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

@@ -30,7 +30,7 @@ public interface IGammaService{
 
     Result configureSave(ConfigureData configureData, HttpServletRequest request);
 
-    Result Reprocessing(String fileName, HttpServletRequest request);
+    Result Reprocessing(String fileName, String processKey, HttpServletRequest request);
 
     Result InteractiveTool(Integer sampleId, String fileName, HttpServletRequest request);
 

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

@@ -14,6 +14,8 @@ import java.util.List;
 
 public interface ISpectrumAnalysisService {
 
+    Result initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request);
+
     Result getDBSearchList(HttpServletRequest request, boolean AllUsers);
 
     Result getDBSpectrumList(QueryRequest queryRequest, GardsSampleDataSpectrum gardsSampleData, String dbName, String[] menuTypes, boolean AllUsers, boolean CollectStopB, boolean AcqStartB, Date startDate, Date endDate, HttpServletRequest request);

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

@@ -1024,7 +1024,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
     }
 
     @Override
-    public Result Reprocessing(String fileName, HttpServletRequest request) {
+    public Result Reprocessing(String fileName, String processKey, HttpServletRequest request) {
         Result result = new Result();
         String userName = JwtUtil.getUserNameByToken(request);
         Cache<String, PHDFile> phdCache = localCache.getPHDCache();
@@ -1033,9 +1033,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
             result.error500("Please select the parse file first！");
             return result;
         }
-        // 获取当前用户信息
+        phd.setUserId(processKey);
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        phd.setUserId(sysUser.getId());
         // 赋值xml文件存放路径
         phd.setXmlFilePath(parameterProperties.getFilePath());
         // 获取当前角色的颜色配置

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

@@ -110,6 +110,14 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
     private IGardsHistogramSpectrumService histogramService;
 
 
+    @Override
+    public Result initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request) {
+        if (StringUtils.isNotBlank(dbName) && Objects.nonNull(sampleId)) {
+            return getDBSpectrumChart(dbName, sampleId, analyst, request);
+        } else {
+            return getFileSpectrumChart(sampleFileName, gasFileName, detFileName, qcFileName, request);
+        }
+    }
 
     @Override
     public Result getDBSearchList(HttpServletRequest request, boolean AllUsers) {
@@ -342,24 +350,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
         if (dbName.equalsIgnoreCase("auto")){
             dbName = "RNAUTO";
             analysisID = spectrumAnalysisMapper.getAnalysisID(dbName, sampleId, "RNAUTO");
-            xeResultsSpectrumList = spectrumAnalysisMapper.ReadXeResults(dbName, analysisID, sampleId);
-            gammaCalibrationSpectrumList = spectrumAnalysisMapper.ReadGammaCalibrationParam("RNAUTO", analysisID);
-            betaCalibrationSpectrumList = spectrumAnalysisMapper.ReadBetaCalibrationParam("RNAUTO", analysisID);
-            roiChannelsSpectrumList = spectrumAnalysisMapper.ReadROIChannels("RNAUTO", analysisID, sampleId);
-            roiResultsSpectrumList = spectrumAnalysisMapper.ReadROIResults("RNAUTO", analysisID, sampleId);
         } else if (dbName.equalsIgnoreCase("man")){
             dbName = "RNMAN";
             analysisID = spectrumAnalysisMapper.getAnalysisID(dbName, sampleId, analyst);
-            gammaCalibrationPairsList = spectrumAnalysisMapper.ReadGammaFitChannelEnergy(analysisID, sampleId);
-            betaCalibrationPairsList = spectrumAnalysisMapper.ReadBetaFitChannelEnergy(analysisID, sampleId);
-            xeResultsSpectrumList = spectrumAnalysisMapper.ReadXeResults(dbName, analysisID, sampleId);
-            gammaCalibrationSpectrumList = spectrumAnalysisMapper.ReadGammaCalibrationParam("RNMAN", analysisID);
-            betaCalibrationSpectrumList = spectrumAnalysisMapper.ReadBetaCalibrationParam("RNMAN", analysisID);
-            roiChannelsSpectrumList = spectrumAnalysisMapper.ReadROIChannels("RNMAN", analysisID, sampleId);
-            roiResultsSpectrumList = spectrumAnalysisMapper.ReadROIResults("RNMAN", analysisID, sampleId);
-        }else {
-            result.error500("The database type does not exist");
-            return result;
         }
         File sampleTmp = null;
         File gasTmp = null;
@@ -411,6 +404,21 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                 //如果缓存中没有公用变量的数据
                 if (Objects.isNull(betaDataFile)) {
                     betaDataFile = new BetaDataFile();
+                    if (dbName.equalsIgnoreCase("RNAUTO")) {
+                        xeResultsSpectrumList = spectrumAnalysisMapper.ReadXeResults(dbName, analysisID, sampleId);
+                        gammaCalibrationSpectrumList = spectrumAnalysisMapper.ReadGammaCalibrationParam("RNAUTO", analysisID);
+                        betaCalibrationSpectrumList = spectrumAnalysisMapper.ReadBetaCalibrationParam("RNAUTO", analysisID);
+                        roiChannelsSpectrumList = spectrumAnalysisMapper.ReadROIChannels("RNAUTO", analysisID, sampleId);
+                        roiResultsSpectrumList = spectrumAnalysisMapper.ReadROIResults("RNAUTO", analysisID, sampleId);
+                    } else {
+                        gammaCalibrationPairsList = spectrumAnalysisMapper.ReadGammaFitChannelEnergy(analysisID, sampleId);
+                        betaCalibrationPairsList = spectrumAnalysisMapper.ReadBetaFitChannelEnergy(analysisID, sampleId);
+                        xeResultsSpectrumList = spectrumAnalysisMapper.ReadXeResults(dbName, analysisID, sampleId);
+                        gammaCalibrationSpectrumList = spectrumAnalysisMapper.ReadGammaCalibrationParam("RNMAN", analysisID);
+                        betaCalibrationSpectrumList = spectrumAnalysisMapper.ReadBetaCalibrationParam("RNMAN", analysisID);
+                        roiChannelsSpectrumList = spectrumAnalysisMapper.ReadROIChannels("RNMAN", analysisID, sampleId);
+                        roiResultsSpectrumList = spectrumAnalysisMapper.ReadROIResults("RNMAN", analysisID, sampleId);
+                    }
                     //给公用变量赋值sampleId
                     betaDataFile.setSampleId(String.valueOf(sampleId));
                     //用于记录文件路径信息