Commit Graph

1631 Commits

Author SHA1 Message Date
hardstylewyl
c27e55b69f update: 获取轨迹模板内容,增加按排序键排序逻辑 2024-12-27 15:52:36 +08:00
hardstylewyl
e3ef469250 Merge branch 'S06' into test 2024-12-27 15:06:42 +08:00
hardstylewyl
750e96d7cf fix: 修复查询轨迹时,轨迹内容不完整 2024-12-27 15:04:59 +08:00
987d533341 review 2024-12-27 11:43:40 +08:00
b750579887 Merge remote-tracking branch 'origin/S06' into S06
# Conflicts:
#	src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
2024-12-27 11:42:48 +08:00
7148bfdc6b review 2024-12-27 11:41:59 +08:00
hardstylewyl
8d469d0a17 Merge branch 'S06' into test 2024-12-27 11:19:22 +08:00
hardstylewyl
5edaa2f80c update: 新增/修改轨迹增加IsToMq参数,标记为true则轨迹操作后一定会推送
update: MQ广播异步改同步
update: 更新契约包版本7.0.10
2024-12-27 11:18:20 +08:00
a9eaa5e41f review 2024-12-27 10:36:57 +08:00
hardstylewyl
f3fcc271f9 Merge branch 'S06' into test 2024-12-27 10:00:47 +08:00
hardstylewyl
891e01ceca update: 新增/修改轨迹(单个)修改获取信息方式,优先选择用户token解析,备选传入的OptionUserId解析
update: 轨迹推送完成广播增加,轨迹明细扩展参数Extra
2024-12-27 09:59:42 +08:00
hardstylewyl
801b58bdee update: 使用UnifyResultDto包装,更新契约包至7.0.9 2024-12-26 11:27:13 +08:00
hardstylewyl
c763e2a1d5 Merge branch 'S06' into test
# Conflicts:
#	src/SJZY.Track.Api/appsettings.json
2024-12-26 10:52:05 +08:00
hardstylewyl
988ab384f9 update: 标记[CustomerResult]使得三方可以正常调用 2024-12-26 10:50:32 +08:00
hardstylewyl
22a2019cc1 update: 删除不必要的修饰信息,去掉多余todo 2024-12-26 10:43:48 +08:00
hardstylewyl
4c5db5cc36 config-change:更新apollo配置 2024-12-24 15:31:54 +08:00
hardstylewyl
64b19d88d6 del:删除TrackPushEto 2024-12-24 15:09:50 +08:00
hardstylewyl
b6a2cc8615 update: 优化轨迹相关广播,抽离广播为BroadcastingService,涉及轨迹变更,轨迹推送完成。
update-eto:
 - rename: TrackPushEto -> TrackPushCompletedEvent
2024-12-24 15:09:12 +08:00
74c66fff3f review 2024-12-24 11:52:58 +08:00
hardstylewyl
42ba5c6a75 Merge branch 'S06' into test 2024-12-23 14:34:11 +08:00
hardstylewyl
7d8e8c584a update: 更新契约模型,调整版本7.0.7 => 7.0.8 2024-12-23 14:33:27 +08:00
hardstylewyl
017cd7ffd4 update: 轨迹推送扩展参数修改为全量的轨迹明细扩展内容。 2024-12-23 14:29:54 +08:00
hardstylewyl
1abe484a14 Merge branch 'S06' into test 2024-12-20 17:06:27 +08:00
hardstylewyl
97bee1e3d9 update: 推送行为下拉列表只显示推送映射配置中的轨迹
update: 新增/更新轨迹,增加强制推送标识,此标识会影响推送行为使其变为,
1.明确调用推送轨迹接口 2.不受推送映射的顺序限制
2024-12-20 17:05:57 +08:00
hardstylewyl
ebb81a4cc0 Merge branch 'S06' into test 2024-12-20 15:22:09 +08:00
hardstylewyl
cc32f5b2fd update: 推送行为限制推送配置的订单类型和要推送的轨迹所属订单的订单类型必须一致
update: 进行删除/推送操作时,订单无轨迹时轨迹代码下拉应该显示为空,
 - 删除过滤外部服务商轨迹
 - 推送过滤订单类型不一致轨迹

 opt: 配置MQ,舰艇和轨迹推送完成回传
