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 |
|
hardstylewyl
|
8c91dfbd5c
|
Merge branch 'S07' into test
|
2025-03-27 15:55:45 +08:00 |
|
hardstylewyl
|
ca35a86407
|
add-validation:补充运输预警规则项目编辑(全量)校验
- 不同项目间不能存在起始和截止都重复的
- 同一项目的起始和截止不允许重复
|
2025-03-27 15:55:35 +08:00 |
|
hardstylewyl
|
ef8212a89f
|
Merge branch 'S07' into test
|
2025-03-27 15:36:30 +08:00 |
|
hardstylewyl
|
c662d8e29a
|
fix:修复预警编辑（全量）新增通知对象保持修改不生效
|
2025-03-27 15:36:15 +08:00 |
|
hardstylewyl
|
a94503c56c
|
Merge branch 'S07' into test
|
2025-03-27 15:26:54 +08:00 |
|
hardstylewyl
|
8fff0bf03d
|
add-validation:完整预警规则编辑增加验证
- 多个预警规则项目中检查点轨迹状态不允许重复
|
2025-03-27 15:26:41 +08:00 |
|
hardstylewyl
|
25c76944fc
|
Merge branch 'S07' into test
|
2025-03-27 15:21:21 +08:00 |
|
hardstylewyl
|
78cfd9c083
|
fix:修复预警规则项目在调整配置项目新增时无法修改成功
option:预警通知IsNeedToHandle改为false
|
2025-03-27 15:21:09 +08:00 |
|
hardstylewyl
|
e9067685f2
|
Merge branch 'S07' into test
|
2025-03-27 11:58:04 +08:00 |
|
hardstylewyl
|
21e6d444a7
|
fix:修复预警通知查询改为全量查询，以保证正确的预警数量
|
2025-03-27 11:57:46 +08:00 |
|
hardstylewyl
|
3d1d0c969b
|
Merge branch 'S07' into test
|
2025-03-27 11:39:53 +08:00 |
|
hardstylewyl
|
bf3afe9480
|
fix:修复验证描述，修复预警通知消息体标题加在头部
|
2025-03-27 11:39:32 +08:00 |
|
hardstylewyl
|
3ca5e538de
|
refactor:时区格式化提取DateTimeHelper便于复用
|
2025-03-26 17:26:41 +08:00 |
|
hardstylewyl
|
91853802a4
|
Merge branch 'S07' into test
|
2025-03-26 16:44:10 +08:00 |
|
hardstylewyl
|
0b85005b57
|
add-params:补充删除轨迹请求的操作来源参数Source
|
2025-03-26 16:43:29 +08:00 |
|
hardstylewyl
|
0aef98243d
|
Merge branch 'S07' into test
|
2025-03-26 16:30:11 +08:00 |
|
hardstylewyl
|
468be5e7ed
|
fix:修复完整预警明细更新异常
|
2025-03-26 16:29:49 +08:00 |
|
hardstylewyl
|
ca9b5d4e02
|
Merge branch 'S07' into test
|
2025-03-26 16:05:39 +08:00 |
|
hardstylewyl
|
2ea627e985
|
fix:修复运输时效预警重复生成任务进而导致重复生成明细的问题
|
2025-03-26 16:05:20 +08:00 |
|
hardstylewyl
|
77939a0b70
|
Merge branch 'S07' into test
|
2025-03-26 15:42:42 +08:00 |
|
hardstylewyl
|
d474d3b008
|
fix:修复获取完整预警明细轨迹状态分割异常
|
2025-03-26 15:41:55 +08:00 |
|
hardstylewyl
|
2df9911cc1
|
fix:补充完整预警处理时间
|
2025-03-26 15:25:34 +08:00 |
|
hardstylewyl
|
e07beaf7ee
|
Merge branch 'S07' into test
|
2025-03-26 15:15:21 +08:00 |
|
hardstylewyl
|
c82aab9dd4
|
change-params:获取完整预警明细中的缺失轨迹参数类型更改V2
|
2025-03-26 15:15:06 +08:00 |
|
hardstylewyl
|
5fa8822e06
|
change-params:获取完整预警明细中的缺失轨迹参数类型更改
|
2025-03-26 15:08:31 +08:00 |
|
hardstylewyl
|
f29471e2b7
|
Merge branch 'S07' into test
|
2025-03-26 10:58:16 +08:00 |
|
hardstylewyl
|
0e88bd23fb
|
fix:修复完整预警命中规则逻辑缺失验证检查点状态
|
2025-03-26 10:58:08 +08:00 |
|
hardstylewyl
|
d4fa8d8dcc
|
Merge branch 'S07' into test
|
2025-03-26 10:02:54 +08:00 |
|
hardstylewyl
|
53723e87b6
|
chang-params:获取预警主体入参keywords变更为KpiName
|
2025-03-26 10:02:42 +08:00 |
|
hardstylewyl
|
dac79126e7
|
Merge branch 'S07' into test
|
2025-03-26 09:51:46 +08:00 |
|
hardstylewyl
|
c395261d2f
|
change-params:回传预警明细增加是否超时状态
add-validation: 约束回传预警中起始轨迹时间不能大于等于时效
change-validation:同步文档中预警时效范围配置
|
2025-03-26 09:51:29 +08:00 |
|
hardstylewyl
|
b503251dc5
|
Merge branch 'S07' into test
|
2025-03-25 17:11:19 +08:00 |
|
hardstylewyl
|
cfccd59ce1
|
fix:修复hangfire的redisKey前缀增加:号，并设置终止态任务只保留1小时
|
2025-03-25 17:11:10 +08:00 |
|
hardstylewyl
|
84edc5644e
|
change-params:预警规则主体查询增加客户id参数
|
2025-03-25 14:57:01 +08:00 |
|
hardstylewyl
|
1538b4bfe3
|
Merge branch 'S07' into test
|
2025-03-25 14:45:26 +08:00 |
|
hardstylewyl
|
261aa5110e
|
change-params:获取预警规则主体反参增加更新时间
|
2025-03-25 14:44:55 +08:00 |
|
hardstylewyl
|
f744a28c77
|
Merge branch 'S07' into test
|
2025-03-25 14:16:46 +08:00 |
|
hardstylewyl
|
8ae7e40421
|
update-validation:调整回传预警时效配置入参范围
|
2025-03-25 14:16:12 +08:00 |
|
hardstylewyl
|
f0ab245fff
|
Merge branch 'S07' into test
|
2025-03-25 11:03:52 +08:00 |
|
hardstylewyl
|
e61d225140
|
fix:修复回传成功也增加回传报文
fix:补充调用接口通失败也增加回传报文
add-interface:增加回传推送接口
|
2025-03-25 11:03:34 +08:00 |
|
hardstylewyl
|
b2c3b39665
|
Merge branch 'S07' into test
|
2025-03-24 18:04:47 +08:00 |
|
hardstylewyl
|
3b799baccf
|
fix:格式化回传预警时间跨度e.g 00天00小时00分钟 / --
|
2025-03-24 18:04:30 +08:00 |
|
hardstylewyl
|
1c30f43bc2
|
Merge branch 'S07' into test
|
2025-03-24 17:59:55 +08:00 |
|
hardstylewyl
|
331862f480
|
fix:格式化预警明细时区e.g GMT +8:00 / --
|
2025-03-24 17:59:34 +08:00 |
|
hardstylewyl
|
955ba93024
|
Merge branch 'S07' into test
|
2025-03-24 16:55:44 +08:00 |
|
hardstylewyl
|
52573a7c1d
|
add-validation:编辑运输时效规则配置(全量)
- 规则间轨迹状态不允许存在交集
|
2025-03-24 16:55:26 +08:00 |
|
hardstylewyl
|
f11acd8f88
|
Merge branch 'S07' into test
|
2025-03-24 16:23:36 +08:00 |
|
hardstylewyl
|
a4c5ad619c
|
fix:修复预警明细的排序逻辑
fix:修复预警主体重复性判断增加预警类型
|
2025-03-24 16:23:25 +08:00 |
|
hardstylewyl
|
c7137ed189
|
Merge branch 'S07' into test
|
2025-03-24 15:52:17 +08:00 |
|
hardstylewyl
|
d9751ecb34
|
fix:修复编辑运输预警配置项目时出错
|
2025-03-24 15:51:45 +08:00 |
|
hardstylewyl
|
693741e46d
|
fix:修复运输时效预警收到截止轨迹时判断状态顺序有误，导致最终状态异常
|
2025-03-24 15:32:25 +08:00 |
|
hardstylewyl
|
ecf221ed9f
|
Merge branch 'S07' into test
|
2025-03-24 14:49:17 +08:00 |
|
hardstylewyl
|
13dc04b252
|
fix:修复运输时效预警收到截止轨迹时的累计运输计算错误
|
2025-03-24 14:49:00 +08:00 |
|
hardstylewyl
|
f3da66267f
|
fix:修复规则配置描述格式错误
|
2025-03-24 14:38:03 +08:00 |
|
hardstylewyl
|
f49824a904
|
Merge branch 'S07' into test
|
2025-03-24 11:46:51 +08:00 |
|
hardstylewyl
|
569aeece66
|
fix:修复新增轨迹时轨迹内容为空字符串没有使用默认的轨迹内容
fix:修复运输时效预警明细最新轨迹发生地反参错误
|
2025-03-24 11:46:28 +08:00 |
|
hardstylewyl
|
d2dd8e6eb1
|
refactor:重构优化消除警告
|
2025-03-24 11:30:40 +08:00 |
|
hardstylewyl
|
57c697596b
|
Merge branch 'S07' into test
|
2025-03-24 10:44:00 +08:00 |
|
hardstylewyl
|
b93386d19c
|
fix: 运输时效预警
- 补充明细截止轨迹内容的更新
- 预警明细格式化时区显示
- 预警明细排序修复
- 明细始终存储起始轨迹状态的最早轨迹
- 场景规则变更同步更新预警明细
|
2025-03-24 10:43:34 +08:00 |
|
hardstylewyl
|
a56319d8b6
|
fix:修复按状态查询运输时效预警明细反参异常
- 由于已超时状态不实时维护，则需要查出即将超时的数据然后计算状态后在过滤
|
2025-03-24 09:23:49 +08:00 |
|
hardstylewyl
|
021952d98c
|
Merge branch 'S07' into test
|
2025-03-21 18:03:52 +08:00 |
|
hardstylewyl
|
9281d7b482
|
fix:修复收到截止轨迹运输预警明细状态修改有误
- 预警明细生成初始状态有误，可能一开始就为已超时状态
|
2025-03-21 18:03:39 +08:00 |
|
hardstylewyl
|
cc0120951a
|
Merge branch 'S07' into test
|
2025-03-21 17:48:42 +08:00 |
|
hardstylewyl
|
fcf1d88ff0
|
fix:修复因为精度导致的预警规则时效修改不成功
|
2025-03-21 17:48:22 +08:00 |
|
hardstylewyl
|
af6fb6506c
|
Merge branch 'S07' into test
|
2025-03-21 17:17:25 +08:00 |
|
hardstylewyl
|
8a137f7c33
|
fix:修复修改轨迹预警规则时效修改不成功
|
2025-03-21 17:16:54 +08:00 |
|
hardstylewyl
|
7794113a3a
|
Merge branch 'S07' into test
|
2025-03-21 16:35:09 +08:00 |
|
hardstylewyl
|
71b8d2c076
|
test-interface-change:
- 调整预警明细生成测试接口，扫描出来会关闭这个任务，防止重复执行
|
2025-03-21 16:34:29 +08:00 |
|
hardstylewyl
|
b75f21bc9d
|
Merge branch 'S07' into test
|
2025-03-21 16:17:58 +08:00 |
|
hardstylewyl
|
a254d735bf
|
fix:当订单变更为已完结是只关闭运输时效预警相关产物
fix:回传预警和完整预警只忽略不存在的订单
|
2025-03-21 16:17:28 +08:00 |
|
hardstylewyl
|
e7b432eab4
|
Merge branch 'S07' into test
|
2025-03-21 15:48:00 +08:00 |
|
hardstylewyl
|
7c1b4e67f8
|
fix:修复确保轨迹落盘后才引发预警计算
test-interface: 提供预警生成任务快捷执行接口
|
2025-03-21 15:47:35 +08:00 |
|
hardstylewyl
|
a3ae540a73
|
Merge branch 'S07' into test
|
2025-03-21 14:09:42 +08:00 |
|
hardstylewyl
|
e9c32bb4cb
|
fix:修复redis配置错误导致无法启动
|
2025-03-21 14:09:07 +08:00 |
|
hardstylewyl
|
44e3732e3d
|
Merge branch 'S07' into test
|
2025-03-21 11:44:24 +08:00 |
|
hardstylewyl
|
7ca8231070
|
fix:完整预警忽略完结状态
fix:通知任务只有等实际状态完成了才变为已关闭
|
2025-03-21 11:16:12 +08:00 |
|
hardstylewyl
|
43ff83191b
|
fix:修复新增轨迹缺失完整预警计算
|
2025-03-21 09:39:32 +08:00 |
|
hardstylewyl
|
426949c3f2
|
fix:修复运输预警更新明细字段缺失
|
2025-03-21 09:35:26 +08:00 |
|
hardstylewyl
|
3e5abd58a8
|
fix:修复回传时效预警明细日期范围查询错误
|
2025-03-20 17:18:04 +08:00 |
|
hardstylewyl
|
40bc881d91
|
fix:修复运输时效预警明细累计运输时间计算时机
|
2025-03-20 17:01:33 +08:00 |
|
hardstylewyl
|
28381c6441
|
perf:查询预警明细模型入参更新
- 订单号转化为数组，限制最大长度1000
|
2025-03-20 15:08:24 +08:00 |
|
hardstylewyl
|
7f938c5a7d
|
perf:对于空值使用 -- 填充处理
fix:运输时效预警
- 修复累计运输时间计算错误
- 修复运输预警明细的已超时状态被忽略
|
2025-03-20 14:32:33 +08:00 |
|
hardstylewyl
|
9615b6257e
|
fix:修复运输预警场景规则项目在没有任何变更时保存，直接跳过即可
|
2025-03-20 10:30:34 +08:00 |
|
hardstylewyl
|
653880fb37
|
perf:索引优化
- 预警规则主体添加联合索引(CustomId,SubSystemId)
- 运输预警明细生成任务索引调整
IDX_IsClosed_PlanExecutionTime=>IDX_PlanExecutionTime_IsClosed
refactor:运输时效场景中因素输入月份排序
|
2025-03-20 09:54:54 +08:00 |
|
hardstylewyl
|
554236af30
|
fix:轨迹订单删除或完结不要移除以下内容
- 预警通知任务
- 完整预警明细
|
2025-03-20 09:07:16 +08:00 |
|
hardstylewyl
|
ed3b7940c8
|
fix:补充反参运输时效场景反参
- AreaName 区域名称
|
2025-03-19 17:52:21 +08:00 |
|
hardstylewyl
|
d8aba5f7a9
|
fix:关闭csrfToken校验，使其可以正常访问
|
2025-03-19 17:27:24 +08:00 |
|
hardstylewyl
|
a599c51fcc
|
fix:尝试调整hangfire中间件顺序使其可以访问
|
2025-03-19 17:15:57 +08:00 |
|
hardstylewyl
|
ff30123859
|
fix:修复hangfire面板路径问题
|
2025-03-19 16:40:35 +08:00 |
|
hardstylewyl
|
93814112db
|
fix:提供hangfire匿名访问并支持所有权限
|
2025-03-19 15:57:58 +08:00 |
|
hardstylewyl
|
1ce016f945
|
fix-build: 修复using
|
2025-03-19 15:45:00 +08:00 |
|
hardstylewyl
|
16f89ed1c2
|
fix-build: 修复using
|
2025-03-19 15:41:43 +08:00 |
|
hardstylewyl
|
6b5742fa21
|
fix-build: 补充NotifyConfig
|
2025-03-19 15:39:44 +08:00 |
|
hardstylewyl
|
0d9e18be49
|
feat：轨迹预警初步完成（待优化）
|
2025-03-19 15:32:33 +08:00 |
|
hardstylewyl
|
99037a2da7
|
feat:优化预警仓储逻辑
|
2025-03-10 18:06:43 +08:00 |
|
hardstylewyl
|
e056585fc6
|
clean:清理项目，不改变功能逻辑
|
2025-03-10 14:29:53 +08:00 |
|
hardstylewyl
|
e06aa10898
|
change-entity: WarningNotifyTaskEntity
- rename: WarningRuleId => WarningRuleItemId
|
2025-03-10 14:21:49 +08:00 |
|
hardstylewyl
|
3a23817eb7
|
change-location:调整预警相关位置
|
2025-03-10 10:28:05 +08:00 |
|
hardstylewyl
|
f12a741100
|
fix:修复规则主体重复校验逻辑错误-2
|
2025-03-07 12:00:16 +08:00 |
|
hardstylewyl
|
ef055943f6
|
fix:修复规则主体重复校验逻辑错误
|
2025-03-07 11:54:36 +08:00 |
|
hardstylewyl
|
b4d98a5d89
|
fix:修复预警规则主体查询名称反参错误
add-param:增加预警规则主体反参
- CreateTime 创建时间
|
2025-03-06 17:22:02 +08:00 |
|
hardstylewyl
|
d8929fb41f
|
补充完整预警明细反参
- 缺失轨迹状态更改为id+描述
|
2025-03-06 14:15:56 +08:00 |
|
hardstylewyl
|
5053ede806
|
update-param:补充订单轨迹明细查询反参
- 轨迹状态Id
- 轨迹状态
|
2025-03-06 11:55:50 +08:00 |
|
hardstylewyl
|
b39de2a613
|
change-name: Country => CountryCode
feat:优化订单类型名称缓存逻辑
|
2025-03-06 09:23:24 +08:00 |
|
hardstylewyl
|
ccc300bd56
|
add-interface:增加运输时效规则场景删除接口
|
2025-03-05 16:21:22 +08:00 |
|
hardstylewyl
|
c8f82208cd
|
fix:修复预警明细es查询条件失效
|
2025-03-05 15:14:02 +08:00 |
|
hardstylewyl
|
c44c4e3af2
|
feat:预警迭代初步
|
2025-03-05 10:46:13 +08:00 |
|
hardstylewyl
|
25298dc494
|
sync-namespace:同步命名空间
|
2025-03-04 14:19:34 +08:00 |
|
hardstylewyl
|
3382bcff76
|
add-interface:
- 提供接口模型给前端开发使用
|
2025-03-03 10:22:23 +08:00 |
|
hardstylewyl
|
b28ac7c64f
|
Merge branch 'S07' into test
|
2025-02-26 09:46:38 +08:00 |
|
hardstylewyl
|
b53db5c7bf
|
fix:修复查询条件的可空类型使用错误
|
2025-02-26 09:46:27 +08:00 |
|
hardstylewyl
|
5e7f526d56
|
Merge branch 'S07' into test
|
2025-02-26 09:44:14 +08:00 |
|
hardstylewyl
|
36c2630101
|
update:分页获取轨迹内容放开轨迹状态id的限制，非必填
|
2025-02-26 09:43:52 +08:00 |
|
hardstylewyl
|
1e32b839fb
|
Merge branch 'S07' into test
# Conflicts:
# src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj
|
2025-02-25 09:33:26 +08:00 |
|
hardstylewyl
|
f291907667
|
update-package: 7.0.17 -> 7.0.18
- 修复abp接入调用失败
|
2025-02-25 09:32:25 +08:00 |
|
hardstylewyl
|
fc55f1d9a8
|
fix:修复轨迹内容服务
|
2025-02-24 16:20:33 +08:00 |
|
hardstylewyl
|
7f98e2739b
|
update-package: 7.0.16 -> 7.0.17
- 修复轨迹内容提供接口，没标识IRemoteService导致出错
|
2025-02-24 16:19:02 +08:00 |
|
hardstylewyl
|
aacb4a9670
|
fix:补充修复abp提供接口
|
2025-02-24 16:10:21 +08:00 |
|
hardstylewyl
|
2fe7ed5576
|
Merge branch 'S07' into test
|
2025-02-24 11:34:28 +08:00 |
|
hardstylewyl
|
ac2890b3cd
|
update-package:7.0.15-7.0.16 增加注释
|
2025-02-24 11:33:57 +08:00 |
|
hardstylewyl
|
27254e39d9
|
Merge branch 'S07' into test
|
2025-02-24 11:32:30 +08:00 |
|
hardstylewyl
|
f188a7ceb5
|
add-interface:增加轨迹内容通过子系统id查询接口
|
2025-02-24 11:29:44 +08:00 |
|
hardstylewyl
|
0bc171e140
|
Merge branch 'S07' into test
|
2025-02-21 11:49:56 +08:00 |
|
hardstylewyl
|
3fe2b64a76
|
perf:优化轨迹订单冗余第三方单号以提高性能（原：使用本地缓存）
pref:接口反参增加，查询轨迹订单增加轨迹状态最新轨迹时区
|
2025-02-21 11:31:15 +08:00 |
|
hardstylewyl
|
df3fed3fbb
|
clean:清理无用代码
|
2025-02-21 10:53:46 +08:00 |
|
hardstylewyl
|
97ddcd8df8
|
Merge branch 'S07' into test
|
2025-02-18 09:30:12 +08:00 |
|
hardstylewyl
|
078a7bf2a8
|
config-item-remove: 移除接口通不必要的参数
- PushTrackInterfaceId 推送接口id
- PushTrackItemParamAliasPrefix 推送接口内容项 参数别名前缀
|
2025-02-17 14:11:48 +08:00 |
|
hardstylewyl
|
52b9a46147
|
add-interface: 查询推送映射订单类型选项卡
/Track/PushConfig/GetConfigTags
add-interface: 查询订单类型名称字典
/Track/Order/GetOrderTypeDict
|
2025-02-17 10:21:57 +08:00 |
|
hardstylewyl
|
7c3e458642
|
feat: 查询轨迹映射-推送映射配置，查询配置列表增加订单类型的支持。
|
2025-02-14 10:04:02 +08:00 |
|
hardstylewyl
|
649aacc545
|
Merge branch 'S06' into test
|
2025-02-10 15:37:25 +08:00 |
|
hardstylewyl
|
d585f799bd
|
fix: 修复查询轨迹内容时缺失是否对外字段，导致的新增/修改轨迹，中的轨迹明细缺省值错误
fix: 修复中台内部查询轨迹明细接口，中的是否对外标识错误
|
2025-02-10 15:36:57 +08:00 |
|
hardstylewyl
|
d6a4ae9266
|
Merge branch 'S06' into test
|
2025-02-08 14:45:27 +08:00 |
|
hardstylewyl
|
6e059604d6
|
fix: 修复查询轨迹轨迹内容，缺失子系统id和轨迹内容id
|
2025-02-08 14:44:49 +08:00 |
|
hardstylewyl
|
130934d901
|
Merge branch 'S06' into test
|
2025-02-08 14:24:32 +08:00 |
|
hardstylewyl
|
60ac19c692
|
fix: 修复轨迹新增/更新引发的广播中，轨迹发生时间错误的问题
|
2025-02-08 14:22:09 +08:00 |
|
hardstylewyl
|
45bc0cf6df
|
i18n:补充推送映射国际化内容
refactor: 轨迹明细弃用IsVisibility字段，新增IsExternal字段替代
轨迹内容上的是否对外作用：创建轨迹时如果是否对外字段留null，则以轨迹内容上的【是否对外】值做为默认值填充。IsExternal作用：在查询轨迹时判断如果是外部子系统，则过滤掉是否对外为false的轨迹
|
2025-02-07 15:58:52 +08:00 |
|
hardstylewyl
|
204c8fc7b5
|
fix:订单仓储，修复缓存过期时间设置错误，导致过期时间非常长，从而带来较长时间的数据不一致
refactor:TrackUpsert，补充log解释说明轨迹更新失败原因
|
2025-02-05 10:58:53 +08:00 |
|
hardstylewyl
|
5bad8eb991
|
Merge branch 'S06' into test
|
2025-01-23 08:56:51 +08:00 |
|
hardstylewyl
|
8deabef406
|
fix:修复因隐藏外部轨迹照成的空异常
|
2025-01-23 08:56:14 +08:00 |
|
hardstylewyl
|
008453f3c0
|
Merge branch 'S06' into test
|
2025-01-22 16:45:53 +08:00 |
|
hardstylewyl
|
5fef9ee24b
|
feat:Query和QueryV2支持附件返回oss对象下载地址
|
2025-01-22 16:45:21 +08:00 |
|
hardstylewyl
|
875ba540e0
|
Merge branch 'S06' into test
|
2025-01-22 16:15:02 +08:00 |
|
hardstylewyl
|
6ea5a977df
|
fix:补充被轨迹内容标识为外部的轨迹在外部系统被访问时应被过滤,byP02
|
2025-01-22 16:11:12 +08:00 |
|
hardstylewyl
|
5a6894e6d5
|
Merge branch 'S06' into test
|
2025-01-17 15:34:17 +08:00 |
|
hardstylewyl
|
8ca174c93a
|
fix: 补充删除的订单号提交
|
2025-01-17 15:34:07 +08:00 |
|
hardstylewyl
|
0b1532c4a8
|
Merge branch 'S06' into test
|
2025-01-17 15:06:12 +08:00 |
|
hardstylewyl
|
0b27240d90
|
fix:修复轨迹变更广播缺失操作订单号
|
2025-01-17 15:05:32 +08:00 |
|
hardstylewyl
|
8ea42a5e7b
|
Merge branch 'S06' into test
|
2025-01-17 14:55:20 +08:00 |
|
hardstylewyl
|
928c3b15e8
|
fix:修复轨迹删除广播删除不全
|
2025-01-17 14:54:29 +08:00 |
|
hardstylewyl
|
ad98219dc7
|
Merge branch 'S06' into test
|
2025-01-16 17:01:38 +08:00 |
|
hardstylewyl
|
355c7d02cd
|
fix:新增/修改轨迹 修复校验中的bool逻辑错误
|
2025-01-16 17:00:56 +08:00 |
|
hardstylewyl
|
9f4872b432
|
fix: 填补新增/修改轨迹校验逻辑缺陷，
- 不允许重复添加的轨迹拦截
refactor: 重构新增/更新轨迹，提取公共的检查逻辑
update: Text.Json增加json字符串转JsonElement
rename: DeserializeDictionary => DeserializeToDictionary
|
2025-01-16 16:25:31 +08:00 |
|
hardstylewyl
|
3cec26133d
|
Merge branch 'S06' into test
|
2025-01-16 14:27:43 +08:00 |
|
hardstylewyl
|
78571e57b9
|
fix:修复轨迹删除根据比较字段选取的比较异常
|
2025-01-16 11:58:46 +08:00 |
|
hardstylewyl
|
40c663634e
|
perf:优化轨迹删除增加广播延时发送，并且修正为不阻塞主流程
|
2025-01-16 11:55:46 +08:00 |
|
hardstylewyl
|
e0be935489
|
update:新增/修改轨迹延时发送变更广播，目的为了等待es实际写盘
|
2025-01-16 11:51:26 +08:00 |
|
hardstylewyl
|
1941e9906f
|
Merge branch 'S06' into test
|
2025-01-15 17:42:40 +08:00 |
|
hardstylewyl
|
3ca803fe5b
|
update:保留只推最新
|
2025-01-15 17:41:58 +08:00 |
|
hardstylewyl
|
82bbca3002
|
update:调整轨迹推送逻辑
|
2025-01-15 17:41:06 +08:00 |
|
|
|
08f0ebeeae
|
optimize&fix：force push event case
|
2025-01-15 15:02:28 +08:00 |
|
hardstylewyl
|
0b6e20da3f
|
还原鹏军推送逻辑
|
2025-01-15 11:11:55 +08:00 |
|
|
|
4473936577
|
review
|
2025-01-15 10:35:30 +08:00 |
|
hardstylewyl
|
f857f66938
|
Merge branch 'S06' into test
|
2025-01-14 18:05:56 +08:00 |
|
hardstylewyl
|
19548b3fc2
|
fix：修复JsonElement转换异常
|
2025-01-14 18:05:36 +08:00 |
|
hardstylewyl
|
d6cf492411
|
Merge branch 'S06' into test
|
2025-01-14 17:35:34 +08:00 |
|
hardstylewyl
|
e1e387e0d3
|
update: 轨迹推送处理，根据code+比较字段作为标识，确保传递的轨迹唯一
|
2025-01-14 17:35:03 +08:00 |
|
hardstylewyl
|
6afc29945b
|
Merge branch 'S06' into test
|
2025-01-14 10:52:10 +08:00 |
|
hardstylewyl
|
7d7bc45c67
|
pref:轨迹推送（手动）支持按比较字段过滤
pref:轨迹删除：
- 广播增加轨迹轨迹明细填充
- 增加比较字段来精确删除
|
2025-01-14 10:51:01 +08:00 |
|
hardstylewyl
|
8334d46637
|
Merge branch 'S06' into test
|
2025-01-13 16:34:08 +08:00 |
|
hardstylewyl
|
100d901e0d
|
add-model:补充入参模型更新
|
2025-01-13 16:33:41 +08:00 |
|
hardstylewyl
|
342412a0b0
|
Merge branch 'S06' into test
|
2025-01-13 16:32:26 +08:00 |
|
hardstylewyl
|
183ea314e3
|
update: 补充入参模型
|
2025-01-13 16:31:44 +08:00 |
|
hardstylewyl
|
1b3290375b
|
Merge branch 'S06' into test
|
2025-01-13 16:23:13 +08:00 |
|
hardstylewyl
|
60324b0e26
|
update:单个轨迹删除去除goto，附加比较字段逻辑
|
2025-01-13 16:20:49 +08:00 |
|
hardstylewyl
|
a517eae81f
|
fix：轨迹推送事件处理：修复轨迹全量推送（最新轨迹）字段比较问题
|
2025-01-13 16:11:08 +08:00 |
|
hardstylewyl
|
8ca0adfbd3
|
update: 新增修改轨迹后记录订单操作日志改为批量操作，并且保证只有轨迹实际操作成功后才会写入
|
2025-01-10 16:39:23 +08:00 |
|
hardstylewyl
|
63ec1e06ca
|
Merge branch 'S06' into test
|
2025-01-10 15:58:29 +08:00 |
|
hardstylewyl
|
ccc08166b9
|
update-package:更新规约包版本为7.0.14
- 请求id设置为可空，调整描述
|
2025-01-10 15:54:09 +08:00 |
|
hardstylewyl
|
8287e6a437
|
feat:轨迹推送处理中，广播推送失败原因（配置存在与否/是否自动推送/订单类型是否一致/顺序/异常单/调用接口通失败）
|
2025-01-10 15:43:31 +08:00 |
|
hardstylewyl
|
94702e4c56
|
update-package:更新规约包至7.0.13
- （单个/批量）新增/更新轨迹接口增加比较字段CompareFields
|
2025-01-10 11:19:18 +08:00 |
|
hardstylewyl
|
5913929dcc
|
update:轨迹新增/更新支持按扩展内容某个字段比较
|
2025-01-10 11:17:52 +08:00 |
|
|
|
2d6b239b8f
|
review push event handler
|
2025-01-10 10:15:00 +08:00 |
|
|
|
cc84be2d84
|
review
|
2025-01-10 09:33:35 +08:00 |
|
hardstylewyl
|
b2c7a6aef1
|
fix:修复轨迹更新的比较逻辑错误
|
2025-01-10 09:18:23 +08:00 |
|
|
|
f5f9227aeb
|
try
|
2025-01-09 18:08:10 +08:00 |
|
hardstylewyl
|
4fb127ed47
|
转鹏军
|
2025-01-09 17:41:39 +08:00 |
|
|
|
cb147ccbe1
|
Merge remote-tracking branch 'origin/S06' into S06
|
2025-01-09 16:42:35 +08:00 |
|
|
|
76aec6c78f
|
important：重构
|
2025-01-09 16:42:25 +08:00 |
|
hardstylewyl
|
503e333c4f
|
fix:调整轨迹推送配置时间格式枚举为可选项
|
2025-01-09 16:20:45 +08:00 |
|
|
|
24c5f0a2ed
|
Merge remote-tracking branch 'origin/S06' into S06
|
2025-01-09 11:36:31 +08:00 |
|
|
|
313751fcb8
|
S06：feat【6. 增加推送映射配置项【只推送最新修改记录】】
https://www.tapd.cn/60863849/prong/stories/view/1160863849001041817
|
2025-01-09 11:36:23 +08:00 |
|
hardstylewyl
|
3557c9d907
|
Merge branch 'S06' into test
|
2025-01-09 10:29:39 +08:00 |
|
hardstylewyl
|
586690ed55
|
update-package: 更新契约包版本为7.0.12
- 查询轨迹增加esid反参
- 删除轨迹支持esid删除
- 修改单个订单的单个轨迹支持es修改
|
2025-01-09 10:27:34 +08:00 |
|
hardstylewyl
|
84792dc502
|
perf: 删除轨迹提供接口（单个订单），支持使用EsId来删除轨迹（当和标识符都不为空则优先以esId优先），并解除标识符号的必填限制
perf: 轨迹查询提供接口，增加es反参
perf: 支持轨迹更新的esId更新（要求确保是单个订单的单个轨迹）
|
2025-01-09 10:25:19 +08:00 |
|
hardstylewyl
|
26c8672c6f
|
Merge branch 'S06' into test
|
2025-01-07 16:09:56 +08:00 |
|
hardstylewyl
|
47ebc8b09b
|
update:补充轨迹推送调用接口通出错异常信息（增加服务商code）
|
2025-01-07 16:09:35 +08:00 |
|
hardstylewyl
|
55f9fba62e
|
refactor:查询轨迹提供接口，删除轨迹模板代码参数
|
2025-01-07 10:49:27 +08:00 |
|
hardstylewyl
|
f2c9356668
|
feat:轨迹查询(QueryAsync,QueryAsyncV2)，增加根据请求header中的子系统标识(SubsystemId)控制轨迹的可见度，内部系统所有轨迹全部可见，外部系统则要求过滤外部轨迹
|
2025-01-07 09:11:48 +08:00 |
|
hardstylewyl
|
9bfda1f8d4
|
Merge branch 'S06' into test
|
2025-01-06 09:46:51 +08:00 |
|
hardstylewyl
|
3b37d73df8
|
fix:修复当没有需要展示的三方单号需要显示”--”，三方单号为null时被过滤
|
2025-01-06 09:45:44 +08:00 |
|
