|
|
bbc9b3c754
|
【 5. 轨迹订单拉取配置】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027889
|
2024-09-06 14:39:12 +08:00 |
|
|
|
f2a873a387
|
【 4. 提供一个对外的接口：根据子系统id查询轨迹状态。根据{子系统id}，查询子系统id，返回{轨迹状态的集合}】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027888
|
2024-09-06 09:10:52 +08:00 |
|
|
|
8b60235d9f
|
【 3. 轨迹订单操作列增加一个按钮：日志，点击弹窗日志列表】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027887
|
2024-09-05 18:00:33 +08:00 |
|
|
|
7206bc64cd
|
change：订单增删改返回id
|
2024-09-05 14:28:20 +08:00 |
|
|
|
85b05dfa5d
|
【 2. 轨迹状态页面：新增编辑弹窗，列表增加是否完结的字段，非必填】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027890
|
2024-09-04 17:34:58 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
8f032a28ed
|
change：控制es safely limit-10000
|
2024-08-13 10:12:14 +08:00 |
|
|
|
a57e58459f
|
trait：支持单条轨迹删除
|
2024-08-13 09:39:38 +08:00 |
|
|
|
2a76994eda
|
important：对接接口通获取轨迹
|
2024-08-12 15:16:47 +08:00 |
|
|
|
9965372fda
|
handle todo
|
2024-08-09 11:35:08 +08:00 |
|
钟喜旺
|
10f6096770
|
feat: 处理死循环
|
2024-08-07 11:57:42 +08:00 |
|
钟喜旺
|
c23542248e
|
feat: select 限定查询字段
|
2024-08-07 10:47:05 +08:00 |
|
钟喜旺
|
f4313461a0
|
feat: 12小时推送预警轨迹锁添加非阻塞锁
|
2024-08-07 10:14:19 +08:00 |
|
钟喜旺
|
f50d427325
|
feat: 修复更新推送预警单bug
|
2024-08-06 22:14:57 +08:00 |
|
|
|
3127a3a38e
|
change：轨迹code相同，时间、发生地不同的，允许存在多条
|
2024-08-06 16:53:47 +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 |
|
钟喜旺
|
39e0171b98
|
Merge branch 'dev' into S04轨迹预警
|
2024-08-05 09:39:31 +08:00 |
|
钟喜旺
|
35bfbc43bd
|
feat ： 轨迹节点调整返回值
|
2024-08-05 09:36:15 +08:00 |
|
|
|
d7c84cfc4a
|
【cheery pick】temp：remove notify table
|
2024-08-05 09:30:40 +08:00 |
|
钟喜旺
|
f9ac2af1ef
|
feat: 后端枚举有none，前端没有兼容一下
|
2024-08-02 16:29:23 +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 |
|
钟喜旺
|
1931ffda88
|
feat: 兜底轨迹详情接口没有返回调整
|
2024-08-01 17:18:50 +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 |
|
钟喜旺
|
2cea1a7912
|
feat: 轨迹预警规则缓存以及集群通知
|
2024-07-29 18:58:36 +08:00 |
|
钟喜旺
|
d0c2a92a82
|
feat: 区域添加了返回国家id
|
2024-07-29 14:09:15 +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 |
|
钟喜旺
|
3df894d20b
|
fix: 节点表添加子系统名称
|
2024-07-27 09:39:02 +08:00 |
|
钟喜旺
|
9494ca2cb7
|
feat: 轨迹映射-新增拉取界面增加字段：触发拉取节点
|
2024-07-26 21:04:19 +08:00 |
|
钟喜旺
|
4a0df97333
|
feat: 轨迹节点页面
|
2024-07-26 17:23:00 +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 |
|
|
|
c3f904ccdc
|
importance：预警初步重构
|
2024-07-25 21:06:06 +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 |
|
|
|
e32e2c15c4
|
1.升级用户中心包
2.加入otlp
|
2024-06-25 17:43:17 +08:00 |
|
|
|
56f8d95e48
|
opt：优化upsert逻辑
|
2024-05-09 15:45:59 +08:00 |
|
|
|
761446c069
|
attach
|
2024-05-09 12:01:02 +08:00 |
|
|
|
5cda1270fb
|
opt：优化更新轨迹
|
2024-05-09 11:46:15 +08:00 |
|
|
|
49eda2a3aa
|
opt：优化轨迹新增
|
2024-05-09 11:46:13 +08:00 |
|
|
|
148434dda0
|
fix：删除不存在文档response.IsValid为false引起的异常
|
2024-04-25 20:23:12 +08:00 |
|
|
|
62ba69aed9
|
attach
|
2024-04-25 19:07:55 +08:00 |
|
|
|
399106ec0a
|
retry：滚动上下文只能500，因此回退到普通循环
|
2024-04-25 18:27:59 +08:00 |
|
|
|
9d3ef9e4a3
|
change：轨迹删除降级为滚动删除
|
2024-04-25 18:21:02 +08:00 |
|
|
|
d8f594f193
|
try abort
|
2024-04-25 17:22:41 +08:00 |
|
|
|
c6e99193c3
|
fix：轨迹删除引发的主表维护不完整
|
2024-04-25 17:00:27 +08:00 |
|
|
|
09881a3932
|
attach
|
2024-04-24 21:44:08 +08:00 |
|
|
|
ee35276ee6
|
change：语法降级
|
2024-04-24 18:00:02 +08:00 |
|
|
|
5ab91c3d8c
|
temp
|
2024-04-24 17:49:31 +08:00 |
|
|
|
9bf4150990
|
try：es批量del禁止冲突检测
|
2024-04-24 11:13:05 +08:00 |
|
|
|
ae1b785273
|
try：update-by-query实现bulk del
|
2024-04-24 10:40:26 +08:00 |
|
|
|
04ef345481
|
opt：拆包
|
2024-04-23 12:00:53 +08:00 |
|
|
|
71ec9f09cc
|
Merge remote-tracking branch 'origin/S03-轨迹中台优化项' into S03-轨迹中台优化项
|
2024-04-22 15:05:26 +08:00 |
|
|
|
2c5aa4f35a
|
opt：定时任务刷新轨迹分页
|
2024-04-22 15:05:01 +08:00 |
|
moyongzhen
|
d95bcb70c0
|
fix：轨迹标记分页查询添加code模糊
|
2024-04-22 14:42:40 +08:00 |
|
|
|
af09e75811
|
opt
|
2024-04-16 18:49:15 +08:00 |
|
|
|
1f115bad3e
|
change：es 获取list size改为1000
|
2024-04-16 18:34:39 +08:00 |
|
|
|
2b678c2eb4
|
fix：轨迹聚合size
|
2024-04-16 14:59:10 +08:00 |
|
|
|
7769d6cf80
|
fix：轨迹刷新到服务商轨迹单条入库
|
2024-04-16 14:33:29 +08:00 |
|
|
|
64ab6757a9
|
opt
|
2024-04-16 11:47:21 +08:00 |
|
|
|
932ca3d1c5
|
opt
|
2024-04-15 19:02:01 +08:00 |
|
|
|
a28a9ac5db
|
change：轨迹代码为--的不参与计算
|
2024-04-15 14:09:12 +08:00 |
|
|
|
639a2232a3
|
fix：order link query logic
|
2024-04-15 09:59:14 +08:00 |
|
|
|
2bedb127b6
|
opt：重构
|
2024-04-12 21:34:15 +08:00 |
|
moyongzhen
|
3aecf92eb7
|
轨迹推送配置关系对外接口
|
2024-04-11 15:14:01 +08:00 |
|
|
|
0b8e9da918
|
change：轨迹查询对外逻辑调整
|
2024-04-03 17:51:00 +08:00 |
|
|
|
e73d083096
|
com：对接轨迹推送，新增字段：是否全量推送
|
2024-04-02 09:41:36 +08:00 |
|
|
|
65ac8b2a50
|
com：对接轨迹模板-新增字段：对外显示原轨迹
|
2024-04-02 09:23:54 +08:00 |
|
|
|
e85e3244bf
|
全量推送
|
2024-04-01 16:07:35 +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 |
|
|
|
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 |
|
|
|
676cdad78c
|
fix 手动更新bug
|
2024-03-27 16:50:40 +08:00 |
|
|
|
10d6f28fc8
|
1
|
2024-03-27 14:49:19 +08:00 |
|
|
|
b232d96634
|
opt：优化轨迹upsert流程
|
2024-03-26 17:31:50 +08:00 |
|
|
|
0f49547776
|
opt: 推送记录冗余orderNo，orderType
|
2024-03-26 15:19:13 +08:00 |
|
|
|
1334637bf2
|
fix 手动推送bug
|
2024-03-26 14:52:18 +08:00 |
|
|
|
2520955613
|
opt：预警过滤掉创建时间不足12小时的
|
2024-03-26 10:44:05 +08:00 |
|
|
|
c053a83a27
|
预警只处理未完成的单
|
2024-03-25 17:39:23 +08:00 |
|
|
|
9ab866df9e
|
fix 修复nest 轨迹推送索引命名问题
|
2024-03-23 15:27:09 +08:00 |
|
|
|
3bc9b233d5
|
1
|
2024-03-23 14:12:02 +08:00 |
|
|
|
a13ee83d00
|
删除引发的更新delay3s
|
2024-03-19 15:26:51 +08:00 |
|
|
|
8f1da65c5a
|
测试
|
2024-03-19 14:58:53 +08:00 |
|
|
|
b17f01b157
|
调整轨迹变更导致订单更新逻辑
|
2024-03-19 14:35:34 +08:00 |
|
|
|
6cc32ffbad
|
调整推送索引字段
|
2024-03-18 17:30:21 +08:00 |
|
moyongzhen
|
21c6422f23
|
补充
|
2024-03-18 17:20:00 +08:00 |
|
moyongzhen
|
757f60e5e8
|
提交代码
|
2024-03-18 17:08:28 +08:00 |
|
|
|
36706ae62c
|
临时提交
|
2024-03-18 16:15:01 +08:00 |
|
|
|
f189cb1a63
|
临时提交
|
2024-03-18 15:40:50 +08:00 |
|
|
|
80e6cc0c53
|
初步完成轨迹推送
|
2024-03-18 14:39:09 +08:00 |
|
|
|
f39cd3421c
|
init
|
2024-03-18 09:44:42 +08:00 |
|
|
|
d819dfe6d8
|
临时提交
|
2024-03-16 10:29:04 +08:00 |
|
|
|
f8d5705551
|
临时提交
|
2024-03-15 16:52:36 +08:00 |
|
|
|
91ad7eebb8
|
临时提交
|
2024-03-15 14:49:09 +08:00 |
|
|
|
8f0f40cc56
|
定时任务
|
2024-03-14 11:49:24 +08:00 |
|
moyongzhen
|
953bca93f5
|
轨迹订单参数提交
|
2024-03-13 10:16:27 +08:00 |
|
moyongzhen
|
6bea8224f0
|
订单参数调整
|
2024-03-13 09:34:42 +08:00 |
|
moyongzhen
|
d23edffffc
|
轨迹订单添加问题类型字段和问题描述返参
|
2024-03-12 21:13:20 +08:00 |
|
|
|
2e86b7f7ba
|
change【更新轨迹需要更新订单的最新轨迹信息】https://www.tapd.cn/60863849/prong/tasks/view/1160863849001016391
|
2024-03-12 17:28:15 +08:00 |
|
|
|
767cbcc319
|
Merge remote-tracking branch 'origin/S02-轨迹中台' into S02-轨迹中台
|
2024-03-12 16:00:01 +08:00 |
|
|
|
f4b7645ddf
|
支持批量新增、更新轨迹
|
2024-03-12 15:59:34 +08:00 |
|
柳文翔
|
ff32e003f4
|
拉取 推送 列表返回子系统id
|
2024-03-12 10:49:04 +08:00 |
|
柳文翔
|
edf9704ffe
|
修改参数表字段；添加拉去配置缓存
|
2024-03-11 09:46:17 +08:00 |
|
|
|
9ae2a8335a
|
轨迹刷新初步完成
|
2024-03-09 18:08:42 +08:00 |
|
|
|
e17eb425a4
|
临时提交
|
2024-03-09 16:15:04 +08:00 |
|
|
|
76fcd29ca7
|
add 关联补轨迹，add 批量删除轨迹
|
2024-03-08 18:45:34 +08:00 |
|
柳文翔
|
2e0a1f3e4d
|
轨迹映射修改
|
2024-03-08 09:50:02 +08:00 |
|
moyongzhen
|
62c43ab146
|
轨迹明细是否删除和对外的调整
|
2024-03-06 19:48:43 +08:00 |
|
moyongzhen
|
7836a78be6
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-06 17:44:37 +08:00 |
|
moyongzhen
|
cd60b420ac
|
轨迹明细调整
|
2024-03-06 17:44:26 +08:00 |
|
|
|
7f43cbfe66
|
attach
|
2024-03-06 15:31:50 +08:00 |
|
|
|
769fb8b66a
|
change 轨迹删除逻辑
|
2024-03-06 15:18:08 +08:00 |
|
|
|
8922d98ba4
|
fix 轨迹可删过滤
|
2024-03-06 14:51:41 +08:00 |
|
|
|
e2a34ede15
|
attach
|
2024-03-06 14:21:30 +08:00 |
|
|
|
a339608efb
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-06 11:24:38 +08:00 |
|
|
|
fd54550937
|
fix【S1-跨子系统的订单有关联关系，但是没有根据配置内容映射来向下新增轨迹】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029806
|
2024-03-06 11:24:08 +08:00 |
|
moyongzhen
|
f14bed991f
|
调整轨迹明细字段赋值
|
2024-03-06 11:15:41 +08:00 |
|
|
|
447ea8ae8f
|
fix【S1-更新轨迹成功后，时区没有按照传参来存储】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029832
|
2024-03-06 10:56:00 +08:00 |
|
|
|
c37cf3350f
|
Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台
|
2024-03-06 10:38:20 +08:00 |
|
|
|
0b224b8379
|
fix 轨迹处理循环依赖问题、模板明细对外显示问题
|
2024-03-06 10:26:07 +08:00 |
|
moyongzhen
|
d9905878ae
|
轨迹订单分页查询调整
|
2024-03-06 10:02:05 +08:00 |
|
moyongzhen
|
78f6edbbeb
|
轨迹明细调整
|
2024-03-05 21:04:30 +08:00 |
|
moyongzhen
|
317d59861a
|
列表的最新轨迹需要调整
|
2024-03-05 20:46:00 +08:00 |
|
moyongzhen
|
e510d1ce9a
|
Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台
|
2024-03-05 20:06:18 +08:00 |
|
moyongzhen
|
d76e7c29a1
|
轨迹明细调整
|
2024-03-05 20:06:09 +08:00 |
|
|
|
2b299fb709
|
fix 订单关联sql
|
2024-03-05 17:42:34 +08:00 |
|
|
|
a4a04bf5a6
|
fix 订单关联查询sql
|
2024-03-05 17:25:07 +08:00 |
|
|
|
9f2667ac6e
|
fix【S1-根据订单号获取轨迹接口-时区不填写，没有默认 +8，按模板顺序查询没有结果】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029746
|
2024-03-05 16:21:35 +08:00 |
|