2024-12-20 15:21:36 +08:00
hardstylewyl
503d4f470e Merge branch 'S06' into test 2024-12-19 18:06:51 +08:00
hardstylewyl
cfa241a36f update: 优化轨迹推送逻辑,有效减少不必要的请求 2024-12-19 18:06:06 +08:00
hardstylewyl
a955f93e7f Merge branch 'S06' into test 2024-12-19 15:22:28 +08:00
hardstylewyl
7d5b81683d add-track: 补充轨迹推送链路跟踪参数 2024-12-19 15:22:16 +08:00
hardstylewyl
0177444856 Merge branch 'S06' into test 2024-12-19 15:03:38 +08:00
hardstylewyl
e0c18bda20 add-track: 推送轨迹中请求接口通获取接口结构 2024-12-19 15:03:08 +08:00
hardstylewyl
bdaed57188 update :调整配置为test 2024-12-19 14:48:12 +08:00
hardstylewyl
2fb5b15866 Merge branch 'S06' into test 2024-12-19 11:05:58 +08:00
hardstylewyl
f694364754 update: 下拉轨迹内容增加推送操作类型,返回所有轨迹内容,
- 补充逻辑:删除行为下拉,过滤外部服务商轨迹
2024-12-19 10:52:05 +08:00
hardstylewyl
01c632f4f7 Merge branch 'S06' into test 2024-12-19 10:11:45 +08:00
hardstylewyl
4e87546ed1 fix: 修复默认轨迹推送默认参数填充 2024-12-19 10:11:23 +08:00
hardstylewyl
480e081277 Merge branch 'S06' into test 2024-12-19 09:40:45 +08:00
hardstylewyl
98d79712d6 opt: 更新接口通接入包版本
7.2.5-alpha => 7.2.5-alpha2
2024-12-19 09:38:51 +08:00
hardstylewyl
7cdf91d8e5 Merge branch 'S06' into test 2024-12-18 16:23:33 +08:00
hardstylewyl
51860d8529 update: 新增/更新轨迹订单,轨迹模板code允许传null
pkg-update: 升级契约包版本 7.0.7
2024-12-18 16:18:15 +08:00
hardstylewyl
9929331063 update: 调整轨迹明细中扩展字段存储类型 Dictionary<string,object> => string,涉及请求体,ES存储 2024-12-18 16:05:05 +08:00
hardstylewyl
d09f1362fa Merge branch 'S06' into test 2024-12-17 17:51:47 +08:00
hardstylewyl
6ece015f0d update: 轨迹推送增加扩展参数
update: 轨迹推送接口通回调,增加推送回传轨迹广播
2024-12-17 17:50:53 +08:00
hardstylewyl
a95cd73a5b Merge branch 'S06' into test 2024-12-17 17:27:00 +08:00
hardstylewyl
178dca47d0 update:更新契约包版本7.0.3=>7.0.5 2024-12-17 17:26:11 +08:00
hardstylewyl
67a7d64b6c update:补充提交 2024-12-17 16:58:01 +08:00
hardstylewyl
eee75e5261 fix: 修复根据EsId删除轨迹,订单主表回退更新失败
update: 轨迹新增修改处理增加扩展字段存储
update-models:
 - 增加扩展字段,涉及【轨迹推送】【轨迹变更】
 - 扩展接口通配置模型,增加字段轨迹推送接口Id,轨迹推送内容项别名
2024-12-17 16:55:52 +08:00
hardstylewyl
67056b14e7 add: 契约层增加批量更新轨迹接口,用于外部接入 2024-12-17 16:43:53 +08:00
wangyunlong
6c84dad074 Merge pull request 'S06' (#76) from S06 into uat
Reviewed-on: https://git.shijizhongyun.com/Dotnet/SJZY.Track.Api/pulls/76
2024-12-17 14:52:51 +08:00