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 |
|
nieziyan
|
86968e383b
|
fix：删除多余文件
|
2024-05-13 14:58:41 +08:00 |
|
nieziyan
|
18b495d1d0
|
Merge remote-tracking branch 'origin/noFtp' into noFtp
|
2024-04-25 15:05:45 +08:00 |
|
nieziyan
|
6335a3f588
|
fix：修改FTP为本地文件
|
2024-04-24 09:34:59 +08:00 |
|
qiaoqinzheng
|
b0529f0f3d
|
同步mdc代码
|
2024-04-19 16:53:17 +08:00 |
|
nieziyan
|
d5b18e57b5
|
fix：增加排序
|
2024-04-11 14:51:57 +08:00 |
|
nieziyan
|
0c8019ad15
|
feat：修改是否对文件内容解码逻辑
|
2024-04-10 19:09:32 +08:00 |
|
nieziyan
|
eedcd67113
|
feat：报警编码内容替换
|
2024-04-09 18:19:37 +08:00 |
|
nieziyan
|
4c16d4527d
|
feat：报警编码信息管理
|
2024-04-08 18:35:24 +08:00 |
|
qiaoqinzheng
|
bde5eed237
|
同步mdc分支代码
|
2024-03-21 10:28:04 +08:00 |
|
nieziyan
|
0a00916d19
|
feat：log print
|
2024-03-06 18:01:57 +08:00 |
|
nieziyan
|
16449f5c0e
|
fix：核素浓度计算为null问题
|
2024-03-04 16:44:54 +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
|
cf81fab98a
|
Merge remote-tracking branch 'origin/mdc' into mdc
|
2024-02-26 19:39:07 +08:00 |
|
nieziyan
|
1cb2f68428
|
feat：使用spring定时任务替换quartz
|
2024-02-26 19:37:25 +08:00 |
|
qiaoqinzheng
|
0b34e7eb1c
|
app端查询页面传递分页参数被调用接口接收参数内容错误问题修改
|
2024-02-26 11:55:42 +08:00 |
|
nieziyan
|
6d26adccaf
|
feat：数据源使用用zabbix监控
|
2024-02-22 19:39:04 +08:00 |
|
qiaoqinzheng
|
674734bfc5
|
app端请求接口调试及接收参数方式修改
|
2024-02-21 10:35:21 +08:00 |
|
qiaoqinzheng
|
d3d84a1c83
|
app端请求登陆模块接口部分，获取验证码接口无法请求问题修改
|
2024-02-21 08:59:56 +08:00 |
|
qiaoqinzheng
|
3bf4c3d0fc
|
app微服务模块登陆及推送消息调用接口，app端与PC端冲突部分接口新增app端接口进行区分
|
2024-02-20 15:50:57 +08:00 |
|
nieziyan
|
2cac351fce
|
Merge remote-tracking branch 'origin/mdc' into mdc
# Conflicts:
# jeecg-module-app/src/main/java/org/jeecg/modules/controller/AlarmController.java
|
2024-02-05 17:26:33 +08:00 |
|
nieziyan
|
25b0cdfadc
|
fix：1.edit user 2.add freeMemory
|
2024-02-05 17:25:21 +08:00 |
|
qiaoqinzheng
|
01fd821a10
|
DATA_BASE删除数据时，因为文件路径问题提示删除失败问题修改
|
2024-02-05 12:57:52 +08:00 |
|
qiaoqinzheng
|
b6bad77274
|
消息推送OPPO，VIVO增加厂商配置参数
|
2024-01-31 17:51:11 +08:00 |
|
nieziyan
|
d9e89f5606
|
feat：send message
|
2024-01-31 16:09:52 +08:00 |
|
qiaoqinzheng
|
c892a339e0
|
增加客户绑定的客户端id去重，避免同一个用户发送多条的情况
|
2024-01-31 16:00:28 +08:00 |
|
qiaoqinzheng
|
9e8935c9d4
|
新增推送通知基础配置类MyApiHelper
新增推送通知工具类PushAppUtil
增加在线，离线推送消息相关方法
消息推送根据报警规则组id，获取绑定用户id，根据用户id查询绑定的客户端id推送消息
新增表绑定用户以及客户端信息
app登陆增加新的redisKey存储当前用户名对应的token信息，在别处登陆时清除上一个登陆token退出用户登陆
新增接口用户在app端登陆时，新增或修改当前用户id绑定的客户端id
定时任务增加推送通知工具类声明
分析结果消费者代码增加推送通知工具类
|
2024-01-31 15:25:15 +08:00 |
|
nieziyan
|
01eb8d22c2
|
fix：send message
|
2024-01-30 11:51:34 +08:00 |
|
nieziyan
|
c726558672
|
fix：微服务name修改
|
2024-01-25 14:24:50 +08:00 |
|
qiaoqinzheng
|
e166a470be
|
台站运行管理启动时增加查询所有用户最大缓存时间的方法
台站运行管理查询台站的运行状态接口根据用户设置的缓存时间进行结果切割返回
系统启动类新增加缓存台站id及台站id关联的探测器数组方法
台站运行管理数据状态线程向redis缓存过于频繁导致触发redis序列化错误问题修改
|
2024-01-24 14:22:33 +08:00 |
|
nieziyan
|
6b69e226d4
|
fix：使用台站状态枚举类
|
2024-01-23 15:12:24 +08:00 |
|
nieziyan
|
227a7d1975
|
fix：SQL查询：ERROR: could not determine data type of parameter $1
|
2024-01-22 11:03:37 +08:00 |
|
qiaoqinzheng
|
9a01e503d4
|
自动处理SOH,MET文件存储内容中如果是占位数据-999999存储时数据内容超出精度范围问题修改
|
2024-01-15 10:47:00 +08:00 |
|
nieziyan
|
1bea5eb58b
|
feat：探测器check
|
2024-01-11 19:32:38 +08:00 |
|
nieziyan
|
f67db42995
|
feat：探测器Id生成
|
2024-01-11 16:37:56 +08:00 |
|
nieziyan
|
4e2313945a
|
fix：1.探测器页面bug修复2.Web模块页面bug修复
|
2024-01-10 20:15:42 +08:00 |
|
nieziyan
|
3fc44ee0fb
|
fix：1.ARR/RRR增加筛选与回显字段2.探测器新增
|
2024-01-09 20:45:15 +08:00 |
|
qiaoqinzheng
|
06bb6146ab
|
台站管理，探测器管理保存方法moddate赋值代码去除
|
2024-01-08 16:27:37 +08:00 |
|
nieziyan
|
57d4d58a7a
|
fix：使用模板引擎消息模板
|
2024-01-05 16:23:12 +08:00 |
|
nieziyan
|
20163e1fba
|
fix：使用模板引擎消息模板
|
2024-01-05 11:14:52 +08:00 |
|
nieziyan
|
0be1f3e7fd
|
fix：邮件服务器管理同步
|
2024-01-04 15:55:17 +08:00 |
|
nieziyan
|
b5211003a5
|
fix：完善服务器图表
|
2024-01-03 19:22:35 +08:00 |
|
nieziyan
|
a5412c684e
|
fix：缓存可用发件邮箱
|
2024-01-03 09:37:42 +08:00 |
|
nieziyan
|
d7fce97b59
|
feat：1.完善分析结果日志2.数据源绑定监控3.数据源指标数据
|
2023-12-27 17:15:52 +08:00 |
|
nieziyan
|
df03eb9257
|
fix：优化
|
2023-12-22 18:29:11 +08:00 |
|
nieziyan
|
977447bd07
|
feat：IDC Data拾取
|
2023-12-20 11:07:13 +08:00 |
|
nieziyan
|
817eb5a679
|
feat：IDC Data拾取
|
2023-12-19 20:05:07 +08:00 |
|
nieziyan
|
ac3b790622
|
feat：并发优化
|
2023-12-14 19:29:18 +08:00 |
|
nieziyan
|
cb7449fcd6
|
feat：运管监控服务调用
|
2023-12-11 18:54:56 +08:00 |
|