Commit Graph

95 Commits

Author SHA1 Message Date
qinjie 47fd97f6a9 增加提醒功能 2024-12-10 12:35:37 +08:00
wangshilong d1b78b3277 添加新的解析器 2024-12-10 12:27:21 +08:00
wangshilong c17a1e1d28 添加查询字段映射 2024-12-10 09:51:10 +08:00
qinjie 4bc2281229 字段修改、增加监听 2024-12-09 21:01:54 +08:00
qinjie c71d8ff8dc 增加设备缓存清除的调用 2024-12-09 16:05:45 +08:00
wangshilong 344b3c600f 缓存清理 2024-12-09 12:57:11 +08:00
wangshilong 82b60d235c Merge remote-tracking branch 'origin/develop' into develop 2024-12-09 11:41:28 +08:00
wangshilong 119e854f11 精度调整 2024-12-09 11:41:11 +08:00
qinjie 8c29732feb 修改设备历史数据查询接口返回字段 2024-12-08 21:43:37 +08:00
wangshilong 18d1c67b43 Merge remote-tracking branch 'origin/develop' into develop 2024-12-08 21:33:03 +08:00
wangshilong c771477e09 调整输压字段 2024-12-08 21:18:53 +08:00
qinjie 307d9a78b2 修改设备历史数据查询接口 2024-12-08 21:18:38 +08:00
wangshilong 5e286b3ea3 内网代码拷贝后修改 2024-12-07 14:50:35 +08:00
qinjie 7dfdf48309 Merge remote-tracking branch 'origin/develop' into develop 2024-12-06 16:11:26 +08:00
qinjie 317d4d6be1 修改开井状态字段值 2024-12-06 16:11:15 +08:00
wangshilong 5fd5dc316e 队列名称方法化 2024-12-06 13:55:09 +08:00
qinjie 1e15debe49 redis链接失败的首页返回值处理 2024-12-06 10:06:04 +08:00
qinjie 3826f7f885 日志管理功能 2024-12-05 17:17:12 +08:00
qinjie 26c0da2796 修改字段名称 2024-12-04 00:23:37 +08:00
wangshilong 552192772f Fixed send command failed 2024-12-01 15:45:27 +08:00
wangshilong 539efbbf18 Merge remote-tracking branch 'origin/develop' into develop 2024-12-01 15:32:08 +08:00
wangshilong f075d7780e 持久化网关名称解析问题 2024-12-01 15:26:58 +08:00
qinjie cd81ccf116 Merge remote-tracking branch 'origin/develop' into develop 2024-12-01 15:26:45 +08:00
qinjie 259ad10038 修复首页统计报错 2024-12-01 15:26:37 +08:00
王仕龙 e19a2c77c3 Accept Merge Request #1: (simple_queue -> develop)
Merge Request: M

Created By: @王仕龙
Accepted By: @王仕龙
URL: https://g-dupe6279.coding.net/p/chuanqing/d/gasWellWatch/git/merge/1?initial=true
2024-12-01 14:43:37 +08:00
wangshilong 789833f729 max value 2024-12-01 14:36:48 +08:00
qinjie 8c81457fd7 增加错误类型 2024-12-01 14:34:18 +08:00
wangshilong 55d1a0a139 ETC指令调整 2024-11-28 23:59:49 +08:00
wangshilong c473eda424 开井指令修改 2024-11-28 23:58:18 +08:00
wangshilong 81b985e87c 指令还原 2024-11-28 23:55:21 +08:00
wangshilong b463ddf006 使用分片队列 2024-11-28 23:35:05 +08:00
wangshilong 59ecfea717 ETC数据解析落库异常问题修复 2024-11-28 17:43:38 +08:00
qinjie 3bd7cc9cdc Merge remote-tracking branch 'origin/develop' into develop 2024-11-28 16:39:02 +08:00
qinjie b831d28e89 修复问题 2024-11-28 16:38:54 +08:00
929389070@qq.com 4c55611ccc todo标记注释, 使用指令功能码与所参考文档描述不一致, 暂无法确认该问题 2024-11-28 16:32:14 +08:00
qinjie 2f7a01984a Merge remote-tracking branch 'origin/develop' into develop 2024-11-28 16:21:08 +08:00
qinjie c056b6792e 修复问题 2024-11-28 16:20:57 +08:00
929389070@qq.com 4c1e265fc2 修改指令, 修改前:01050001FF00, 修改后:010500010000 2024-11-28 16:20:02 +08:00
qinjie f272b48edc 修改测试数据 2024-11-28 10:14:57 +08:00
wangshilong d764a3143f 控制数据,进位转换 2024-11-28 10:10:57 +08:00
wangshilong 2dddc8115b final 2024-11-28 09:04:48 +08:00
qinjie 5af284a6d7 提交sql 2024-11-28 03:15:37 +08:00
qinjie 0bb73e7a0c 修复bug 2024-11-28 03:12:34 +08:00
qinjie b7025256a1 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/main/java/com/isu/gaswellwatch/modbus/impl/CommandServiceImpl.java
2024-11-28 01:32:33 +08:00
qinjie d82ac864bd 增加统计接口 2024-11-28 01:30:00 +08:00
wangshilong a48c60bcdb 添加四川双晟控制指令 2024-11-28 00:56:08 +08:00
wangshilong 412ede0301 Add ETC command points 2024-11-27 23:46:40 +08:00
wangshilong 65c40fab6f 指令调整,与点表一致 2024-11-27 20:09:02 +08:00
wangshilong 5b7c3a10f9 设备数据持久化事件推送队列动态生成 2024-11-27 15:06:43 +08:00
wangshilong a7f4dcd000 设备数据持久化事件推送队列动态生成 2024-11-27 14:55:43 +08:00