hardstylewyl
|
47ac6e23b1
|
Merge branch 'S07' into test
|
2025-06-24 09:16:46 +08:00 |
|
hardstylewyl
|
54175b1e5f
|
update-package:7.0.22->7.0.23
|
2025-06-24 09:14:40 +08:00 |
|
hardstylewyl
|
463f830eec
|
add-param:增加模板内容查询的参数，包含轨迹内容的配置信息
|
2025-06-24 09:14:30 +08:00 |
|
hardstylewyl
|
db1c4005b1
|
Merge branch 'S07' into test
|
2025-06-23 10:55:37 +08:00 |
|
hardstylewyl
|
447a0ce41a
|
fix:修复多余的ES Version映射，
Version只用于获取而不是设置，同时也不会在_source中出现
|
2025-06-23 10:54:57 +08:00 |
|
hardstylewyl
|
6b29a22e1c
|
Merge branch 'S07' into test
|
2025-06-19 16:30:38 +08:00 |
|
hardstylewyl
|
a9c610e79f
|
perf:新增/修改轨迹删除冗余的最后一次延时,提升性能
|
2025-06-19 16:30:10 +08:00 |
|
hardstylewyl
|
33c3df11b0
|
Merge branch 'S07' into test
|
2025-06-19 15:59:47 +08:00 |
|
hardstylewyl
|
3d162cf997
|
fix:修复预警计算记录链路逻辑错误
|
2025-06-19 15:59:03 +08:00 |
|
hardstylewyl
|
fee0768853
|
update:调整轨迹相关数据的ES初始化
|
2025-06-16 14:58:13 +08:00 |
|
hardstylewyl
|
c5695dda2f
|
perf:根据指导建议优化性能
|
2025-06-12 14:35:46 +08:00 |
|
hardstylewyl
|
4f5a9c2eb7
|
Merge branch 'S07' into test
|
2025-06-12 10:21:31 +08:00 |
|
hardstylewyl
|
5e43bf37f8
|
perf:GC调优System.GC.RetainVM:true，关闭librdkafka的日志，以减少内存占用
|
2025-06-11 11:00:02 +08:00 |
|
hardstylewyl
|
04d7cf1860
|
Merge branch 'S07' into test
# Conflicts:
# src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj
|
2025-06-06 10:07:52 +08:00 |
|
hardstylewyl
|
b1ee25ec06
|
add-param:推送完成结果广播增加接口通请求服务商后结果数
|
2025-06-06 09:17:32 +08:00 |
|
hardstylewyl
|
2ff8132ace
|
update-package:7.0.21->7.0.22
|
2025-06-06 09:11:08 +08:00 |
|
hardstylewyl
|
cccced2432
|
add-param:增加轨迹推送完成广播字段补充
|
2025-06-06 09:08:47 +08:00 |
|
hardstylewyl
|
b95be95910
|
add-options:增加飞书配置节
|
2025-06-05 18:04:02 +08:00 |
|
hardstylewyl
|
0a4103abf5
|
refactor:重构预警通知，用户中心只使用站内信功能，接入飞书第三方库，直接调用飞书调用发送接口
|
2025-06-05 17:45:50 +08:00 |
|
hardstylewyl
|
ab348a0707
|
update-package:7.0.20->7.0.21
|
2025-06-05 14:44:42 +08:00 |
|
hardstylewyl
|
64911d9394
|
add-param:推送完成结果广播增加接口通请求服务商后结果数据
|
2025-06-05 14:43:58 +08:00 |
|
hardstylewyl
|
4eb1a9872f
|
add-interface:增加轨迹推送记录高级查询接口
|
2025-06-05 11:33:09 +08:00 |
|
hardstylewyl
|
e2e4aa3948
|
update-package:7.0.19->7.0.20
|
2025-05-29 18:07:22 +08:00 |
|
hardstylewyl
|
8b05958ec5
|
add-interface:增加轨迹推送记录高级查询接口
|
2025-05-29 18:06:03 +08:00 |
|
hardstylewyl
|
55e7c48b49
|
add-param:增加轨迹变更广播参数
- 补充目的地时区
|
2025-05-27 14:29:09 +08:00 |
|
hardstylewyl
|
857b695d0e
|
clean:清理原本地异步模式的预警计算代码
|
2025-05-23 15:38:49 +08:00 |
|
hardstylewyl
|
24d08cbc84
|
pref:轨迹推送配置补充支持只使用时间格式化
add-validation:增加推送配置新增/更新的格时间格式化模板验证
- 在时间和时区模式下，不允许只输入时区模板
|
2025-05-23 15:21:20 +08:00 |
|
hardstylewyl
|
720c342dfb
|
option:启动优化模式
|
2025-05-22 15:41:49 +08:00 |
|
hardstylewyl
|
03c5d43578
|
build:补充kafkalib库的包含
|
2025-05-22 15:09:53 +08:00 |
|
hardstylewyl
|
584a1ca437
|
refactor:重构预警Kafka处理，以确保服务器受支持
|
2025-05-22 10:26:59 +08:00 |
|
hardstylewyl
|
555baa259d
|
Merge branch 'S07' into test
|
2025-05-16 16:21:09 +08:00 |
|
hardstylewyl
|
25eb439324
|
option:启用RabbitMQ的发布确认模式，提高投递消息的可靠性
|
2025-05-16 16:20:57 +08:00 |
|
hardstylewyl
|
22080431b7
|
fix:修复缺失主数据枚举描述不正确
|
2025-05-15 15:36:45 +08:00 |
|
hardstylewyl
|
71315a07fd
|
debug:增加测试kafka库代码
|
2025-05-14 10:47:50 +08:00 |
|
hardstylewyl
|
1dfe434aee
|
option:优化选项设置为可选项
|
2025-05-13 17:12:09 +08:00 |
|
hardstylewyl
|
a8bbce208f
|
option:关闭预警优化
|
2025-05-13 15:50:40 +08:00 |
|
hardstylewyl
|
19c6e01904
|
option:尝试启动优化1
|
2025-05-13 15:42:16 +08:00 |
|
hardstylewyl
|
ab43747ace
|
change-config:移除rid配置
|
2025-05-13 15:13:32 +08:00 |
|
hardstylewyl
|
225e73deae
|
check:增加启动版本检查
|
2025-05-13 15:12:33 +08:00 |
|
hardstylewyl
|
ba340e34f8
|
option:关闭预警信号优化
|
2025-05-13 14:30:03 +08:00 |
|
hardstylewyl
|
3d3fc151fa
|
option:指定RID尝试启用预警信号优化
|
2025-05-13 14:25:22 +08:00 |
|
hardstylewyl
|
4fb657ed13
|
option:关闭预警信号优化模式
|
2025-05-13 11:30:56 +08:00 |
|
hardstylewyl
|
cecc28af71
|
option:启用NewtonsoftJson序列化的方式预警信号消息
|
2025-05-13 11:24:51 +08:00 |
|
hardstylewyl
|
99ba220951
|
options:消息序列化增加NewtonsoftJson和ProtoBuf的支持
|
2025-05-13 11:23:21 +08:00 |
|
hardstylewyl
|
8dcff695a4
|
option:剔除掉不必要的Redis客户端库
|
2025-05-13 10:42:58 +08:00 |
|
hardstylewyl
|
9bbefafcda
|
rollback:暂时回退5.9的更改
|
2025-05-12 16:38:09 +08:00 |
|
hardstylewyl
|
16d425d2e3
|
option:降级Confluent.Kafka.Core版本1.0.5=>1.0.0
|
2025-05-12 16:28:26 +08:00 |
|
hardstylewyl
|
5dd423f136
|
perf:接入kafka优化预警计算批处理，使其具有高吞吐高效处理的优点
|
2025-05-12 15:45:49 +08:00 |
|
hardstylewyl
|
aed09e5347
|
change-name:轨迹信号更名为预警信号
- TrackSignal => WarningSignal
|
2025-05-09 17:41:30 +08:00 |
|
hardstylewyl
|
1a1f453073
|
change-namespace:预警信号模型移动文件夹，迁移命名空间
|
2025-05-07 14:54:22 +08:00 |
|
hardstylewyl
|
6a2af2d2cb
|
Merge branch 'S07' into test
|
2025-05-07 10:05:38 +08:00 |
|
hardstylewyl
|
d0c1ee8bc5
|
fix:修复修改轨迹推送配置后引发的预警计算没有处于事务之后进行
|
2025-05-07 09:51:02 +08:00 |
|
hardstylewyl
|
c163a3bcc7
|
fix:修复因使用Task.Run丢失的预警处理异常上报
|
2025-05-06 15:50:05 +08:00 |
|
hardstylewyl
|
be25b8e10d
|
clean:清理回传预警处理单条记录回调，清理回传预警明细不必要的方法
|
2025-05-06 15:49:55 +08:00 |
|
hardstylewyl
|
c4732e711c
|
Merge branch 'S07' into test
|
2025-05-06 14:16:14 +08:00 |
|
hardstylewyl
|
cab1e9a60d
|
perf:优化轨迹信号模型，减少不必要的类型转换
|
2025-05-06 14:15:36 +08:00 |
|
hardstylewyl
|
903a44ceaa
|
Merge branch 'S07' into test
|
2025-04-30 10:56:15 +08:00 |
|
hardstylewyl
|
3c202c2a1f
|
fix:调整订单拉取成功添加轨迹时轨迹明细存储的第三方单号改为主单单号
|
2025-04-30 10:53:30 +08:00 |
|
hardstylewyl
|
2a13defcc6
|
Merge branch 'S07' into test
|
2025-04-27 11:29:25 +08:00 |
|
hardstylewyl
|
ca60feccb5
|
fix:修复全量推送轨迹，历史中如果扩展为空取值异常的问题
|
2025-04-27 11:25:28 +08:00 |
|
hardstylewyl
|
12bde27276
|
Merge branch 'S07' into test
|
2025-04-27 11:18:27 +08:00 |
|
hardstylewyl
|
a1ae86dcfb
|
perf:优化轨迹删除为批量，优化空入参
|
2025-04-27 11:17:59 +08:00 |
|
hardstylewyl
|
37e9fd1d91
|
Merge branch 'S07' into test
|
2025-04-25 11:57:14 +08:00 |
|
hardstylewyl
|
87b9976ab2
|
perf:优化轨迹状态，子系统名称，客户简称的查询为其增加多级缓存，以短期的数据不一致为代价
|
2025-04-25 11:51:38 +08:00 |
|
hardstylewyl
|
d2a02eaace
|
Merge branch 'S07' into test
|
2025-04-24 10:07:58 +08:00 |
|
hardstylewyl
|
ccb412d5f6
|
fix:去除使用OSSHelper时去除掉OssKey为空的调用，修复空字符串异常
|
2025-04-24 10:07:07 +08:00 |
|
hardstylewyl
|
0b860d03d2
|
Merge branch 'S07' into test
|
2025-04-23 15:00:45 +08:00 |
|
hardstylewyl
|
67b7c75d4a
|
option:补充对FBA兼容性的处理2
|
2025-04-23 14:59:09 +08:00 |
|
hardstylewyl
|
eef228752d
|
option:补充对FBA兼容性的处理
|
2025-04-23 14:57:45 +08:00 |
|
hardstylewyl
|
c3648c4533
|
Merge branch 'S07' into test
|
2025-04-23 14:53:01 +08:00 |
|
hardstylewyl
|
f1806ae4f3
|
fix：修复tracks为空的bug导致轨迹新增/修改不成功
|
2025-04-23 14:52:32 +08:00 |
|
hardstylewyl
|
27e5524369
|
Merge branch 'S07' into test
|
2025-04-23 14:45:23 +08:00 |
|
hardstylewyl
|
be4723569f
|
option:暂时容忍FBA修改时区只通过时间来匹配轨迹
|
2025-04-23 14:44:57 +08:00 |
|
hardstylewyl
|
8e85392721
|
Merge branch 'S07' into test
|
2025-04-21 14:05:59 +08:00 |
|
hardstylewyl
|
1d854ba16d
|
fix:补充轨迹广播NewExtra参数缺失
|
2025-04-21 13:05:53 +08:00 |
|
hardstylewyl
|
1457172a93
|
fix:修复强制推送参数失效的问题
|
2025-04-18 15:36:32 +08:00 |
|
hardstylewyl
|
c187c88d7b
|
Merge branch 'S07' into test
|
2025-04-17 16:50:06 +08:00 |
|
hardstylewyl
|
3783608594
|
fix:修复轨迹比较字段的验证忽略了NewExtra的问题
|
2025-04-17 16:49:47 +08:00 |
|
hardstylewyl
|
63e0b4c848
|
Merge branch 'S07' into test
# Conflicts:
# src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj
|
2025-04-17 15:51:55 +08:00 |
|
hardstylewyl
|
dc257cf49b
|
fix:修复针对于使用EsId修改轨迹的验证，使其正常运行工作
|
2025-04-17 15:50:29 +08:00 |
|
hardstylewyl
|
922bd08a11
|
update-package:7.0.18->7.0.19
|
2025-04-17 14:44:57 +08:00 |
|
hardstylewyl
|
cb3edd43b3
|
Merge branch 'S07' into test
|
2025-04-16 15:04:37 +08:00 |
|
hardstylewyl
|
c4a880c7f3
|
perf:优化链路追踪
|
2025-04-16 15:04:24 +08:00 |
|
hardstylewyl
|
0508ecce9a
|
Merge branch 'S07' into test
|
2025-04-16 14:45:15 +08:00 |
|
hardstylewyl
|
3754558dce
|
fix:修复链路追踪
|
2025-04-16 14:44:08 +08:00 |
|
hardstylewyl
|
941147a78e
|
Merge branch 'S07' into test
|
2025-04-16 11:00:03 +08:00 |
|
hardstylewyl
|
bcd4ad5781
|
add-trace:增加链路追踪
- 新增/修改轨迹
- 新增/修改轨迹事件处理跳过
- 推送拦截失败
|
2025-04-16 10:59:21 +08:00 |
|
hardstylewyl
|
5641202e2f
|
Merge branch 'S07' into test
|
2025-04-15 16:57:56 +08:00 |
|
hardstylewyl
|
24a80c7a50
|
fix:修复批量新增推送记录缺失创建时间
|
2025-04-15 16:57:37 +08:00 |
|
hardstylewyl
|
32914e4670
|
Merge branch 'S07' into test
|
2025-04-15 09:37:44 +08:00 |
|
hardstylewyl
|
3bbd633259
|
fix:补充轨迹新增/修改事件处理同步前置验证逻辑
|
2025-04-15 09:35:18 +08:00 |
|
hardstylewyl
|
d94d043ffb
|
Merge branch 'S07' into test
|
2025-04-14 09:49:58 +08:00 |
|
hardstylewyl
|
2c4a643de9
|
fix:修复轨迹新增/修改验证逻辑
|
2025-04-14 09:49:23 +08:00 |
|
hardstylewyl
|
f46a6fb312
|
Merge branch 'S07' into test
|
2025-04-11 17:40:06 +08:00 |
|
hardstylewyl
|
80ee762f06
|
add-params:中台获取轨迹明细接口，增加排序参数
update-interface:Track/Query，Track/QueryV2
- 增加支持按创建时间升序降序
|
2025-04-11 17:39:44 +08:00 |
|
hardstylewyl
|
081214b901
|
Merge branch 'S07' into test
|
2025-04-11 17:20:02 +08:00 |
|
hardstylewyl
|
581de918bc
|
add-params:增加新增修改轨迹新扩展信息参数,目的是为了修改扩展信息
fix:完善轨迹新增/修改验证
|
2025-04-11 17:19:37 +08:00 |
|
hardstylewyl
|
dd1d041e3f
|
fix：修复提供接口轨迹查询排序根据转化后的utc0来排序
|
2025-04-11 15:35:41 +08:00 |
|
hardstylewyl
|
ea080314c5
|
fix:补充修改规则主体或后代内容时生成新的版本号
|
2025-04-10 15:24:27 +08:00 |
|
hardstylewyl
|
a5718f9529
|
Merge branch 'S07' into test
|
2025-04-10 14:44:33 +08:00 |
|
hardstylewyl
|
7b692553d2
|
fix:修复删除轨迹引起的订单更新缺失轨迹状态
|
2025-04-10 14:44:18 +08:00 |
|
hardstylewyl
|
83464c2abf
|
Merge branch 'S07' into test
|
2025-04-10 14:35:46 +08:00 |
|
hardstylewyl
|
8c7a1c5fc1
|
perf:优化完整预警计算，优化流程减少N+1
|
2025-04-10 14:35:30 +08:00 |
|
hardstylewyl
|
2119bdaa12
|
Merge branch 'S07' into test
|
2025-04-10 11:57:49 +08:00 |
|
hardstylewyl
|
d5b2bfd5ec
|
fix:增加对缺失轨迹为空的处理
|
2025-04-10 11:57:35 +08:00 |
|
hardstylewyl
|
0c1cca5a8d
|
Merge branch 'S07' into test
|
2025-04-10 09:17:29 +08:00 |
|
hardstylewyl
|
2c1b73c5f3
|
perf:优化运输时效预警，减少n+1问题
fix:修复新增轨迹运输时效预警计算逻辑错误
|
2025-04-10 09:16:50 +08:00 |
|
hardstylewyl
|
79561f0685
|
Merge branch 'S07' into test
|
2025-04-09 15:12:50 +08:00 |
|
hardstylewyl
|
c219a8ee20
|
fix:调整订单上的最新轨迹信息的维护，始终为轨迹发生时间最晚的
|
2025-04-09 15:12:32 +08:00 |
|
hardstylewyl
|
9db4210add
|
fix:修复最新轨迹为轨迹时间最晚的轨迹
|
2025-04-09 10:28:40 +08:00 |
|
hardstylewyl
|
b62527f337
|
options:将配置提取到外部
|
2025-04-03 15:59:16 +08:00 |
|
hardstylewyl
|
ddabbbd63c
|
Merge branch 'S07' into test
|
2025-04-02 09:23:08 +08:00 |
|
hardstylewyl
|
69aa048ae9
|
option:SJZY.UserCenter.HttpApi 3.1.8.17-alpha=>3.1.8.21
fix:修复通知配置消息来源为1
|
2025-04-02 09:22:51 +08:00 |
|
hardstylewyl
|
fc325c892c
|
Merge branch 'S07' into test
|
2025-04-01 17:19:35 +08:00 |
|
hardstylewyl
|
6831af22fe
|
option: 调用用户中心通知IsNeedToHandle false => true
|
2025-04-01 17:18:32 +08:00 |
|
hardstylewyl
|
d2ea3e94ff
|
Merge branch 'S07' into test
|
2025-04-01 16:24:45 +08:00 |
|
hardstylewyl
|
e93326914b
|
fix:修复运输预警状态计算的边界问题
|
2025-04-01 16:24:16 +08:00 |
|
hardstylewyl
|
b712d95b9a
|
Merge branch 'S07' into test
|
2025-04-01 14:54:54 +08:00 |
|
hardstylewyl
|
ce13941419
|
fix:修复完整预警在删除轨迹时维护预警明细
|
2025-04-01 14:54:45 +08:00 |
|
hardstylewyl
|
42dc20ec33
|
Merge branch 'S07' into test
|
2025-04-01 11:04:52 +08:00 |
|
hardstylewyl
|
1771fe399a
|
fix:修复运输时效预警状态逻辑
|
2025-04-01 11:04:43 +08:00 |
|
hardstylewyl
|
848ad3c1c6
|
Merge branch 'S07' into test
|
2025-04-01 10:42:20 +08:00 |
|
hardstylewyl
|
b5ee6396fd
|
fix:修复运输时效预警状态维护
|
2025-04-01 10:42:08 +08:00 |
|
hardstylewyl
|
5301fe1aec
|
Merge branch 'S07' into test
|
2025-04-01 10:27:03 +08:00 |
|
hardstylewyl
|
e004389413
|
fix:修复运输时效预警状态计算逻辑
|
2025-04-01 10:26:52 +08:00 |
|
hardstylewyl
|
e6eb3e6431
|
Merge branch 'S07' into test
|
2025-04-01 09:46:28 +08:00 |
|
hardstylewyl
|
e5956abbf7
|
fix:修复轨迹完整预警时新增轨迹可以导致明细的缺失轨迹状态发生变化
|
2025-04-01 09:29:07 +08:00 |
|
hardstylewyl
|
7b31da7cd0
|
clean:清理不必要的代码，修整todo
|
2025-03-31 16:03:33 +08:00 |
|
hardstylewyl
|
78933456c3
|
Merge branch 'S07' into test
|
2025-03-31 15:35:55 +08:00 |
|
hardstylewyl
|
a6b88ffbc9
|
fix:修复分页获取预警信息排序使用先按状态圣教序，在按创建时间倒序排序
|
2025-03-31 15:35:40 +08:00 |
|
hardstylewyl
|
04ff191560
|
Merge branch 'S07' into test
|
2025-03-31 14:52:29 +08:00 |
|
hardstylewyl
|
9cfa88f037
|
fix:修复运输时效预警明细的状态排序
|
2025-03-31 14:52:18 +08:00 |
|
hardstylewyl
|
934aef7340
|
Merge branch 'S07' into test
|
2025-03-31 10:32:19 +08:00 |
|
hardstylewyl
|
027b06b9d9
|
fix:修复预警明细的分页查询，不返回总数的bug
|
2025-03-31 10:32:06 +08:00 |
|
hardstylewyl
|
36514e11a0
|
Merge branch 'S07' into test
|
2025-03-31 10:10:47 +08:00 |
|
hardstylewyl
|
e034bbab38
|
fix:修复运输预警累计运输时间计算空值错误
|
2025-03-31 10:10:27 +08:00 |
|
hardstylewyl
|
a2ce295253
|
Merge branch 'S07' into test
|
2025-03-31 10:02:10 +08:00 |
|
hardstylewyl
|
8bd0108c10
|
fix:修复预警明细最新轨迹应查创建时间最新/最晚的轨迹，而不是轨迹发生时间最新/最晚
fix:修复运输时效预警明细起始轨迹和截止轨迹应取实际的状态中的最早轨迹，累计运输时间和状态都要动态参与计算
|
2025-03-31 10:01:58 +08:00 |
|
hardstylewyl
|
9440670511
|
Merge branch 'S07' into test
|
2025-03-28 17:53:38 +08:00 |
|
hardstylewyl
|
9d0b61ffe8
|
fix: 回传预警重试维护重试次数，避免并发冲突
fix: 完整预警缺失轨迹状态跟随订单实际的轨迹状态而变
|
2025-03-28 17:53:22 +08:00 |
|
hardstylewyl
|
88f9ea94f3
|
Merge branch 'S07' into test
|
2025-03-28 16:35:50 +08:00 |
|
hardstylewyl
|
7375295f7a
|
fix:运输时效预警累计运输时间补充时区信息
fix:运输时效预警已超时状态收到截止轨迹一定条件下可以变为已完成的状态，而不是超时完成
fix:接口通调用失败，直接变为完结，命中kpi考核的直接变为人工介入并进行通知，没命中的直接关闭
|
2025-03-28 16:25:57 +08:00 |
|
hardstylewyl
|
a8e7491432
|
Merge branch 'S07' into test
|
2025-03-28 09:32:58 +08:00 |
|
hardstylewyl
|
c63ead1bff
|
add-validation:增加运输时效规则场景的新增/修改校验
- 同一规则主体下，不允许出现因素完全相同的场景
fix:修复运输时效预警摘要中因素排序不正确
fix:修复新增修改轨迹没有更新订单主表的轨迹状态
|
2025-03-28 09:32:47 +08:00 |
|
hardstylewyl
|
7f567468f2
|
Merge branch 'S07' into test
|
2025-03-27 18:04:59 +08:00 |
|
hardstylewyl
|
9e48bbf9ac
|
change-validation:完整预警规则项目编辑（全量）验证
- 同一个主体下同一个检查点，订单类型不允许出现交集
|
2025-03-27 18:04:47 +08:00 |
|
hardstylewyl
|
a108fdbb94
|
Merge branch 'S07' into test
|
2025-03-27 16:41:25 +08:00 |
|
hardstylewyl
|
cb73040247
|
fix:修复预警通知消息模板内容异常
|
2025-03-27 16:40:54 +08:00 |
|
hardstylewyl
|
29ba189181
|
Merge branch 'S07' into test
|
2025-03-27 16:20:18 +08:00 |
|
hardstylewyl
|
8524fba5df
|
fix:修复运输时效预警规则配置删除异常
|
2025-03-27 16:20:02 +08:00 |
|