|
|
aeb60acd9a
|
Merge branch 'master' into dev
|
2025-04-27 03:41:34 +00:00 |
|
|
|
edf92c8940
|
合并
|
2025-04-27 11:05:06 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
946dffbaa7
|
合并
|
2025-04-25 17:42:46 +08:00 |
|
|
|
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 |
|
|
|
bf4f631a8c
|
Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev
|
2025-04-24 21:01:05 +08:00 |
|
|
|
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 |
|
|
|
820773bac2
|
修复编译报错
|
2025-04-24 00:37:00 +08:00 |
|
|
|
7adee9f257
|
合并
|
2025-04-24 00:34:30 +08:00 |
|
|
|
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 |
|
ChenYi
|
41d71a5fba
|
合并代码
|
2025-04-23 16:19:06 +08:00 |
|
ChenYi
|
4de3fb7db2
|
完成定时阀控
|
2025-04-23 16:17:29 +08:00 |
|
|
|
fff1ba1a7b
|
Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev
|
2025-04-23 15:11:27 +08:00 |
|
|
|
8da5fee0a2
|
提交
|
2025-04-23 15:10:20 +08:00 |
|
|
|
039a1a8b89
|
合并
|
2025-04-23 14:46:56 +08:00 |
|
|
|
7dd26dc89b
|
添加健康检查
|
2025-04-23 14:46:19 +08:00 |
|
|
|
9c24f53eb6
|
Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev
|
2025-04-23 14:00:10 +08:00 |
|
|
|
a340225cda
|
优化kafka消费者被自动踢出消费组增加自动重试订阅
|
2025-04-23 13:59:15 +08:00 |
|
ChenYi
|
42a446c24d
|
完善IoTDB存储路径约束
|
2025-04-23 11:13:59 +08:00 |
|
ChenYi
|
17bb8a5692
|
合并代码
|
2025-04-23 09:45:31 +08:00 |
|
ChenYi
|
9c6e8c0de8
|
合并代码
|
2025-04-23 09:45:21 +08:00 |
|
ChenYi
|
d91fc5b35f
|
完善水表处理
|
2025-04-23 09:42:09 +08:00 |
|
|
|
9cb8688425
|
修改代码
|
2025-04-22 23:47:59 +08:00 |
|
|
|
c5364f4a95
|
优化kafka消费者实例复用
优化登录心跳逻辑
|
2025-04-22 23:45:08 +08:00 |
|
ChenYi
|
60aad0032b
|
解决IoTDB无法重复调用查询接口的问题
|
2025-04-22 23:44:37 +08:00 |
|
ChenYi
|
26f6796409
|
解决IoTDB数据查询映射异常的问题
|
2025-04-22 22:11:55 +08:00 |
|
|
|
ed750f66b6
|
合并
|
2025-04-22 21:06:56 +08:00 |
|
|
|
3db0db19ea
|
合并
|
2025-04-22 21:06:35 +08:00 |
|
|
|
0efb3dec00
|
添加协议文件监控程序，实现协议文件CRUD的监控，同时记录修改事件，并支持自动重启和健康检查
|
2025-04-22 21:01:28 +08:00 |
|
|
|
4543299dde
|
修改代码
|
2025-04-22 18:10:18 +08:00 |
|
|
|
633df21f43
|
新增报文解析采用策略模式执行解析
|
2025-04-22 18:07:47 +08:00 |
|
ChenYi
|
5647385582
|
完善时间控制
|
2025-04-22 17:58:14 +08:00 |
|
|
|
5ca4cbad13
|
Merge branch 'zhy_feat_cev_v3' into dev
|
2025-04-22 16:49:45 +08:00 |
|
|
|
7c55d96b7c
|
修改代码
|
2025-04-22 16:48:53 +08:00 |
|
ChenYi
|
ea6dc9f39f
|
修复主题名称
|
2025-04-22 16:48:43 +08:00 |
|
ChenYi
|
c29ec906b1
|
合并代码
|
2025-04-22 16:46:11 +08:00 |
|
ChenYi
|
f4016ce3ad
|
解决IoTDB纳秒时间戳保存的问题，完善IoTDB的查询封装
|
2025-04-22 16:44:47 +08:00 |
|
|
|
b1a5d29fa7
|
修改代码
|
2025-04-22 10:05:38 +08:00 |
|
|
|
37781e32e1
|
调整代码
|
2025-04-22 09:40:09 +08:00 |
|
|
|
2c202081f9
|
解决冲突
|
2025-04-22 09:37:49 +08:00 |
|
|
|
503931f297
|
优化tcp接受消息处理
|
2025-04-22 09:34:59 +08:00 |
|
|
|
83efc6da00
|
优化协议插件定义，调整插件结构
|
2025-04-21 23:47:11 +08:00 |
|
ChenYi
|
a6d970af19
|
优化IoTDB数据类型映射，实现微秒和纳秒的扩展封装
|
2025-04-21 22:57:49 +08:00 |
|
ChenYi
|
309f5c37d2
|
解决单侧点表模型路径处理问题，并添加路径Attribute，以支持固定存储路径场景
|
2025-04-21 14:57:12 +08:00 |
|
ChenYi
|
ca1a23fd33
|
优化IoTDB驱动
|
2025-04-21 14:20:49 +08:00 |
|
ChenYi
|
3c6a04f947
|
合并代码
|
2025-04-21 10:52:28 +08:00 |
|
ChenYi
|
38283db1b2
|
测试IoTDB实体约束
|
2025-04-21 10:50:36 +08:00 |
|
|
|
02f2a2cafc
|
规范代码
|
2025-04-21 10:17:40 +08:00 |
|
|
|
01aeaebb0a
|
合并
|
2025-04-21 09:56:22 +08:00 |
|
|
|
640fcb754d
|
添加拦截器
|
2025-04-21 09:54:34 +08:00 |
|
ChenYi
|
cb6cfea4dd
|
合并代码
|
2025-04-21 09:48:12 +08:00 |
|
ChenYi
|
cc59b32742
|
完善IoTDB的数据实体约束
|
2025-04-21 09:45:30 +08:00 |
|
|
|
f5f9434a97
|
代码提交
|
2025-04-19 14:00:13 +08:00 |
|
|
|
b3a2fd506e
|
提交代码
|
2025-04-19 13:57:19 +08:00 |
|
|
|
40924e921f
|
提交代码
|
2025-04-19 13:57:08 +08:00 |
|
|
|
40b62caa83
|
解决合并冲突
|
2025-04-19 00:37:36 +08:00 |
|
|
|
2612cd5d0b
|
调整kafka结构
|
2025-04-19 00:35:21 +08:00 |
|
|
|
270abd656f
|
优化kafka解决订阅回调参数问题
订阅调整为批量订阅
|
2025-04-19 00:30:58 +08:00 |
|
ChenYi
|
fe51402b1f
|
完成电表定时抄读
|
2025-04-18 17:46:24 +08:00 |
|
ChenYi
|
6c2560669e
|
优化任务数据格式
|
2025-04-18 11:31:23 +08:00 |
|
|
|
dc7416bdbf
|
去除CAP 和 MassTransit
|
2025-04-18 09:50:00 +08:00 |
|
