dev #4

Merged
admin merged 158 commits from dev into master 2025-05-20 05:39:26 +00:00

158 Commits

Author SHA1 Message Date
ChenYi
87dd6be681 降低增量源码生成器依赖库版本号为4.11.0 2025-05-20 11:56:37 +08:00
cli
d958c32054 update 2025-05-19 15:53:49 +08:00
cli
4ad705d645 修改临时dockerfile 2025-05-19 15:46:12 +08:00
cli
2d936e10ca 修改代码 2025-05-19 15:45:02 +08:00
cli
6124131313 添加临时dockerfile 2025-05-19 15:07:52 +08:00
cli
c3f940fd7b dockerfile 2025-05-19 10:13:33 +08:00
cli
d66d9940bf 修改dockerfile 2025-05-19 10:12:31 +08:00
cli
252e93bbfc 添加主程序解决方案文件 2025-05-19 10:08:35 +08:00
75b6da16a0 Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-05-19 08:51:40 +08:00
ba92a3d604 打开注释的订阅信息,优化电表信息未缓存不保存数据,仅保存日志 2025-05-19 08:51:10 +08:00
cli
97bdcb238a Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-05-19 08:38:13 +08:00
cli
15308fe2d7 添加正式环境配置文件 2025-05-19 08:38:09 +08:00
070173af4f 增加TCP 客户端主动关闭监听 2025-05-18 17:18:31 +08:00
ChenYi
9603b02532 优化报文数据构建 2025-05-18 17:14:30 +08:00
ChenYi
921973e5d4 优化IoTDB数据驱动 2025-05-18 16:04:23 +08:00
ChenYi
17df6af4f0 优化结构 2025-05-18 14:10:39 +08:00
ChenYi
17e36f5a56 迁移服务搭建 2025-05-18 13:36:11 +08:00
3bb691b312 调整判断 2025-05-16 14:57:48 +08:00
63a6ace884 修复透明转发回来匹配表信息问题 2025-05-16 13:47:54 +08:00
99e19428a1 解决冲突 2025-05-16 09:25:38 +08:00
ChenYi
d87f7a2c41 解决IoTDB驱动单测点数据模型元组可空类型元素映射失败的问题。 2025-05-16 09:22:54 +08:00
ChenYi
6d95430b63 修复IoTDB驱动decimal类型解析赋值异常的问题 2025-05-15 23:59:10 +08:00
a772396bba 提交代码 2025-05-15 16:24:05 +08:00
900075adf8 Merge branch 'zhy_feat_dev_v10' into dev 2025-05-15 15:26:00 +08:00
b5af5c9cce 暂存代码 2025-05-15 15:18:56 +08:00
52207a92fa Merge branch 'zhy_feat_dev_v10' into dev 2025-05-15 14:35:12 +08:00
88c4a883a6 修改代码 2025-05-15 14:34:44 +08:00
ChenYi
1b5b43fde6 修改代码 2025-05-15 14:05:18 +08:00
ChenYi
fcf4b0c852 Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-05-15 11:23:12 +08:00
ChenYi
e0c7ceab32 三相表断闸合闸 2025-05-15 11:23:08 +08:00
84bb1a9563 Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-05-15 09:53:43 +08:00
3e10a31840 调整事件类型定义 2025-05-15 09:51:50 +08:00
ChenYi
e02a0953e9 完善3761下行透明转发处理逻辑 2025-05-14 23:28:44 +08:00
ChenYi
be3cd5d3e7 优化异常捕捉,修复IoTDBEntity基类属性异常的问题 2025-05-14 17:41:39 +08:00
ChenYi
ba0af3a12a 合并代码 2025-05-14 15:21:59 +08:00
ChenYi
ee0b48afbd 修改代码 2025-05-14 15:21:33 +08:00
483590534a 调整代码 2025-05-14 15:20:26 +08:00
ChenYi
94ff58dd12 完善Kafka主题消息消费订阅 2025-05-14 14:40:34 +08:00
ChenYi
9df3f652f9 合并代码 2025-05-14 11:34:18 +08:00
ChenYi
f73254e04f 优化IoTDB查询条件处理,使用委托进行实现值类型转换拼接 2025-05-14 11:33:31 +08:00
d99737c0e9 Merge branch 'zhy_feat_dev_v10' into dev 2025-05-14 08:32:28 +08:00
a62284005a 调整代码 2025-05-14 08:32:04 +08:00
f11857367a Merge branch 'zhy_feat_dev_v10' into dev 2025-05-13 17:49:56 +08:00
2e1115c655 优化取设备信息统一取redis 2025-05-13 17:49:12 +08:00
cli
2e58aecc2a Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-05-13 17:02:09 +08:00
cli
5f7ba73575 添加生产环境配置文件 2025-05-13 17:02:03 +08:00
ChenYi
35c483d3e3 合并代码 2025-05-13 14:52:05 +08:00
ChenYi
c4d4337673 修改设备缓存信息Redis存储结构 2025-05-13 14:51:38 +08:00
cli
f1f5e82171 合并 2025-05-13 08:31:01 +08:00
ChenYi
13fd36c647 Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-05-12 23:18:26 +08:00
ChenYi
705a5cbbf7 新增设备缓存信息Redis数据结构 2025-05-12 23:18:02 +08:00
5b4673adef 优化iotdb 存储 2025-05-12 17:24:47 +08:00
fed56f33ff Merge branch 'dev' into zhy_feat_dev_v10 2025-05-12 17:09:52 +08:00
ChenYi
fa84f42ca2 修复IoTDB可空类型转换赋值失败的问题 2025-05-12 17:08:09 +08:00
ff52fdc46a 优化存储 2025-05-12 16:48:45 +08:00
a8da939ba4 Merge branch 'dev' into zhy_feat_dev_v10 2025-05-12 16:10:44 +08:00
dac7865938 优化保存IOTDB日志做DataType区分 2025-05-12 16:09:53 +08:00
ChenYi
1c8d672170 Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-05-12 15:14:44 +08:00
ChenYi
eaf6f22bdc 修复IoTDB查询映射类型异常的问题 2025-05-12 15:14:19 +08:00
3ca548ef96 Merge branch 'zhy_feat_cev_v8' into dev 2025-05-12 14:03:03 +08:00
529623a232 解析所有日志保存到iotdb 2025-05-12 14:02:22 +08:00
ChenYi
80b8942d9d 优化代码 2025-05-12 11:20:50 +08:00
ChenYi
e35172d69f 优化代码 2025-05-12 10:14:08 +08:00
陈益
cf9bf6c210 完善Redis缓存封装 2025-05-11 21:53:55 +08:00
acd0a5c155 Merge branch 'dev' into zhy_feat_cev_v8 2025-05-11 10:43:54 +08:00
57148f3189 代码暂存 2025-05-11 10:42:55 +08:00
ChenYi
f6130e1d0b 优化IoTDB驱动,实现30个字段实体的270W任务数据开发环境处理平均耗时在70秒 2025-05-09 17:54:52 +08:00
cli
72b44632cd 合并 2025-05-09 14:00:30 +08:00
cli
ae2c0b1839 暂存 2025-05-09 14:00:05 +08:00
ChenYi
541c118dbb 修复IoTDB驱动适配增量源码生成器以后,单侧点模式失效的问题 2025-05-08 22:44:01 +08:00
8d1fc46e8f 修改代码 2025-05-08 17:33:07 +08:00
ChenYi
bdfc8eabae 合并代码 2025-05-08 17:22:06 +08:00
ChenYi
fa593de754 完善IoTDB驱动,适配增量源码生成器 2025-05-08 17:21:20 +08:00
1a9d3924b0 优化终端日历时钟解析 2025-05-08 17:20:07 +08:00
75efbb3a36 调试增加否认帧打印 2025-05-08 15:51:25 +08:00
3488b0012a 解析错误数据保存NULL 2025-05-08 15:12:37 +08:00
ChenYi
c03207aa21 优化增量源码生成器和IoTDB驱动 2025-05-08 14:42:13 +08:00
91386007ae 测试下发更改发为字节 2025-05-08 11:58:26 +08:00
245c91c9e3 添加测试下发 2025-05-08 11:25:08 +08:00
ChenYi
db7384ae74 完善增量源码生成器 2025-05-08 11:17:43 +08:00
ChenYi
edecbc386e 完善数据通道数据处理,解决数据丢失的问题。 2025-05-08 10:28:23 +08:00
a5ed0a37a0 修改代码 2025-05-08 09:29:31 +08:00
7a18dc4df9 统一字段名称 2025-05-08 09:25:41 +08:00
0de5177472 统一解析字段名称 2025-05-08 09:25:17 +08:00
ChenYi
ac226110cd 合并代码 2025-05-08 08:48:09 +08:00
ChenYi
f71ce3bacb 完善增量源码生成器 2025-05-08 08:43:37 +08:00
ChenYi
c47ee94469 修改代码 2025-05-07 17:27:37 +08:00
ChenYi
ff517664fe 复杂类型增量源生成器 2025-05-07 17:20:10 +08:00
0328aa08d9 提交代码 2025-05-07 17:10:02 +08:00
ChenYi
6b012d9303 完善复杂类型增量源码生成器 2025-05-07 16:37:26 +08:00
cdcf078e5a 优化消费流程 2025-05-07 15:17:54 +08:00
1ae875606f 优化代码 2025-05-07 11:55:26 +08:00
34d4bc0b8f 优化376.1协议插件解析 2025-05-07 11:53:50 +08:00
ChenYi
bca7202558 优化复杂类型增量源生成器 2025-05-07 10:15:45 +08:00
1718a0afa7 调整代码 2025-05-07 08:37:57 +08:00
ChenYi
53e6bb252a 修复15分钟任务Kafka主题异常的问题,新增增量源码工厂类 2025-05-06 23:46:12 +08:00
be4c25519d 优化解析,移除不必要的DTO 2025-05-06 19:25:15 +08:00
1e85f894a8 优化kafka发布消息 2025-05-06 18:41:23 +08:00
c4335aa3b7 修改代码 2025-05-06 15:28:00 +08:00
f96eb27353 修改代码 2025-05-06 15:21:31 +08:00
09de209a7c Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-05-06 14:35:17 +08:00
ChenYi
01264dd3ec 优化数据通道读取速度,并推送Kafka 2025-05-06 14:33:49 +08:00
94f36cfa62 调整透明转发解析 2025-05-06 14:33:12 +08:00
53fa6f503c Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-04-30 17:26:27 +08:00
9ccd016bc0 Merge branch 'zhy_feat_cev_v7' into dev 2025-04-30 17:26:04 +08:00
e1e6398348 统一时标类型 2025-04-30 17:25:35 +08:00
ChenYi
0d2bfdc33c 优化数据通道管理 2025-04-30 17:11:09 +08:00
ChenYi
fd9e3e5af3 Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-04-30 15:58:08 +08:00
ChenYi
ede7c8f1bb 实现IoTDB平均每分钟写入120万数据。 2025-04-30 15:57:14 +08:00
318dd2dcbe Merge branch 'zhy_feat_cev_v7' into dev 2025-04-30 15:18:05 +08:00
92b9cb37c1 修改代码 2025-04-30 15:17:51 +08:00
4bde9be137 Merge branch 'zhy_feat_cev_v7' into dev 2025-04-30 15:14:46 +08:00
a70cf4b7ce kafka优化异常重试 2025-04-30 15:14:23 +08:00
ChenYi
5ba1325204 Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-04-30 12:37:01 +08:00
ChenYi
f63cf8abe8 任务数据构建改为通道实现 2025-04-30 12:36:54 +08:00
a97421a00e kafka 订阅验证分区数 2025-04-30 10:35:26 +08:00
0c51c0d854 Merge branch 'zhy_feat_cev_v7' into dev 2025-04-30 09:51:37 +08:00
4e30cc13f1 修复kafka基准测试 2025-04-30 09:50:50 +08:00
ChenYi
8bfc6fa6df 新增数据通道管理服务 2025-04-29 23:55:53 +08:00
ChenYi
5890b16570 Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-04-29 23:48:57 +08:00
ChenYi
52a7da69e9 优化任务数据创建逻辑,改为上一个任务时间为待采集点 2025-04-29 23:48:47 +08:00
b0bbf67f87 Merge branch 'zhy_feat_cev_v7' into dev 2025-04-29 11:44:50 +08:00
f020d456d5 优化返回消息体都增加消息ID 2025-04-29 11:43:16 +08:00
ChenYi
d97e38439a 修复问题 2025-04-29 10:12:09 +08:00
ChenYi
cc8465ec77 合并 2025-04-29 10:03:59 +08:00
ChenYi
f457e140f6 日志添加类型 2025-04-29 10:02:10 +08:00
981d948255 修改代码 2025-04-29 09:42:45 +08:00
0937490f05 代码合并 2025-04-29 09:19:46 +08:00
4f1814b8df 协议解析优化
策略模式回调采用Action方式灵活处理
2025-04-29 09:16:48 +08:00
ChenYi
083a28f7af 调整源码生成器结构 2025-04-29 09:14:58 +08:00
陈益
5c19d02fdd 解决源码生成失败的问题 2025-04-28 22:35:19 +08:00
ChenYi
0b2f2447c5 修改代码 2025-04-28 17:45:00 +08:00
ChenYi
1c1ad56408 修改代码 2025-04-28 17:01:28 +08:00
ChenYi
d18f60f9a7 解决IoTDB写入速度过慢的问题 2025-04-28 16:37:31 +08:00
ChenYi
021153a319 源码生成器应用 2025-04-28 14:07:51 +08:00
ChenYi
cab0e1ed08 增量源码生成 2025-04-28 09:53:45 +08:00
ChenYi
c5c428f551 Merge branch 'feature_定时抄读_18_CY' into dev 2025-04-27 17:27:45 +08:00
ChenYi
8eb99b683a 日冻结,月冻结数据处理 2025-04-27 17:27:04 +08:00
31edca94fb Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-04-27 17:24:01 +08:00
5b1c393cc0 调整代码 2025-04-27 17:23:26 +08:00
ChenYi
8c6fe78739 Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-04-27 16:32:18 +08:00
ChenYi
33c8fa6209 完善默认端到云协议插件处理,改用配置项 2025-04-27 16:32:03 +08:00
cli
64ca50e39e 修改 2025-04-27 16:24:51 +08:00
cli
f5ac33e28b 修好正式环境连接字符 2025-04-27 16:03:49 +08:00
ChenYi
966172ea0f 修复依赖引入 2025-04-27 15:55:40 +08:00
cli
f9bf6f5263 修改解决方案文件 2025-04-27 15:53:33 +08:00
a3a4952147 代码合并 2025-04-27 15:49:23 +08:00
2ee205d00b 代码暂存 2025-04-27 15:44:54 +08:00
ChenYi
13f055a3e5 Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-04-27 15:44:17 +08:00
ChenYi
e7ff709a68 修改代码 2025-04-27 15:44:13 +08:00
ChenYi
8f64c3aa5b Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-04-27 15:43:16 +08:00
ChenYi
83cd2f6fc6 合并代码 2025-04-27 15:36:43 +08:00
ChenYi
d27351cb4c 合并代码 2025-04-27 15:32:44 +08:00
ChenYi
b1ccb874a7 升级依赖 2025-04-27 15:30:45 +08:00
cli
13d16903b7 更新配置文件 2025-04-27 14:24:06 +08:00
cli
b34b71e0c5 增加独立sln文件 2025-04-27 14:15:08 +08:00
cli
6f098b4598 Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev 2025-04-27 14:10:14 +08:00
cli
496ae0c797 添加打包脚本和dockerfile 2025-04-27 14:09:58 +08:00