From 810cc2173268cafbaf9b9e972824ad040f425100 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Mon, 27 Nov 2023 19:16:20 +0800 Subject: [PATCH] =?UTF-8?q?gamma=E5=90=91=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92=E5=88=86?= =?UTF-8?q?=E6=9E=90=E7=BB=93=E6=9E=9C=E6=97=B624=E5=B0=8F=E6=97=B6?= =?UTF-8?q?=E5=88=B6=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=20=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=A4=84=E7=90=86console=E6=96=87=E4=BB=B6=E6=A0=87?= =?UTF-8?q?=E8=AF=86=E5=A2=9E=E5=8A=A0=20=E8=87=AA=E5=8A=A8=E5=A4=84?= =?UTF-8?q?=E7=90=86=E7=A8=8B=E5=BA=8Fbeta=E9=83=A8=E5=88=86det=EF=BC=8Cga?= =?UTF-8?q?s=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84=E5=A4=9A\=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=97=A0=E6=B3=95=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20beta=EF=BC=8Cgamma=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=97=B6=E5=8F=B0=E7=AB=99=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=9D=83=E9=99=90=E6=97=B6=EF=BC=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=93=AA=E4=B8=AA=E5=8F=B0=E7=AB=99=E6=B2=A1=E6=9C=89=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/modules/spectrum/Sample_B_Analysis.java | 4 ++-- .../org/jeecg/modules/mapper/xml/GardsAnalysesManMapper.xml | 4 ++-- .../java/org/jeecg/modules/service/impl/GammaServiceImpl.java | 2 +- .../modules/service/impl/SpectrumAnalysisServiceImpl.java | 2 +- .../src/main/resources/logback-spring.xml | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) 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 @@ +