336 Commits

Author SHA1 Message Date
aeb60acd9a Merge branch 'master' into dev 2025-04-27 03:41:34 +00:00
cli
edf92c8940 合并 2025-04-27 11:05:06 +08:00
cli
d37e17d912 临时提交 2025-04-27 11:04:31 +08:00
ChenYi
63acc1c263 修复问题 2025-04-27 10:33:33 +08:00
eb26d89488 合并代码 2025-04-27 10:20:22 +08:00
9b1d5680d6 代码合并 2025-04-27 10:05:12 +08:00
ChenYi
653c9b1fc8 合并代码 2025-04-27 09:53:29 +08:00
713782e60f 暂定透明转发接受匹配规则 2025-04-27 09:49:17 +08:00
cli
e866758782 暂存 2025-04-27 09:47:08 +08:00
b374692c02 优化匹配 2025-04-27 09:44:08 +08:00
ChenYi
55f4debc5e 完成定时抄读集中器版本、定时抄读SIM卡信息 2025-04-27 09:40:31 +08:00
35febf6a99 优化解析保存到IotDB 2025-04-27 09:31:12 +08:00
cli
355aad3ee5 规整命名空间 2025-04-27 09:16:37 +08:00
b80d894f6c 添加常量零序列电流 2025-04-27 08:43:41 +08:00
4c13eb6ee4 Merge branch 'zhy_feat_cev_v5' into dev 2025-04-26 19:07:22 +08:00
314d96dd59 添加接受OCH、ODH、10H等数据解析 2025-04-26 19:04:50 +08:00
cli
946dffbaa7 合并 2025-04-25 17:42:46 +08:00
cli
5adabb3b7e 修改代码 2025-04-25 17:41:43 +08:00
ChenYi
a2cc947d7d Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-04-25 17:19:03 +08:00
ChenYi
27104ada3a 协议池应用04 2025-04-25 17:18:59 +08:00
32617a9b83 Merge branch 'zhy_feat_cev_v5' into dev 2025-04-25 15:22:20 +08:00
ChenYi
2dbf4ded4a 调整日志 2025-04-25 15:21:46 +08:00
825e7d5f18 调整代码结构 2025-04-25 15:21:43 +08:00
ChenYi
1b7b8a91a5 调整代码 2025-04-25 14:58:51 +08:00
ChenYi
d60589a180 修改代码 2025-04-25 14:42:11 +08:00
ChenYi
7b933f27f1 Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-04-25 14:37:39 +08:00
ChenYi
51b7147a38 调整框架 2025-04-25 14:37:35 +08:00
c3273960c6 调整代码结构 2025-04-25 14:35:59 +08:00
a5cd6b86f2 调整项目结构 2025-04-25 14:23:06 +08:00
f09c50b833 调整协议实体类结构 2025-04-25 13:51:22 +08:00
81369a744e Merge branch 'zhy_feat_cev_v4' into dev 2025-04-25 13:43:28 +08:00
2e7d76d8aa 暂存 2025-04-25 13:42:52 +08:00
ChenYi
9104cda58a 结构调整 2025-04-25 13:42:08 +08:00
ChenYi
710d2a60c4 调整协议池项目组结构 2025-04-25 12:01:15 +08:00
3490fc22f1 解决冲突 2025-04-25 09:31:16 +08:00
16dab4ba29 调整结构 2025-04-25 09:28:56 +08:00
ChenYi
e8a1a7d23e 优化服务应用配置,将其单独管理。 2025-04-25 09:28:20 +08:00
ChenYi
f2be3a5516 合并代码 2025-04-25 08:33:13 +08:00
陈益
e1853b2655 协议池应用02 2025-04-24 23:39:39 +08:00
cli
bf4f631a8c Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-04-24 21:01:05 +08:00
cli
dbe31c87da 实现重载 2025-04-24 21:01:01 +08:00
264eec540a 修改代码 2025-04-24 19:40:51 +08:00
0ce146e7be 报文处理 2025-04-24 19:35:40 +08:00
cc35ad2664 添加报文解析 2025-04-24 19:31:28 +08:00
ChenYi
dec99af6dd 协议池的应用处理01 2025-04-24 17:48:20 +08:00
cli
820773bac2 修复编译报错 2025-04-24 00:37:00 +08:00
cli
7adee9f257 合并 2025-04-24 00:34:30 +08:00
cli
d4ae0d2a1d 协议卸载与重载 2025-04-24 00:34:00 +08:00
陈益
57021e2b9c 修改代码 2025-04-23 23:42:35 +08:00
ChenYi
310ae97a6b 优化报文存储记录 2025-04-23 17:49:13 +08:00