xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:1.修改日志路径保存时不包含log前缀

Browse Source
This commit is contained in:
panbaolin 2023-09-27 10:38:02 +08:00
parent 59cc54cf24
commit 4faf2c198c
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java
View File

@ -214,8 +214,8 @@ public class Sample_B_Analysis implements BlockConstant {
this.arrFilePath = ftpPath.toString(); this.arrFilePath = ftpPath.toString();
String arrFileTail = ARR_FILE_NAME_TAIL+ARR_FILE_SUFFIX; String arrFileTail = ARR_FILE_NAME_TAIL+ARR_FILE_SUFFIX;
this.arrFileName = this.phdFileName.replace(DataType.SAMPLEPHD.getSuffix(),arrFileTail); this.arrFileName = this.phdFileName.replace(DataType.SAMPLEPHD.getSuffix(),arrFileTail);
//构造日志文件路径 //构造日志文件路径，不包括log前缀
this.logFilePath = properties.getLogPath()+StringConstant.SLASH+this.ftpSavePath; this.logFilePath = this.ftpSavePath;
this.logFileName = this.phdFileName.replace(DataType.SAMPLEPHD.getSuffix(),SpectrumHandler.LOG_FILE_SUFFIX); this.logFileName = this.phdFileName.replace(DataType.SAMPLEPHD.getSuffix(),SpectrumHandler.LOG_FILE_SUFFIX);
} }
@ -223,10 +223,6 @@ public class Sample_B_Analysis implements BlockConstant {
* 调用dll库的分析B谱结果 * 调用dll库的分析B谱结果
*/ */
private void autoAnalyse() throws BAnalyseException, FileNotExistException { private void autoAnalyse() throws BAnalyseException, FileNotExistException {
System.out.println("sam:"+this.sampleTempFilePath);
System.out.println("gas:"+this.gasTempFilePath);
System.out.println("det:"+this.detTempFilePath);
BgAnalyseResult analyseResult = EnergySpectrumHandler.bgAnalyse(this.sampleTempFilePath,this.gasTempFilePath,this.detTempFilePath); BgAnalyseResult analyseResult = EnergySpectrumHandler.bgAnalyse(this.sampleTempFilePath,this.gasTempFilePath,this.detTempFilePath);
System.out.println(analyseResult); System.out.println(analyseResult);
if(Objects.isNull(analyseResult) || !analyseResult.analyse_flag){ if(Objects.isNull(analyseResult) || !analyseResult.analyse_flag){

7
jeecg-server-cloud/jeecg-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java
View File

@ -60,11 +60,8 @@ public class JeecgAutoProcessApplication extends SpringBootServletInitializer im
public void run(String... args) throws Exception { public void run(String... args) throws Exception {
//调用dll //调用dll
System.loadLibrary("ReadPHDFile"); System.loadLibrary("ReadPHDFile");
//根据配置文件配置邮件获取策略定义时间条件 //根据配置文件配置邮件获取策略定义时间条件，默认EmailReceivePolicy.HISTORY_ORDER_RECEIVE.getPolicy()
Date systemStartupTime = null; Date systemStartupTime = DateUtils.parseDate("1970-01-01 00:00:00","yyyy-MM-dd HH:mm:ss");
if(EmailReceivePolicy.HISTORY_ORDER_RECEIVE.getPolicy().equals(taskProperties.getReceivePolicy())){
systemStartupTime = DateUtils.parseDate("1970-01-01 00:00:00","yyyy-MM-dd HH:mm:ss");
}
if(EmailReceivePolicy.CURR_DATE_ORDER_RECEIVE.getPolicy().equals(taskProperties.getReceivePolicy())){ if(EmailReceivePolicy.CURR_DATE_ORDER_RECEIVE.getPolicy().equals(taskProperties.getReceivePolicy())){
systemStartupTime = new Date(); systemStartupTime = new Date();
} }