|
|
c7a1d91753
|
fix：推送轨迹对接接口通
|
2024-09-19 15:25:12 +08:00 |
|
|
|
04946a395d
|
对接前端，返回服务商id
|
2024-09-19 14:13:25 +08:00 |
|
|
|
b49678b77f
|
重构订单关联
|
2024-09-18 16:38:22 +08:00 |
|
|
|
8bc1c4917d
|
重构项目结构
|
2024-09-18 11:03:41 +08:00 |
|
|
|
f42e2db302
|
梳理预警通知
|
2024-09-18 10:38:32 +08:00 |
|
|
|
6ed311bc1f
|
temp
|
2024-09-15 18:33:12 +08:00 |
|
|
|
e0e376404e
|
优化
|
2024-09-15 17:13:48 +08:00 |
|
|
|
22ebcda424
|
提供接口
|
2024-09-15 11:13:54 +08:00 |
|
|
|
9d2c10c4db
|
对接接口通
|
2024-09-14 16:00:06 +08:00 |
|
|
|
17a3a8a36d
|
对接前端
|
2024-09-13 16:59:52 +08:00 |
|
|
|
affc1e10a3
|
【 1. 轨迹模板页面新增编辑弹窗增加分类和客户2个字段，非必填，限制{子系统+模板名称+模板代码+分类+客户}唯一】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027903
|
2024-09-13 16:09:44 +08:00 |
|
|
|
8b360f350f
|
去除多余字段
|
2024-09-12 17:50:52 +08:00 |
|
|
|
92bb68f854
|
对接前端
|
2024-09-12 16:04:55 +08:00 |
|
|
|
d5e4a6ef8c
|
fix：索引命名问题
|
2024-09-12 11:55:29 +08:00 |
|
|
|
cb3f8b2756
|
fix：mysql时间范围问题
|
2024-09-12 10:32:04 +08:00 |
|
|
|
21cda2ad2a
|
轨迹标记非必填
|
2024-09-12 09:36:35 +08:00 |
|
|
|
ee319020e8
|
fix：column name打错
|
2024-09-12 08:53:33 +08:00 |
|
|
|
06ee271dac
|
change：拉取配置，接口通返回参数化
|
2024-09-10 17:16:46 +08:00 |
|
|
|
ba868dc168
|
change：轨迹内容有多个轨迹标记
|
2024-09-10 16:43:58 +08:00 |
|
|
|
42e2d6bc96
|
add：定时清理
|
2024-09-10 09:57:26 +08:00 |
|
|
|
e78427521c
|
轨迹刷新算法更新
|
2024-09-10 09:43:33 +08:00 |
|
|
|
a52ddf7b8a
|
定时任务轨迹运输时效预警推送
|
2024-09-09 15:28:07 +08:00 |
|
|
|
b39d84655d
|
temp
|
2024-09-07 18:14:17 +08:00 |
|
|
|
8bf76305fe
|
add：为所有对外接口加上子系统参数
|
2024-09-07 10:41:53 +08:00 |
|
|
|
42bae65d38
|
【通知方式通知人单选变多选】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001028431
|
2024-09-06 17:32:53 +08:00 |
|
|
|
bb7a3c2312
|
【 3. 拉取映射新增编辑页面拉取轨迹状态支持添加多个】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027894
|
2024-09-06 17:12:18 +08:00 |
|
|
|
ae2aa614ce
|
【 1. 拉取映射新增编辑页面去除拉取轨迹代码和拉取轨迹内容】
https://www.tapd.cn/60863849/prong/tasks/view/1160863849001027892
|
2024-09-06 15:32:42 +08:00 |
|
|
|
0b65128051
|
【优化订单的完结判断逻辑】
https://www.tapd.cn/60863849/prong/stories/view/1160863849001026850
|
2024-09-06 15:28:08 +08:00 |
|
|
|
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 |
|
钟喜旺
|
f4313461a0
|
feat: 12小时推送预警轨迹锁添加非阻塞锁
|
2024-08-07 10:14:19 +08:00 |
|
|
|
3127a3a38e
|
change：轨迹code相同，时间、发生地不同的，允许存在多条
|
2024-08-06 16:53:47 +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 |
|
钟喜旺
|
b30846a811
|
feat: 定时任务推送预警（》12小时没有推送的 改为事件提交
|
2024-08-05 16:19:04 +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 |
|
钟喜旺
|
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 |
|
|
|
ed5b46586f
|
temp
|
2024-08-02 15:01:32 +08:00 |
|
|
|
cee0e1e888
|
fix： Column 'StartTrackStatusId' specified twice
|
2024-08-02 10:52:08 +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 |
|
钟喜旺
|
f1d15c34df
|
feat: 新增拉取界面增加字段：触发拉取节点 二次自测完成
|
2024-07-30 16:47:47 +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 |
|
钟喜旺
|
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 |
|
钟喜旺
|
2f172f43c0
|
feat: 轨迹映射-新增拉取界面增加字段：触发拉取节点
|
2024-07-26 17:56:03 +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 |
|
钟喜旺
|
d5135249f7
|
fix: 调整order 表
|
2024-07-26 16:20:07 +08:00 |
|
钟喜旺
|
7cac2c55ee
|
Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警
|
2024-07-26 16:13:15 +08:00 |
|
钟喜旺
|
5b4c300baf
|
fix: 调整表结构
|
2024-07-26 16:13:01 +08:00 |
|
|
|
c7ae4e9d05
|
connect：对接预警查询
|
2024-07-26 16:12:43 +08:00 |
|
|
|
06d51528b0
|
fix：表名attribute
|
2024-07-26 16:00:07 +08:00 |
|
钟喜旺
|
45ce7a9949
|
feat: 订单表添加州省和邮编
alter table t_order add Postcode varchar(64) null comment '邮编';
alter table t_order add Province varchar(64) null comment '省份';
|
2024-07-26 15:34:39 +08:00 |
|
钟喜旺
|
02edff1580
|
Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警
|
2024-07-26 15:12:54 +08:00 |
|
钟喜旺
|
bd8879885b
|
fix： 调整area的表名
|
2024-07-26 15:12:43 +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 |
|
钟喜旺
|
740bc61558
|
feat: 还原
|
2024-07-25 10:33:14 +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 |
|
|
|
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 |
|
|
|
b5f7f86664
|
opt：优化推送幂等，优化cap重试机制
|
2024-05-27 15:40:59 +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 |
|
|
|
9d3ef9e4a3
|
change：轨迹删除降级为滚动删除
|
2024-04-25 18:21:02 +08:00 |
|
|
|
5ab91c3d8c
|
temp
|
2024-04-24 17:49:31 +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 |
|
|
|
f78d463a68
|
opt：升级core 7.7.5
|
2024-04-17 14:51:13 +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 |
|
|
|
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 |
|
|
|
fefbe18497
|
com：删除轨迹内容多余字段
|
2024-04-03 09:03:59 +08:00 |
|
|
|
e73d083096
|
com：对接轨迹推送，新增字段：是否全量推送
|
2024-04-02 09:41:36 +08:00 |
|
|
|
65ac8b2a50
|
com：对接轨迹模板-新增字段：对外显示原轨迹
|
2024-04-02 09:23:54 +08:00 |
|
|
|
4db7cdbdf8
|
com：对接轨迹拉取
|
2024-04-02 09:12:52 +08:00 |
|
|
|
e85e3244bf
|
全量推送
|
2024-04-01 16:07:35 +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 |
|
|
|
676cdad78c
|
fix 手动更新bug
|
2024-03-27 16:50:40 +08:00 |
|
|
|
6021e7c5d9
|
防gank
|
2024-03-27 10:40:39 +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 |
|
|
|
c053a83a27
|
预警只处理未完成的单
|
2024-03-25 17:39:23 +08:00 |
|
|
|
3bc9b233d5
|
1
|
2024-03-23 14:12:02 +08:00 |
|
|
|
0a9bf47df3
|
轨迹索引多存一个zero track time
|
2024-03-21 10:32:00 +08:00 |
|
|
|
367211f755
|
添加原轨迹信息
|
2024-03-21 09:25:11 +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 |
|
