Commit Graph

161 Commits

Author SHA1 Message Date
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
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
wangshilong e404059904 自动监听队列 2024-11-25 22:58:05 +08:00
wangshilong 65b8678210 四川双晟对接完成 2024-11-25 22:44:08 +08:00
wangshilong 440b9f840b Merge remote-tracking branch 'origin/develop' into develop 2024-11-25 18:10:22 +08:00
wangshilong b6e9df3cdf 调整落库逻辑 2024-11-25 17:55:45 +08:00
qinjie e31f612f09 设备接口修改1 2024-11-25 16:29:26 +08:00
qinjie a93f20772b Merge remote-tracking branch 'origin/develop' into develop 2024-11-25 15:48:10 +08:00
qinjie 24795e3b17 设备接口修改 2024-11-25 15:48:00 +08:00
wangshilong 2281749c14 Merge remote-tracking branch 'origin/develop' into develop 2024-11-25 14:50:13 +08:00
wangshilong 240f0dfd4c 解析数据落库 2024-11-25 14:49:16 +08:00
wangshilong ad34855cf7 解析数据落库 2024-11-25 13:07:43 +08:00
qinjie 2235da9352 提交表结构 2024-11-25 01:43:39 +08:00
qinjie 13cec6586b 增加设备基础信息接口 2024-11-25 01:04:53 +08:00
wangshilong 05c2c43e54 解析数据落库 2024-11-24 18:51:30 +08:00
qinjie dd3b0cd4b7 Merge remote-tracking branch 'origin/develop' into develop 2024-11-24 15:57:31 +08:00
qinjie bda4d27def 部门和角色接口修改
增加气井接口
2024-11-24 15:57:24 +08:00
wangshilong bde580678a Merge remote-tracking branch 'origin/develop' into develop 2024-11-24 12:04:55 +08:00
wangshilong a183cf6103 解析代码 2024-11-24 12:03:06 +08:00
qinjie 1731a9b6aa 增加区块和部门接口 2024-11-23 21:12:05 +08:00
qinjie d9362860f3 Merge remote-tracking branch 'origin/develop' into develop 2024-11-23 18:49:43 +08:00
qinjie 5b27473956 增加区块和部门接口 2024-11-23 18:49:10 +08:00