diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java index f66669c7..b843c0af 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java @@ -235,7 +235,7 @@ public class Sample_B_Analysis implements BlockConstant { //gas谱PHD文件本地路径 StringBuilder gasFileFinalPath = new StringBuilder(); gasFileFinalPath.append(this.spectrumServiceQuotes.getSpectrumPathProperties().getRootPath()); - gasFileFinalPath.append(File.separator); +// gasFileFinalPath.append(File.separator); gasFileFinalPath.append(this.spectrumServiceQuotes.getSpectrumPathProperties().getSaveFilePath()); gasFileFinalPath.append(File.separator); gasFileFinalPath.append(gasSampleData.getInputFileName()); @@ -248,7 +248,7 @@ public class Sample_B_Analysis implements BlockConstant { //det谱PHD文件本地路径 StringBuilder detFileFinalPath = new StringBuilder(); detFileFinalPath.append(this.spectrumServiceQuotes.getSpectrumPathProperties().getRootPath()); - detFileFinalPath.append(File.separator); +// detFileFinalPath.append(File.separator); detFileFinalPath.append(this.spectrumServiceQuotes.getSpectrumPathProperties().getSaveFilePath()); detFileFinalPath.append(File.separator); detFileFinalPath.append(detSampleData.getInputFileName()); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsAnalysesManMapper.xml b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsAnalysesManMapper.xml index 823aff17..d913861a 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsAnalysesManMapper.xml +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsAnalysesManMapper.xml @@ -5,8 +5,8 @@ UPDATE RNMAN.GARDS_ANALYSES - SET ANALYSISBEGIN = to_date(#{analyses.analysisBeginStr},'yyyy/MM/dd HH:mi:ss'), - ANALYSISEND = to_date(#{analyses.analysisEndStr},'yyyy/MM/dd HH:mi:ss'), + SET ANALYSISBEGIN = to_date(#{analyses.analysisBeginStr},'yyyy/MM/dd HH24:mi:ss'), + ANALYSISEND = to_date(#{analyses.analysisEndStr},'yyyy/MM/dd HH24:mi:ss'), SOFTWARE = #{analyses.software}, SWVERSION = #{analyses.swVersion}, COMMENTS = #{analyses.comments}, 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 00503a48..bbf00720 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 @@ -4495,7 +4495,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi Integer isExist = spectrumAnalysisMapper.SampleIsExist(sysTemSubdir+ dateTypeSubdir + StringPool.SLASH + mSaveFileName, userName); // 如果用户没有权限操作 则查看当前用户是否是高级分析员/管理员 if (!bAnalysisResultWriteAuthority && Objects.isNull(isExist)) { - result.error500("You have no permission to save results to DB!"); + result.error500("You have no permission to save "+phd.getHeader().getSite_code()+" results to DB!"); return result; } // 如果有权限则开始保存数据库操作 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 b7fbf2e8..e9416526 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 @@ -3676,7 +3676,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements Integer isExist = spectrumAnalysisMapper.SampleIsExist(sampleFilePathName, anlyseResultIn.getUserName()); //如果当前分析员在当天没有排班任务 并且 没有历史分析过当前文件 则不允许进行保存操作 if ( !bAnalysisResultWriteAuthority && Objects.isNull(isExist) ){ - result.error500("You have no permission to save results to DB!"); + result.error500("You have no permission to save "+anlyseResultIn.getStationName()+" results to DB!"); return result; } //处理数据 获取对应的channel/energy值 diff --git a/jeecg-server-cloud/armd-auto-process-start/src/main/resources/logback-spring.xml b/jeecg-server-cloud/armd-auto-process-start/src/main/resources/logback-spring.xml index 954d2d99..b2f7241d 100644 --- a/jeecg-server-cloud/armd-auto-process-start/src/main/resources/logback-spring.xml +++ b/jeecg-server-cloud/armd-auto-process-start/src/main/resources/logback-spring.xml @@ -95,6 +95,7 @@ +