xiaoguangbin 80985a74d7 Merge remote-tracking branch 'refs/remotes/origin/SelfStation' into noFtp-seflStation ... # Conflicts: # jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DictConstant.java # jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java # jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/CalculateConcController.java # jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/redisStream/AnalysisConsumer.java # jeecg-module-auto-process/src/main/java/org/jeecg/modules/AutoProcessManager.java # jeecg-module-auto-process/src/main/java/org/jeecg/modules/EmailParsingActuator.java # jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractSpectrumHandler.java # jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumParsingActuator.java # jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java # jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java # jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java # jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java # jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java # jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java		2024-06-26 10:43:45 +08:00
..
config	fix:1.完成各能谱原始库数据存储、原始eml邮件存储、能谱文件存储、邮件日志存储	2023-08-18 11:10:19 +08:00
datasource	fix:1.优化ftp工具结构，每个线程内只打开一次ftp，使用完毕关闭ftp	2023-08-27 14:22:20 +08:00
email	自动处理模块自动处理程序管理类增加邮箱更新数据相关逻辑代码	2024-01-02 18:00:29 +08:00
eneity	fix:1.添加能谱错误事件类型	2024-01-02 15:24:33 +08:00
enums	同步mdc	2024-01-23 15:03:21 +08:00
exception	自动处理模块GPS谱流程代码修改	2024-04-10 12:40:14 +08:00
file	同步mdc分支代码	2024-03-21 10:28:04 +08:00
mapper	新增加GPS谱数据的内容解析及保存	2024-01-26 10:39:59 +08:00
service	Merge remote-tracking branch 'refs/remotes/origin/SelfStation' into noFtp-seflStation	2024-06-26 10:43:45 +08:00
spectrum	Merge remote-tracking branch 'refs/remotes/origin/SelfStation' into noFtp-seflStation	2024-06-26 10:43:45 +08:00
AutoProcessManager.java	fix:增加catch中exception写入log日志	2024-06-25 11:03:09 +08:00
DelFileManager.java	fix：1.ARR/RRR增加筛选与回显字段2.探测器新增	2024-01-09 20:45:15 +08:00
EmailParsingActuator.java	fix:增加catch中exception写入log日志	2024-06-25 11:03:09 +08:00
ErrorLogManager.java	拼接文件路径，在ftp目录路径及ftp文件夹路径间多拼接路径符号问题修改	2024-01-29 14:21:21 +08:00
FileSourceHandleManager.java	拼接文件路径，在ftp目录路径及ftp文件夹路径间多拼接路径符号问题修改	2024-01-29 14:21:21 +08:00
StatReportManager.java	拼接文件路径，在ftp目录路径及ftp文件夹路径间多拼接路径符号问题修改	2024-01-29 14:21:21 +08:00
UndealHandleManager.java	同步mdc分支代码	2024-03-21 10:28:04 +08:00