Commit Graph

628 Commits

Author SHA1 Message Date
1f8a0d2f93 【 1. 轨迹拉取内容页面:新增和编辑弹窗页面去除是否完结的字段】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027884
2024-09-04 17:27:43 +08:00
bd0287dfb0 【 7. 轨迹增删改,去除对轨迹模板的依赖】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027883
2024-09-04 11:22:53 +08:00
fae534a256 【4.对外轨迹查询轨迹的接口】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027880
2024-09-03 17:41:33 +08:00
8b6553700e 【 1. 轨迹模板页面的改动:新增/编辑模板内容弹窗和模板内容列表,去掉是否对外(移到轨迹内容),是否可删(移到轨迹状态)字段。新增编辑模板去掉对外显示源轨迹。】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027876
2024-09-03 17:17:08 +08:00
926adfcd5d remove:去除通知模版 2024-09-03 14:43:33 +08:00
3471c1eade fmt&clear 2024-08-20 18:18:57 +08:00
4ddad722e1 fmt 2024-08-20 09:07:19 +08:00
1a21180ac7 change:全局格式化 2024-08-19 16:19:17 +08:00
ac56f3ecab add:添加.editorconfig 2024-08-19 15:02:55 +08:00
d3060adbd8 opt:remote service assign dto 2024-08-13 10:17:03 +08:00
8f032a28ed change:控制es safely limit-10000 2024-08-13 10:12:14 +08:00
b4ae584e4d attach 2024-08-13 09:40:18 +08:00
a57e58459f trait:支持单条轨迹删除 2024-08-13 09:39:38 +08:00
d3627b7a66 fix:mq config named 2024-08-12 15:20:23 +08:00
2a76994eda important:对接接口通获取轨迹 2024-08-12 15:16:47 +08:00
9965372fda handle todo 2024-08-09 11:35:08 +08:00
77b5352b05 review 2024-08-09 10:33:57 +08:00
钟喜旺
10f6096770 feat: 处理死循环 2024-08-07 11:57:42 +08:00
钟喜旺
f4313461a0 feat: 12小时推送预警轨迹锁添加非阻塞锁 2024-08-07 10:14:19 +08:00
a4f78e7bb6 Revert "temp"
This reverts commit b59418e6ff.
2024-08-07 09:51:14 +08:00
b59418e6ff temp 2024-08-07 09:42:42 +08:00
8bcef37b74 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警
# Conflicts:
#	src/SJZY.Track.Application/CAP/EventHandlers/TrackRefreshEventHandler.cs
2024-08-06 16:56:22 +08:00
3127a3a38e change:轨迹code相同,时间、发生地不同的,允许存在多条 2024-08-06 16:53:47 +08:00
钟喜旺
1805cc5b76 feat: IsTriggerPull 多次刷轨迹被置为null 2024-08-06 11:35:52 +08:00
钟喜旺
a3e395a272 feat: 抽象出轨迹发生地和轨迹时区的逻辑 2024-08-06 11:09:33 +08:00
0b47412077 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-08-06 10:50:15 +08:00
e21f3b8460 temp 2024-08-06 10:50:00 +08:00
钟喜旺
87138c0b42 Merge branch 'dev' into S04轨迹预警
# Conflicts:
#	src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs
2024-08-05 16:23:51 +08:00
钟喜旺
b30846a811 feat: 定时任务推送预警(》12小时没有推送的 改为事件提交 2024-08-05 16:19:04 +08:00
62fc0a5168 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-08-05 16:09:01 +08:00
5a90c99f51 fix:轨迹刷新 2024-08-05 16:08:50 +08:00
钟喜旺
7cba774373 feat: 添加跨全局的Shared项目 2024-08-05 15:43:04 +08:00
a3c4199a30 Revert "【cheery pick】temp:remove notify table"
This reverts commit d7c84cfc4a.
2024-08-05 10:01:12 +08:00
d7c84cfc4a 【cheery pick】temp:remove notify table 2024-08-05 09:30:40 +08:00
钟喜旺
8a2fb92900 feat: 限制只能输入英文和英文符号 2024-08-02 17:45:27 +08:00
钟喜旺
67569825ee feat:兜底轨迹时区添加映射和返回详情中 2024-08-02 16:24:01 +08:00
钟喜旺
d0eda88a2f Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-08-02 15:46:35 +08:00
钟喜旺
e727ab26ca feat: 处理缓存null的报错 2024-08-02 15:46:23 +08:00
f531551702 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-08-02 09:06:02 +08:00
19b4ef80b5 temp:临时预警方案 2024-08-02 09:05:52 +08:00
钟喜旺
76d441a96a Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-08-01 09:26:13 +08:00
钟喜旺
5cd6c4f6c6 定时任务推送预警(》12小时没有推送的) 2024-08-01 09:26:01 +08:00
ca68cde257 temp 2024-07-31 18:21:23 +08:00
钟喜旺
8f8d7b2a44 feat: 缓存调整 2024-07-31 18:07:10 +08:00
钟喜旺
010408985e feat: 解决接口Track/PushWarnForTask的锁长时间占领的问题 2024-07-31 16:34:29 +08:00
钟喜旺
6b43722fa6 feat: PullChangeBottomLineUpdateOrderEvent 事件迁移 2024-07-31 10:21:27 +08:00
钟喜旺
f1d15c34df feat: 新增拉取界面增加字段:触发拉取节点 二次自测完成 2024-07-30 16:47:47 +08:00
钟喜旺
228312ad6f Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警
# Conflicts:
#	src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs
2024-07-30 15:23:51 +08:00
钟喜旺
6df23b96e6 feat: 迁移order pull trigger 标签赋值位置 2024-07-30 15:22:25 +08:00
84e2764ebe temp 2024-07-30 15:13:55 +08:00
钟喜旺
67811638a9 feat: 处理冲突 2024-07-29 19:03:41 +08:00
钟喜旺
d00df6745b Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-29 18:59:12 +08:00
钟喜旺
2cea1a7912 feat: 轨迹预警规则缓存以及集群通知 2024-07-29 18:58:36 +08:00
94778ef228 add:预警计算 2024-07-29 18:10:48 +08:00
305847e3eb Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-29 15:03:46 +08:00
73422ba703 review 2024-07-29 15:03:37 +08:00
钟喜旺
6eab4f9172 Merge branch 'dev' into S04轨迹预警 2024-07-29 14:09:43 +08:00
钟喜旺
d0c2a92a82 feat: 区域添加了返回国家id 2024-07-29 14:09:15 +08:00
d41c5e444f Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-29 11:55:51 +08:00
6b211d8f7f temp 2024-07-29 11:55:36 +08:00
钟喜旺
769ba9e07b Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警
# Conflicts:
#	src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs

feat: 调整轨迹区域添加了国家名称字段
2024-07-29 10:31:57 +08:00
1513bb4964 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-27 17:44:32 +08:00
7454827e0f connect: 对接预警编辑 2024-07-27 17:44:23 +08:00
钟喜旺
64acaffb5b fix: add a validation 2024-07-27 11:18:44 +08:00
钟喜旺
e312792472 fix: 调整dto映射 2024-07-27 10:11:29 +08:00
钟喜旺
3df894d20b fix: 节点表添加子系统名称 2024-07-27 09:39:02 +08:00
钟喜旺
9494ca2cb7 feat: 轨迹映射-新增拉取界面增加字段:触发拉取节点 2024-07-26 21:04:19 +08:00
707a05f911 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-26 17:58:07 +08:00
dd8a8065cc temp 2024-07-26 17:57:58 +08:00
钟喜旺
91da2f111f Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警
# Conflicts:
#	src/SJZY.Track.Application/CAP/EventHandlers/TrackChangeAfterUpdateOrderEventHandler.cs
2024-07-26 17:24:51 +08:00
钟喜旺
4a0df97333 feat: 轨迹节点页面 2024-07-26 17:23:00 +08:00
f00805437d connect:预警规则列表动态计算好给到前端 2024-07-26 17:12:46 +08:00
c7ae4e9d05 connect:对接预警查询 2024-07-26 16:12:43 +08:00
86a0332886 fix:CalcRuleList 2024-07-26 15:54:54 +08:00
e4b8fb4fcf Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-26 12:59:11 +08:00
061cffc6c3 add:预警crud 2024-07-26 12:59:01 +08:00
钟喜旺
60ff61e030 Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-26 10:27:21 +08:00
钟喜旺
24e95d7fad feat: 轨迹映射界面的拉取配置将“轨迹时区”改成“兜底轨迹时区”,“轨迹发生地”改成“兜底轨迹发生地” 2024-07-26 10:24:20 +08:00
9ba1ee660b Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-07-25 21:06:18 +08:00
c3f904ccdc importance:预警初步重构 2024-07-25 21:06:06 +08:00
钟喜旺
aae9add71c feat: 轨迹映射界面的推送配置增加推送时间格式 开发测试完成 2024-07-25 15:03:47 +08:00
钟喜旺
2f5354960d feat: 补充注释 2024-07-25 10:32:01 +08:00
钟喜旺
d67c7ce820 feat: 轨迹映射界面的推送配置增加推送时间格式 2024-07-25 09:26:07 +08:00
f42287a7f8 temp 2024-07-24 15:15:44 +08:00
fdcc81ba0e fix:【【轨迹订单pet】干线提单新增轨迹后,未推送到箱单和小包运输单上】https://www.tapd.cn/60863849/bugtrace/bugs/view/1160863849001043303 2024-07-24 14:22:53 +08:00
c772c68e47 review 2024-07-24 11:14:58 +08:00
DESKTOP-S2TSHMH\BSI
895e12762d feat: 预警功能相关代码 2024-07-24 08:54:56 +08:00
8ce26fe28d 优化日志 2024-07-16 15:10:26 +08:00
8a369ff049 Merge branch 'refs/heads/S33-中台token优化' into S03-轨迹中台优化项
# Conflicts:
#	src/SJZY.Track.Domain/SJZY.Track.Domain.csproj
2024-06-25 17:58:51 +08:00
47ea3b8f82 token解析变更 2024-06-25 17:53:56 +08:00
e32e2c15c4 1.升级用户中心包
2.加入otlp
2024-06-25 17:43:17 +08:00
c63bf09c08 还原调试代码 2024-05-28 09:05:39 +08:00
b4bcb377ec fix:hash key不存在问题 2024-05-27 17:29:51 +08:00
5712f567df opt:提取配置重试冷却窗口 2024-05-27 17:00:39 +08:00
33c36bed10 opt:优化cap filter 2024-05-27 16:52:08 +08:00
b5f7f86664 opt:优化推送幂等,优化cap重试机制 2024-05-27 15:40:59 +08:00
505d8e7dc1 add:添加cap本地内存debug 2024-05-14 17:17:37 +08:00
4b0acb1978 opt:优化轨迹刷新定时任务等待超时问题 2024-05-14 17:17:14 +08:00
7482521e75 opt:升级cap到8.1.2 2024-05-11 10:13:00 +08:00
5b12642faf change:cap异步不打消息内容(去cap看) 2024-05-09 17:49:33 +08:00
56f8d95e48 opt:优化upsert逻辑 2024-05-09 15:45:59 +08:00
eff09f1cb0 upg:升级接口通7.2.1 2024-05-09 14:59:36 +08:00
5cda1270fb opt:优化更新轨迹 2024-05-09 11:46:15 +08:00
49eda2a3aa opt:优化轨迹新增 2024-05-09 11:46:13 +08:00
78c0aa1191 change:线程分组可配置 2024-05-09 10:53:52 +08:00
de7d1daf81 change:重试不做幂等 2024-05-09 10:51:38 +08:00
d075c02d5e opt:优化推送对接接口通日志 2024-04-25 18:58:38 +08:00
c6e99193c3 fix:轨迹删除引发的主表维护不完整 2024-04-25 17:00:27 +08:00
4cb5f465da opt:接口通请求失败打印异常 2024-04-25 10:43:39 +08:00
96b3486956 fix:手动推送 子系统,客户 分组推 2024-04-25 10:23:09 +08:00
52b70cb213 fix:推送更新attach ascii 2024-04-25 09:45:02 +08:00
09881a3932 attach 2024-04-24 21:44:08 +08:00
9d5cad393e attach 2024-04-24 21:01:55 +08:00
ee35276ee6 change:语法降级 2024-04-24 18:00:02 +08:00
5ab91c3d8c temp 2024-04-24 17:49:31 +08:00
141e6f1ee7 fix:批量删除轨迹代码重复问题 2024-04-24 09:37:32 +08:00
d5846f2b27 attach 2024-04-23 12:34:36 +08:00
04ef345481 opt:拆包 2024-04-23 12:00:53 +08:00
2e551b21d7 change:推送重试重入队列+失败日志 2024-04-22 22:14:35 +08:00
2c5aa4f35a opt:定时任务刷新轨迹分页 2024-04-22 15:05:01 +08:00
aecb488045 change:轨迹刷新最短cd 60min 2024-04-22 14:14:45 +08:00
954654ede6 change:cap不打印超时日志 2024-04-22 09:06:45 +08:00
f817b71c05 fix:推送单号没传 2024-04-17 14:41:14 +08:00
7199398dd7 fix:更新的即是最新轨迹时,直接覆盖 2024-04-16 19:20:40 +08:00
af09e75811 opt 2024-04-16 18:49:15 +08:00
d73a7ad119 fix:修改轨迹引发的刷新主表逻辑bug 2024-04-16 18:38:18 +08:00
ba5bf24931 opt:轨迹upsert剪枝 2024-04-16 15:28:29 +08:00
7769d6cf80 fix:轨迹刷新到服务商轨迹单条入库 2024-04-16 14:33:29 +08:00
64ab6757a9 opt 2024-04-16 11:47:21 +08:00
ad563dda97 opt:删不做幂等 2024-04-15 19:14:41 +08:00
932ca3d1c5 opt 2024-04-15 19:02:01 +08:00
0fb2690efd opt:压缩订单主表更新事件 2024-04-15 14:47:52 +08:00
a28a9ac5db change:轨迹代码为--的不参与计算 2024-04-15 14:09:12 +08:00
d95c5da96b fix:跨子系统映射赋值问题 2024-04-15 11:08:04 +08:00
be7a3dc674 format 2024-04-15 09:59:21 +08:00
c89e3f940c change:服务商空数据用--替代 2024-04-15 09:59:18 +08:00
639a2232a3 fix:order link query logic 2024-04-15 09:59:14 +08:00
1f8fe7c248 change:双订阅 2024-04-15 09:59:06 +08:00
2bedb127b6 opt:重构 2024-04-12 21:34:15 +08:00
moyongzhen
c2c1e24dcf 添加对外接口 2024-04-11 15:21:38 +08:00
moyongzhen
3aecf92eb7 轨迹推送配置关系对外接口 2024-04-11 15:14:01 +08:00
93417db522 1 2024-04-10 19:51:46 +08:00
8c81406e6e 测试cap参数 2024-04-10 19:51:07 +08:00
80e1db40b2 attach 2024-04-10 19:21:37 +08:00
6ef5ba86cf opt:开启cap多线程 2024-04-10 19:18:18 +08:00
8e9f5931e4 opt:轨迹推送后更新订单合并到推送处理逻辑 2024-04-10 15:27:52 +08:00
moyongzhen
f1a48cc9a6 查询轨迹 返回参数调整成UnifyResultDto 2024-04-10 15:04:30 +08:00
9ddba4f561 fix:手动 全量 推送 校验bug 2024-04-09 14:38:26 +08:00
d7cfd153b2 opt:优化null 缓存5s 2024-04-09 14:33:40 +08:00
4fbbbd0566 fix:【【轨迹订单-推送记录】轨迹发生时区需调整为格林尼治标准时间(GTM)】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001032649 2024-04-08 19:37:35 +08:00
c5212f53f0 升级接口通v7.1.9 2024-04-08 19:11:24 +08:00
5a6b2a0f5d change:只有轨迹增删改做幂等 2024-04-08 18:42:51 +08:00
f229371520 fix:轨迹推送具象实体 2024-04-08 14:20:37 +08:00
66d5a5c4d5 fix:【【轨迹订单】"是否自动推送"为否,新增轨迹明细后,异常自动推送轨迹明细】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001032644 2024-04-07 21:21:21 +08:00
d2de95a803 fix:【【轨迹订单】轨迹明细("服务商源轨迹内容"与"轨迹内容"不匹配)已配置映射】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001032624 2024-04-07 20:07:38 +08:00
0b8e9da918 change:轨迹查询对外逻辑调整 2024-04-03 17:51:00 +08:00
63e4c8b999 fix:【【修改轨迹内容】轨迹标记没有值时,显示了id】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001032585 2024-04-03 17:00:30 +08:00
4a759333ca change:推送异常处理逻辑 2024-04-03 09:13:47 +08:00
a261c21284 fix:sql bug 2024-04-02 20:11:57 +08:00
01e4ddf17c change:异常单不再推 2024-04-02 19:58:41 +08:00
4ebbe1b67c fix:推送swap 2024-04-02 19:41:29 +08:00
6997d71696 com:提供订单完成接口 2024-04-02 19:02:15 +08:00
65ac8b2a50 com:对接轨迹模板-新增字段:对外显示原轨迹 2024-04-02 09:23:54 +08:00
11e64a07d3 fix:推送bug 2024-04-01 18:52:42 +08:00
e21a4b03c1 change:全量推送即使是手工推也要校验 2024-04-01 18:45:26 +08:00
7331076e44 change:本地调试不做幂等 2024-04-01 18:16:50 +08:00
232d7d8254 fix:推送逻辑变更 2024-04-01 18:14:02 +08:00
b0f61447ca fix:推送服务生命周期问题 2024-04-01 17:51:12 +08:00
e85e3244bf 全量推送 2024-04-01 16:07:35 +08:00
3ebbe620af feature:【轨迹推送支持顺序互换】
https://www.tapd.cn/60863849/prong/stories/view/1160863849001017011
2024-03-30 15:54:51 +08:00
a58b9e264a change:【轨迹的完成根据拉取配置判断】
https://www.tapd.cn/60863849/prong/stories/view/1160863849001017014
2024-03-30 15:50:25 +08:00
44673e2f5a Merge branch 'S02-轨迹中台第二部分' into S03-轨迹中台 2024-03-30 15:24:51 +08:00
322a3a67ed fix:预警OOM 2024-03-30 15:24:11 +08:00
3de76a713d important:重构 2024-03-30 11:52:49 +08:00
83f391dfcc Merge branch 'S02-轨迹中台第二部分' into S03-轨迹中台 2024-03-29 15:29:35 +08:00
moyongzhen
5818d8ddd8 对外接口返参调整 2024-03-29 14:39:30 +08:00
moyongzhen
9d29759cc0 对外接口包 unifyResultDto 2024-03-29 14:29:17 +08:00
443b55f1dd Merge branch 'S02-轨迹中台第二部分' into S03-轨迹中台 2024-03-28 11:47:51 +08:00
f20ee5f0a2 change cap filter 2024-03-28 11:46:25 +08:00
24c47652d8 Merge branch 'S02-轨迹中台第二部分' into S03-轨迹中台
# Conflicts:
#	src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj
2024-03-28 11:26:42 +08:00
2c6d730c4b fix:拉取缓存不存在应该返回null 2024-03-28 11:25:00 +08:00
c8b3b99633 fix:轨迹刷新没有拉取配置的case 2024-03-28 11:08:23 +08:00
f9c61219e9 升级接口通7.1.8 2024-03-28 10:35:15 +08:00
2304a1f918 fix 轨迹刷新 attach base64问题 2024-03-27 18:58:03 +08:00
b98742f431 change remove topic prefix 2024-03-27 17:21:46 +08:00
676cdad78c fix 手动更新bug 2024-03-27 16:50:40 +08:00
140acc23d9 Merge branch 'S02-轨迹中台第二部分' into S03-轨迹中台 2024-03-27 14:53:39 +08:00
41755830f6 fix 轨迹明细操作人默认系统 2024-03-27 14:51:51 +08:00
10d6f28fc8 1 2024-03-27 14:49:19 +08:00
dcc7ec5918 opt:美化代码 2024-03-27 11:09:36 +08:00
b81733b011 change:轨迹刷新不做幂等 2024-03-27 11:03:07 +08:00
e9d304873e 补 2024-03-27 11:00:11 +08:00
5aa6596a7b attach 2024-03-27 10:51:07 +08:00
6021e7c5d9 防gank 2024-03-27 10:40:39 +08:00
cfb761a806 继续埋点 2024-03-27 09:53:15 +08:00
a663894bcc fix:【【轨迹订单】批量新增轨迹明细,创建人异常为空】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001031517 2024-03-27 09:19:45 +08:00
7b20e7a939 回退 2024-03-26 17:49:41 +08:00
b232d96634 opt:优化轨迹upsert流程 2024-03-26 17:31:50 +08:00
f85bc95e19 add:【轨迹推送明细查询接口-对外】https://www.tapd.cn/60863849/prong/tasks/view/1160863849001017119 2024-03-26 15:20:00 +08:00
0f49547776 opt: 推送记录冗余orderNo,orderType 2024-03-26 15:19:13 +08:00