|
|
e6327a57df
|
合并代码
|
2025-04-18 09:29:38 +08:00 |
|
|
|
17b73b6a2a
|
Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev
|
2025-04-18 09:29:03 +08:00 |
|
|
|
cb36fc463a
|
移除测试日志
|
2025-04-18 09:28:48 +08:00 |
|
|
|
7704c6374e
|
修改gitignore
|
2025-04-18 08:33:15 +08:00 |
|
|
|
26e361075d
|
修改忽略配置
|
2025-04-18 08:31:34 +08:00 |
|
|
|
c93feb631d
|
订阅特性优化
|
2025-04-18 08:23:31 +08:00 |
|
|
|
02d189358e
|
订阅消费暂时取消缓存消费实例
|
2025-04-18 08:22:52 +08:00 |
|
|
|
ca1e4e28e5
|
优化代码
|
2025-04-17 22:21:34 +08:00 |
|
|
|
db6e314aca
|
调整代码结构
|
2025-04-17 20:28:50 +08:00 |
|
|
|
444b01095f
|
Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev
|
2025-04-17 19:41:43 +08:00 |
|
|
|
532acc575f
|
优化kafka 订阅增加判断时间分区数是否大于配置数
|
2025-04-17 19:41:09 +08:00 |
|
|
|
19bc05c601
|
Merge branch 'cassandra' into dev
|
2025-04-17 18:45:15 +08:00 |
|
|
|
f11e514ef4
|
Merge branch 'dev' into zhy_feat_dev_v2
|
2025-04-17 18:09:21 +08:00 |
|
|
|
c4d4078bd9
|
Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev
|
2025-04-17 18:08:48 +08:00 |
|
|
|
b064ff3d14
|
代码修改
|
2025-04-17 18:08:27 +08:00 |
|
ChenYi
|
ac546dd029
|
Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev
|
2025-04-17 17:23:23 +08:00 |
|
ChenYi
|
3020a49672
|
提交代码
|
2025-04-17 17:23:20 +08:00 |
|
|
|
76ae008e01
|
合并冲突
|
2025-04-17 16:21:42 +08:00 |
|
|
|
f1082ce8a2
|
修改为缓存读取
|
2025-04-17 16:19:46 +08:00 |
|
|
|
e91db2d0d4
|
修改配置文件
|
2025-04-17 16:10:47 +08:00 |
|
|
|
73c12e5160
|
Merge remote-tracking branch 'origin/dev' into cassandra
|
2025-04-17 16:09:19 +08:00 |
|
ChenYi
|
d002472854
|
移除无用代码，减少Kafka订阅线程数量
|
2025-04-17 15:49:57 +08:00 |
|
|
|
48b91183c2
|
增加测试主题
|
2025-04-17 15:06:30 +08:00 |
|
|
|
0ba64a4b90
|
优化发布订阅
|
2025-04-17 14:39:14 +08:00 |
|
ChenYi
|
871ed615a4
|
提交代码
|
2025-04-17 14:12:02 +08:00 |
|
|
|
0584515df9
|
Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev
|
2025-04-17 13:56:25 +08:00 |
|
|
|
72f8222ec2
|
kafka消费者订阅增加批量消费
|
2025-04-17 13:56:17 +08:00 |
|
ChenYi
|
902993e481
|
Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev
|
2025-04-17 13:55:18 +08:00 |
|
ChenYi
|
6c0ce01634
|
优化Kafka配置项获取
|
2025-04-17 13:54:18 +08:00 |
|
|
|
4c5f7231bf
|
删除未多余的配置类
|
2025-04-17 13:41:53 +08:00 |
|
|
|
26ffffa233
|
调整kafka自动注册消费者
|
2025-04-17 13:41:18 +08:00 |
|
ChenYi
|
6c8ffb3ae5
|
修改代码
|
2025-04-17 13:35:08 +08:00 |
|
|
|
96e066376f
|
增加kafka订阅自动取程序所有的订阅者
|
2025-04-17 13:01:26 +08:00 |
|
|
|
fa18377f10
|
提交代码
|
2025-04-17 11:53:29 +08:00 |
|
|
|
33feb60e46
|
Merge branch 'zhy_feat_dev_v1' into dev
|
2025-04-17 11:43:30 +08:00 |
|
|
|
8fd5f985ab
|
暂存
|
2025-04-17 11:42:35 +08:00 |
|
ChenYi
|
c97634e474
|
合并代码，解决冲突
|
2025-04-17 11:41:46 +08:00 |
|
ChenYi
|
13e986168e
|
百万级的任务数据集中器所在分组单独保存
|
2025-04-17 11:29:26 +08:00 |
|
ChenYi
|
4737c5b53d
|
优化代码
|
2025-04-17 09:10:01 +08:00 |
|
ChenYi
|
cadb69f4b9
|
将10万Redis的Hash表数据读取优化到13秒以内。
|
2025-04-17 08:29:32 +08:00 |
|
ChenYi
|
78127f7cea
|
解决Redis大批量数据读取总数不准的问题，并将10万记录读取时间控制在23秒以内。
|
2025-04-17 08:20:54 +08:00 |
|
ChenYi
|
849e0f9ac2
|
修改代码
|
2025-04-16 23:51:27 +08:00 |
|
|
|
3790f3918e
|
添加Header消息过滤开关
|
2025-04-16 20:41:52 +08:00 |
|
|
|
78f9ef349a
|
优化kafka
增加默认序列化和反序列化
增加批量消费
增加Header消费过滤
|
2025-04-16 18:46:51 +08:00 |
|
|
|
eed68d0fe0
|
kafka增加批量消费
|
2025-04-16 18:26:25 +08:00 |
|
ChenYi
|
1a275ec9c3
|
批量写入测试调优
|
2025-04-16 17:36:46 +08:00 |
|
|
|
4494c92e7c
|
Cassandra 性能局部调优
|
2025-04-16 16:12:38 +08:00 |
|
|
|
0d4c780727
|
保留CAP组件，后续决定是否移除
|
2025-04-16 09:54:21 +08:00 |
|
陈益
|
57123d653c
|
修改代码
|
2025-04-15 23:20:46 +08:00 |
|
|
|
e1106b3241
|
移除CAP组件
|
2025-04-15 19:09:16 +08:00 |
|
|
|
11d3fcf162
|
移除CAP组件
|
2025-04-15 18:58:38 +08:00 |
|
|
|
a8f79c56f4
|
Merge branch 'dev' into zhy_feat_dev_v1
|
2025-04-15 18:06:32 +08:00 |
|
|
|
27d3bad7fe
|
合并
|
2025-04-15 18:03:51 +08:00 |
|
|
|
72d1b9f623
|
优化订阅回调
|
2025-04-15 18:03:51 +08:00 |
|
|
|
f9577156a3
|
修改代码
|
2025-04-15 18:02:39 +08:00 |
|
|
|
3b29e58951
|
删除多余项目
|
2025-04-15 18:01:50 +08:00 |
|
|
|
e9cd38bd64
|
合并
|
2025-04-15 18:01:30 +08:00 |
|
|
|
aa55e476c2
|
封装Cassandra数据库操作
|
2025-04-15 17:57:47 +08:00 |
|
ChenYi
|
b5f1f1f50b
|
大批量插入测试
|
2025-04-15 17:40:17 +08:00 |
|
ChenYi
|
abde2b5161
|
优化Redis大批量数据添加
|
2025-04-15 16:48:35 +08:00 |
|
|
|
7b1f04a452
|
暂存
|
2025-04-15 16:45:10 +08:00 |
|
ChenYi
|
0037291350
|
修改代码
|
2025-04-15 16:08:07 +08:00 |
|
ChenYi
|
f3a0c82d24
|
完善项目依赖
|
2025-04-15 16:05:07 +08:00 |
|
ChenYi
|
c456a22bb8
|
合并代码
|
2025-04-15 15:57:14 +08:00 |
|
ChenYi
|
0e96d111cc
|
结合合并冲突
|
2025-04-15 15:56:58 +08:00 |
|
|
|
f74bedd3cd
|
特性订阅案例
|
2025-04-15 15:50:30 +08:00 |
|
ChenYi
|
033fde66b1
|
redis 大批量写入场景优化
|
2025-04-15 15:49:51 +08:00 |
|
|
|
be076a81e5
|
优化kafka发布订阅
|
2025-04-15 15:49:22 +08:00 |
|
|
|
6409afa98e
|
调整kafka约束
|
2025-04-15 11:15:42 +08:00 |
|
|
|
e672a6800d
|
调整kafka约束
|
2025-04-15 11:15:22 +08:00 |
|
|
|
cfa2f5b7b7
|
perf：优化kafka
|
2025-04-15 11:02:13 +08:00 |
|
ChenYi
|
5afed96fb7
|
优化任务创建存入Redis
|
2025-04-15 09:43:51 +08:00 |
|
ChenYi
|
142f864544
|
优化缓存电表信息获取，采用分页方式
|
2025-04-14 23:42:18 +08:00 |
|
陈益
|
1284898376
|
优化任务创建，使用线程分组
|
2025-04-14 21:56:24 +08:00 |
|
|
|
25c78d784f
|
sytel：优化kafka
|
2025-04-14 19:10:27 +08:00 |
|
ChenYi
|
8b86381e7a
|
并行处理所有分组设备
|
2025-04-14 17:38:34 +08:00 |
|
ChenYi
|
2fdf5850c8
|
优化缓存电表的获取，以及分组均衡的控制。
|
2025-04-14 16:41:41 +08:00 |
|
|
|
83b7de52d5
|
测试迁入
|
2025-04-14 15:31:10 +08:00 |
|
ChenYi
|
1b1c4e5683
|
修改代码
|
2025-04-14 10:29:08 +08:00 |
|
ChenYi
|
4c94859286
|
优化json序列化，移除EventBus组件
|
2025-04-14 10:20:48 +08:00 |
|
ChenYi
|
3d56d351d3
|
修改代码
|
2025-04-14 09:29:12 +08:00 |
|
陈益
|
d25034fddd
|
修改代码
|
2025-04-13 21:47:47 +08:00 |
|
陈益
|
608337948a
|
优化代码
|
2025-04-13 21:26:27 +08:00 |
|
|
|
a57910f4b2
|
Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev
|
2025-04-12 15:11:32 +08:00 |
|
|
|
0c06cc904d
|
kafka代码还原
|
2025-04-12 15:11:18 +08:00 |
|
ChenYi
|
f2419a7098
|
优化主题创建
|
2025-04-11 17:44:35 +08:00 |
|
ChenYi
|
ad89d2716c
|
优化Kafka初始化主题。
|
2025-04-11 17:43:19 +08:00 |
|
|
|
949370c0c6
|
合并冲突
|
2025-04-11 17:15:15 +08:00 |
|
|
|
2625d076d4
|
暂存
|
2025-04-11 17:12:29 +08:00 |
|
ChenYi
|
99f96d889e
|
解决IoTDB动态单侧点记录入库的问题。
|
2025-04-11 17:06:30 +08:00 |
|
ChenYi
|
085a67b20a
|
修改配置
|
2025-04-11 15:17:16 +08:00 |
|
ChenYi
|
f036e9546d
|
解决单侧点模式数据处理
|
2025-04-11 14:50:46 +08:00 |
|
ChenYi
|
2beca87bb2
|
优化IoTDB驱动
|
2025-04-11 11:56:23 +08:00 |
|
ChenYi
|
b5f929910c
|
封装单个测点数据的Tablet列
|
2025-04-10 23:31:43 +08:00 |
|
|
|
a0463d5ae1
|
修改代码
|
2025-04-10 17:20:04 +08:00 |
|
ChenYi
|
65a9481766
|
Merge branch 'feature_定时抄读_05_CY' into dev
|
2025-04-10 17:09:21 +08:00 |
|
|
|
691cc2e3fe
|
Merge branch 'kafka' into dev
|
2025-04-10 17:07:26 +08:00 |
|
ChenYi
|
3a61b46036
|
修改代码
|
2025-04-10 17:06:53 +08:00 |
|
|
|
1c9094fd80
|
合并
|
2025-04-10 17:06:20 +08:00 |
|
|
|
f1bec122a3
|
修改代码
|
2025-04-10 16:58:32 +08:00 |
|
ChenYi
|
8257d6b129
|
连接本地依赖环境
|
2025-04-10 14:12:14 +08:00 |
|
陈益
|
7e0aa8169b
|
实现设备组负载控制，用于Kafka主题分区设备数量的均衡
|
2025-04-09 23:11:36 +08:00 |
|
ChenYi
|
d3cd390312
|
修改代码
|
2025-04-09 17:29:30 +08:00 |
|
ChenYi
|
4cd7889dd4
|
升级依赖
|
2025-04-09 15:55:19 +08:00 |
|
ChenYi
|
dfa2fc84c7
|
解决合并冲突
|
2025-04-09 14:38:47 +08:00 |
|
|
|
149f78278d
|
kafka整改
|
2025-04-09 14:33:20 +08:00 |
|
ChenYi
|
beb11c76f5
|
修改代码
|
2025-04-09 14:31:48 +08:00 |
|
陈益
|
b42388e7df
|
梳理Kafka主题，以及设备Hash分组方法封装。
|
2025-04-08 23:15:46 +08:00 |
|
ChenYi
|
39ae8a7f38
|
优化代码
|
2025-04-08 17:44:42 +08:00 |
|
ChenYi
|
323ad75f8a
|
修改代码
|
2025-04-07 21:50:50 +08:00 |
|
陈益
|
0dd95828d4
|
还原CAP使用
|
2025-04-07 21:34:05 +08:00 |
|
ChenYi
|
1b4c4dd8ff
|
优化代码
|
2025-04-07 17:35:37 +08:00 |
|
ChenYi
|
7696b7379b
|
实现SessionPool灵活切换封装
|
2025-04-07 16:44:25 +08:00 |
|
ChenYi
|
5d0a2088ae
|
优化代码
|
2025-04-07 10:56:40 +08:00 |
|
|
|
000e6e627e
|
修改代码
|
2025-04-03 18:05:17 +08:00 |
|
ChenYi
|
50639f6fcf
|
更新代码
|
2025-04-03 16:46:26 +08:00 |
|
ChenYi
|
5772ce906d
|
完善IOTDB Provider封装
|
2025-04-03 15:38:31 +08:00 |
|
|
|
80355a409a
|
修改代码
|
2025-04-02 17:54:12 +08:00 |
|
ChenYi
|
e1d4126db0
|
iotdb封装
|
2025-04-02 17:46:33 +08:00 |
|
ChenYi
|
a5f806c481
|
IoTDB封装
|
2025-04-02 17:23:52 +08:00 |
|
ChenYi
|
c57bd15b92
|
封装IoTDBProvider
|
2025-04-02 14:06:40 +08:00 |
|
ChenYi
|
838ef197e2
|
尝试自动创建主题
|
2025-04-02 09:42:04 +08:00 |
|
ChenYi
|
5a294b437c
|
优化代码
|
2025-04-01 22:50:34 +08:00 |
|
ChenYi
|
86edf4290a
|
测试mongodb批量写入。
|
2025-04-01 08:54:51 +08:00 |
|
ChenYi
|
a9b8323a3a
|
暂存代码
|
2025-03-27 08:38:19 +08:00 |
|
|
|
4ad10606ff
|
修改集群地址
|
2025-03-26 17:18:20 +08:00 |
|
陈益
|
af9b0d8a77
|
数据表分片策略统一出口封装
|
2025-03-24 21:55:22 +08:00 |
|
ChenYi
|
9da1745573
|
优化代码
|
2025-03-24 20:54:31 +08:00 |
|
|
|
a857e3f865
|
忽略hangfire token验证
|
2025-03-21 15:41:02 +08:00 |
|
ChenYi
|
96a38d8ec9
|
Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev
|
2025-03-21 15:08:04 +08:00 |
|
ChenYi
|
a0fa1ccf97
|
优化代码
|
2025-03-21 15:07:38 +08:00 |
|
|
|
d0e2a35f22
|
合并
|
2025-03-21 14:33:07 +08:00 |
|
|
|
49548768e6
|
暂存
|
2025-03-21 14:30:11 +08:00 |
|
ChenYi
|
37951e9496
|
定位cap消费异常的问题
|
2025-03-21 14:29:05 +08:00 |
|
ChenYi
|
c88ce18f3a
|
优化代码
|
2025-03-21 11:48:31 +08:00 |
|
ChenYi
|
e7f94ceae4
|
自定分库分表实现
|
2025-03-20 16:40:27 +08:00 |
|
陈益
|
e836522e3a
|
新增抄读记录表自定义仓储
|
2025-03-19 22:52:53 +08:00 |
|
ChenYi
|
83d8785ff4
|
完善报文解析，搭建数据迁移架构
|
2025-03-19 14:31:04 +08:00 |
|
陈益
|
76fe43ae54
|
优化消息存储
|
2025-03-18 22:43:24 +08:00 |
|
ChenYi
|
7f56b6e91f
|
完善代码
|
2025-03-18 21:21:35 +08:00 |
|
ChenYi
|
69cad7bdee
|
优化定时任务发送
|
2025-03-18 17:10:54 +08:00 |
|
ChenYi
|
8334b5ee49
|
解决报错
|
2025-03-18 16:20:08 +08:00 |
|
ChenYi
|
5b93fd2a96
|
解决冲突
|
2025-03-18 16:01:23 +08:00 |
|
ChenYi
|
0efb87482d
|
优化下发指令构建机制，将构建与下发拆分，走单独流程处理。
|
2025-03-18 15:58:37 +08:00 |
|
|
|
9cda1af5fc
|
update
|
2025-03-18 13:56:38 +08:00 |
|
|
|
798c48650a
|
Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev
|
2025-03-17 15:51:43 +08:00 |
|
|
|
e95d356780
|
修改配置
|
2025-03-17 15:51:40 +08:00 |
|
ChenYi
|
0b13cce47b
|
Merge branch 'feature_定时抄读_03_CY' into dev
|
2025-03-17 15:14:10 +08:00 |
|
ChenYi
|
0b2b3bc3d2
|
启动定时任务
|
2025-03-17 15:13:54 +08:00 |
|
ChenYi
|
ddb6d52755
|
定时抄读消息存入mangodb
|
2025-03-17 14:23:48 +08:00 |
|
ChenYi
|
5b177759bd
|
完善下发数据的处理。
|
2025-03-17 11:34:30 +08:00 |
|
|
|
29560ad4ef
|
优化代码
|
2025-03-17 09:57:58 +08:00 |
|
|
|
032c075f2f
|
Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev
|
2025-03-17 08:35:22 +08:00 |
|
|
|
5571369af7
|
暂存
|
2025-03-17 08:35:19 +08:00 |
|
ChenYi
|
d35882bf72
|
完善指令构建委托封装
|
2025-03-15 23:06:27 +08:00 |
|
ChenYi
|
0a3b37d80d
|
封装通用AFN报文获取
|
2025-03-14 17:28:58 +08:00 |
|
|
|
5915f5961b
|
修改地址
|
2025-03-14 14:38:08 +08:00 |
|
|
|
d82e646359
|
合并
|
2025-03-14 14:38:01 +08:00 |
|
|
|
e0b055c612
|
暂存
|
2025-03-14 14:28:04 +08:00 |
|
ChenYi
|
b941e1653f
|
Merge branch 'feature_定时抄读_01_CY' into dev
|
2025-03-14 14:24:57 +08:00 |
|
ChenYi
|
e564d8d7e6
|
定时任务优化202503141424
|
2025-03-14 14:24:38 +08:00 |
|
|
|
3b2e1c6e9c
|
集成维护面板
|
2025-03-14 14:04:49 +08:00 |
|
|
|
8ac429efef
|
Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev
|
2025-03-14 13:45:45 +08:00 |
|
|
|
c174738095
|
修改BackgroundWorker BUG
|
2025-03-14 13:45:29 +08:00 |
|
ChenYi
|
addec01dc8
|
封装水电表redis缓存批量获取
|
2025-03-13 11:55:51 +08:00 |
|
|
|
0b0eaa6ad0
|
优化代码
|
2025-03-13 10:58:49 +08:00 |
|
ChenYi
|
0924dcf9a5
|
Merge branch 'feature_定时抄读_CY' into dev
|
2025-03-13 10:51:59 +08:00 |
|
ChenYi
|
bb0099bc98
|
1分钟采集电表数据数据获取
|
2025-03-13 10:51:16 +08:00 |
|
|
|
9a5cb565e9
|
修改
|
2025-03-12 17:10:00 +08:00 |
|
ChenYi
|
665c4fc383
|
Merge branch 'feature_定时抄读_CY' into dev
|
2025-03-12 16:30:10 +08:00 |
|
ChenYi
|
171a39eabb
|
完善Device更新逻辑
|
2025-03-12 16:29:38 +08:00 |
|
ChenYi
|
41229051b1
|
Merge branch 'feature_定时抄读_CY' into dev
|
2025-03-12 14:58:00 +08:00 |
|
ChenYi
|
8f2aeee59f
|
Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev
|
2025-03-12 14:57:52 +08:00 |
|
ChenYi
|
db96b72482
|
定时采集服务完善
|
2025-03-12 14:57:42 +08:00 |
|
|
|
33a2901d74
|
标准协议解析
|
2025-03-12 13:39:26 +08:00 |
|
ChenYi
|
ead1696059
|
优化TCP ClientId，将数据ClinetId改为集中器编号
|
2025-03-12 09:58:37 +08:00 |
|
