xiaoguangbin
|
8cac8a6099
|
feat：完善新beta savetodb接口
|
2024-08-01 17:34:33 +08:00 |
|
nieziyan
|
b48cf5a991
|
feat：自建台站loadFromDB
|
2024-07-31 18:23:32 +08:00 |
|
nieziyan
|
bc74b2e32e
|
feat：自建台站SaveToDB
|
2024-07-29 19:30:17 +08:00 |
|
nieziyan
|
01ea4f8c63
|
feat：自建台站交互分析
|
2024-07-26 19:15:46 +08:00 |
|
nieziyan
|
2e0814fa14
|
feat：自建台站自动处理分析结果存库
|
2024-07-25 14:28:50 +08:00 |
|
nieziyan
|
95116338ad
|
feat：自建台站谱解析类
|
2024-07-22 19:09:04 +08:00 |
|
nieziyan
|
108f2db587
|
feat：自建台站AUX表增加GPS信息
|
2024-07-19 16:11:10 +08:00 |
|
nieziyan
|
5849612a3b
|
feat：bgSpectrum数据
|
2024-07-18 19:43:26 +08:00 |
|
xiaoguangbin
|
3d97ffb539
|
fix：增加interactive弹窗内的接口
|
2024-07-18 18:45:05 +08:00 |
|
xiaoguangbin
|
5b94121112
|
fix：
|
2024-07-17 10:31:58 +08:00 |
|
xiaoguangbin
|
277485ddda
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
# Conflicts:
# jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java
|
2024-07-16 14:35:57 +08:00 |
|
xiaoguangbin
|
f4b05e2da1
|
fix：修改ftp切换的目录
|
2024-07-16 11:55:10 +08:00 |
|
nieziyan
|
3f22b0edba
|
fix：Bugs
|
2024-07-08 10:03:25 +08:00 |
|
xiaoguangbin
|
ebdf8d863a
|
fix：增加海水系统和自建台站beta的系统类型
|
2024-06-26 15:42:08 +08:00 |
|
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 |
|
xiaoguangbin
|
f6b963145f
|
fix:增加catch中exception写入log日志
|
2024-06-25 11:03:09 +08:00 |
|
nieziyan
|
64a98bd4ea
|
fix：邮件接收超时时间
|
2024-06-12 15:33:23 +08:00 |
|
nieziyan
|
3d5080c1d8
|
fix：AutoProcess多线程问题
|
2024-06-05 09:42:20 +08:00 |
|
nieziyan
|
97f4aae3ab
|
fix：自动处理debug
|
2024-06-04 09:23:21 +08:00 |
|
orgin
|
9151233f11
|
连接超时之后不中断线程
|
2024-05-30 16:48:46 +08:00 |
|
qiaoqinzheng
|
72dbf2ba80
|
自动处理程序修改逻辑
|
2024-05-09 09:34:21 +08:00 |
|
qiaoqinzheng
|
600c5235ec
|
自建台站分支同步代码
|
2024-04-30 11:51:54 +08:00 |
|
qiaoqinzheng
|
f62158a721
|
onlyDownload修改邮箱处理程序频繁增加线程问题
onlyDownload修改文件下载部分长期堵塞问题
|
2024-04-26 10:31:59 +08:00 |
|
qiaoqinzheng
|
df16ed12a8
|
上传测试代码到新的分支onlyDownload，测试下载邮件问题
|
2024-04-24 16:45:49 +08:00 |
|
qiaoqinzheng
|
b0529f0f3d
|
同步mdc代码
|
2024-04-19 16:53:17 +08:00 |
|
qiaoqinzheng
|
01122e6daa
|
同步代码
|
2024-04-19 16:08:45 +08:00 |
|
qiaoqinzheng
|
85987985a1
|
邮箱下载邮件部分增加锁取消异步下载执行，增加关闭输出流
|
2024-04-19 14:14:51 +08:00 |
|
qiaoqinzheng
|
a38a242e03
|
同步代码
|
2024-04-18 15:09:54 +08:00 |
|
nieziyan
|
14e64306b2
|
Merge remote-tracking branch 'origin/SelfStation' into SelfStation
|
2024-04-10 19:10:14 +08:00 |
|
nieziyan
|
0c8019ad15
|
feat：修改是否对文件内容解码逻辑
|
2024-04-10 19:09:32 +08:00 |
|
qiaoqinzheng
|
fc4623e584
|
自动处理模块GPS谱流程代码修改
|
2024-04-10 11:31:27 +08:00 |
|
nieziyan
|
eedcd67113
|
feat：报警编码内容替换
|
2024-04-09 18:19:37 +08:00 |
|
nieziyan
|
4c16d4527d
|
feat：报警编码信息管理
|
2024-04-08 18:35:24 +08:00 |
|
nieziyan
|
2d840bcd8b
|
feat：解码Base64邮件内容保存为可处理.eml文件
|
2024-04-03 16:46:34 +08:00 |
|
nieziyan
|
89075bef6d
|
feat：1.日志管理模块FTP服务替换为本地文件服务2.日志文件列表增加分页
|
2024-03-21 18:08:11 +08:00 |
|
qiaoqinzheng
|
bde5eed237
|
同步mdc分支代码
|
2024-03-21 10:28:04 +08:00 |
|
qiaoqinzheng
|
29821e708d
|
人工交互模块保存文件代码修改
|
2024-03-15 11:12:57 +08:00 |
|
qiaoqinzheng
|
bc2b3ca4f2
|
人工交互模块ftp服务上传文件方法修改
人工交互保存数据库方法保存文件修改
|
2024-03-13 16:37:48 +08:00 |
|
qiaoqinzheng
|
ec24147e3f
|
人工交互模块修改不使用ftp服务上传，下载远程服务文件，改为本地上传，下载文件
|
2024-03-13 15:37:26 +08:00 |
|
qiaoqinzheng
|
3f4e184c82
|
人工交互模块gamma算法崩溃问题修改，新增字段判断分析是否异常结束，并接收分析异常信息
|
2024-03-07 16:37:40 +08:00 |
|
qiaoqinzheng
|
6abe41c743
|
人工交互模块gamma部分删除核素因为删除其他主峰导致删除的非主峰核素重新计算活度浓度问题修改
人工交互模块gamma部分缓存实体类新增加字段缓存核素信息
人工交互模块gamma部分初始化方法修改
|
2024-03-07 11:21:26 +08:00 |
|
qiaoqinzheng
|
0b0856f687
|
台站实体类增加字段category判断台站类型
台站运行管理查询台站信息时，台站类型增加根据category字段判断是否是自建台站车/船
关注台站列表存储，查询时调用台站类型查询方法修改
|
2024-03-06 15:01:56 +08:00 |
|
nieziyan
|
6ac9576cb1
|
feat：核素浓度均值台站类型过滤
|
2024-03-05 18:26:02 +08:00 |
|
qiaoqinzheng
|
28baa48257
|
web模块同步自建台站分支的查询核素统计结果内容相关方法
|
2024-03-04 08:59:59 +08:00 |
|
nieziyan
|
18722cfe78
|
feat：1.增加表空间监控2.bug修复
|
2024-03-01 18:27:15 +08:00 |
|
qiaoqinzheng
|
1c34f3dde1
|
app端代码同步
|
2024-02-29 10:50:41 +08:00 |
|
nieziyan
|
8ad0d9db38
|
feat：台站/GPS
|
2024-02-27 19:26:52 +08:00 |
|
xiaoguangbin
|
311439e94d
|
fix: 增加日志信息，记录获取邮件主题失败问题
|
2024-02-26 11:59:10 +08:00 |
|
panbaolin
|
5cfa3e62d3
|
fix:1.重构AutoManager解决停止邮件服务后，主线程及线程池不能真正停止问题2.修改启用关闭邮件，邮件数据检测线程没有正确响应问题3.解决邮件一直下载重复下载问题
|
2024-02-24 22:50:19 +08:00 |
|
qiaoqinzheng
|
abe1d6dfb3
|
自动处理模块会删除邮件问题
|
2024-02-23 20:09:20 +08:00 |
|