|
|
6ff97c1c0f
|
Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev
|
2025-05-20 16:53:48 +08:00 |
|
|
|
77eabfec5d
|
update
|
2025-05-20 16:53:36 +08:00 |
|
ChenYi
|
e806a127bf
|
Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev
|
2025-05-20 16:42:49 +08:00 |
|
ChenYi
|
a78b819233
|
完善编码映射
|
2025-05-20 16:41:58 +08:00 |
|
|
|
d9491b9b33
|
update
|
2025-05-20 15:59:31 +08:00 |
|
|
|
ead03c6361
|
修改数据库为测试环境
|
2025-05-20 15:31:53 +08:00 |
|
ChenYi
|
87dd6be681
|
降低增量源码生成器依赖库版本号为4.11.0
|
2025-05-20 11:56:37 +08:00 |
|
|
|
d958c32054
|
update
|
2025-05-19 15:53:49 +08:00 |
|
|
|
4ad705d645
|
修改临时dockerfile
|
2025-05-19 15:46:12 +08:00 |
|
|
|
2d936e10ca
|
修改代码
|
2025-05-19 15:45:02 +08:00 |
|
|
|
6124131313
|
添加临时dockerfile
|
2025-05-19 15:07:52 +08:00 |
|
|
|
c3f940fd7b
|
dockerfile
|
2025-05-19 10:13:33 +08:00 |
|
|
|
d66d9940bf
|
修改dockerfile
|
2025-05-19 10:12:31 +08:00 |
|
|
|
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 |
|
|
|
97bdcb238a
|
Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev
|
2025-05-19 08:38:13 +08:00 |
|
|
|
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 |
|