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
|
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 |
|
wangshilong
|
442ae6e4bf
|
Online Device status cache
|
2024-11-27 14:34:49 +08:00 |
|
wangshilong
|
38465e264e
|
调整指令目录
|
2024-11-27 14:15:48 +08:00 |
|
wangshilong
|
d9b9ff9011
|
KNPCV1新增3中指令，并测试指令转换及发送
|
2024-11-27 14:12:46 +08:00 |
|
wangshilong
|
46665482de
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-11-27 02:01:51 +08:00 |
|
wangshilong
|
4ab1df8cba
|
指令下发接口开发
|
2024-11-27 02:00:58 +08:00 |
|
qinjie
|
65c23b678b
|
修改缓存取值对象处理
|
2024-11-26 22:51:15 +08:00 |
|
qinjie
|
e8b61641de
|
设备历史数据接口
|
2024-11-26 18:46:34 +08:00 |
|
wangshilong
|
8a8b9c206b
|
ETC线圈状态读取错误修复
|
2024-11-26 18:29:08 +08:00 |
|
wangshilong
|
af5612a785
|
添加ETC入库
|
2024-11-26 16:51:07 +08:00 |
|
wangshilong
|
16fd5e522a
|
同时推送新旧两条数据
|
2024-11-26 15:51:47 +08:00 |
|
wangshilong
|
803f3248f3
|
调整采集能力，支持按设备品牌采集数据
|
2024-11-26 13:39:35 +08:00 |
|
wangshilong
|
90ec96f7be
|
添加数据持久化事件推送能力
|
2024-11-26 12:47:17 +08:00 |
|
qinjie
|
fb3470ae67
|
Merge remote-tracking branch 'origin/develop' into develop
|
2024-11-26 03:13:02 +08:00 |
|
qinjie
|
6d29561eb1
|
设备控制数据读取接口&历史数据查询接口
|
2024-11-26 03:12:53 +08:00 |