Commit Graph

486 Commits

Author SHA1 Message Date
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
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
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
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
钟喜旺
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
钟喜旺
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
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
6b211d8f7f temp 2024-07-29 11:55:36 +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
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
061cffc6c3 add:预警crud 2024-07-26 12:59:01 +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
c772c68e47 review 2024-07-24 11:14:58 +08:00
DESKTOP-S2TSHMH\BSI
895e12762d feat: 预警功能相关代码 2024-07-24 08:54:56 +08:00
47ea3b8f82 token解析变更 2024-06-25 17:53:56 +08:00
b5f7f86664 opt:优化推送幂等,优化cap重试机制 2024-05-27 15:40:59 +08:00
4b0acb1978 opt:优化轨迹刷新定时任务等待超时问题 2024-05-14 17:17:14 +08:00
96b3486956 fix:手动推送 子系统,客户 分组推 2024-04-25 10:23:09 +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
2c5aa4f35a opt:定时任务刷新轨迹分页 2024-04-22 15:05:01 +08:00
aecb488045 change:轨迹刷新最短cd 60min 2024-04-22 14:14:45 +08:00
932ca3d1c5 opt 2024-04-15 19:02:01 +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
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
5a6b2a0f5d change:只有轨迹增删改做幂等 2024-04-08 18:42:51 +08:00
66d5a5c4d5 fix:【【轨迹订单】"是否自动推送"为否,新增轨迹明细后,异常自动推送轨迹明细】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001032644 2024-04-07 21:21:21 +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
a261c21284 fix:sql bug 2024-04-02 20:11:57 +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
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
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
2304a1f918 fix 轨迹刷新 attach base64问题 2024-03-27 18:58:03 +08:00
676cdad78c fix 手动更新bug 2024-03-27 16:50:40 +08:00
10d6f28fc8 1 2024-03-27 14:49:19 +08:00
a663894bcc fix:【【轨迹订单】批量新增轨迹明细,创建人异常为空】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001031517 2024-03-27 09:19:45 +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
4d9fb2bbfb opt:刷新最小CD设为60min 2024-03-26 11:06:11 +08:00
2fd73776af fix:【【新增轨迹订单明细】创建人异常为system】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001031387 2024-03-26 09:42:13 +08:00
e5e3b2ecce fix 轨迹刷新定时任务bug 2024-03-26 09:37:19 +08:00
c053a83a27 预警只处理未完成的单 2024-03-25 17:39:23 +08:00
33f26e19f1 推送时记录订单id 2024-03-23 15:07:49 +08:00
3bc9b233d5 1 2024-03-23 14:12:02 +08:00
7f0f11d0a3 推拉定时任务 2024-03-21 14:50:04 +08:00
4b189b378d 批量upsert轨迹也区分isAdd 2024-03-21 11:34:06 +08:00
柳文翔
07572a5838 修改推送缓存返回值 2024-03-20 17:26:59 +08:00
moyongzhen
55d7115b38 可能警告 2024-03-19 14:52:09 +08:00
moyongzhen
e71535f844 获取轨迹计数器、获取轨迹推送记录添加请求的方法名 2024-03-18 18:14:51 +08:00
6cc32ffbad 调整推送索引字段 2024-03-18 17:30:21 +08:00
moyongzhen
757f60e5e8 提交代码 2024-03-18 17:08:28 +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
51b529ae90 对接接口通7.1.6 2024-03-16 14:23:01 +08:00
8d186fa985 opt提示 2024-03-16 11:32:02 +08:00
d819dfe6d8 临时提交 2024-03-16 10:29:04 +08:00
柳文翔
c30542024c Merge branch 'S02-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台 2024-03-15 17:50:31 +08:00
柳文翔
18f065fbf1 修改 2024-03-15 17:50:29 +08:00
94852251a5 Merge remote-tracking branch 'origin/S02-轨迹中台' into S02-轨迹中台 2024-03-15 17:47:27 +08:00
25b7fc724a 测试 2024-03-15 17:47:10 +08:00
柳文翔
b484a53711 删除缓存时间 2024-03-15 17:12:24 +08:00
柳文翔
2845acce76 添加实现 2024-03-15 17:10:11 +08:00
柳文翔
b4295a97ae Merge branch 'S02-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台 2024-03-15 17:06:49 +08:00
柳文翔
b10f1cedfd 修改 2024-03-15 17:06:46 +08:00
ccdc43674c Merge remote-tracking branch 'origin/S02-轨迹中台' into S02-轨迹中台
# Conflicts:
#	src/SJZY.Track.Application/Services/TrackPush/TrackPushCacheService.cs
2024-03-15 16:54:43 +08:00
f8d5705551 临时提交 2024-03-15 16:52:36 +08:00
柳文翔
3871b31af0 删除无用引用 2024-03-15 16:13:47 +08:00
柳文翔
06e43db12c 补充 2024-03-15 16:12:55 +08:00
柳文翔
eb1a3480f0 Merge branch 'S02-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台 2024-03-15 16:09:28 +08:00
柳文翔
1d80a8de4e 添加推送配置缓存 2024-03-15 16:09:27 +08:00
moyongzhen
68abebe60a Merge branch 'S02-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台 2024-03-15 15:33:34 +08:00
moyongzhen
35bb8e13e0 轨迹订单明细补充s01遗漏代码 2024-03-15 15:33:27 +08:00
91ad7eebb8 临时提交 2024-03-15 14:49:09 +08:00
12c439c832 Merge remote-tracking branch 'origin/S02-轨迹中台' into S02-轨迹中台 2024-03-15 09:53:44 +08:00
f50dccebe8 临时提交 2024-03-15 09:53:24 +08:00
柳文翔
786f1f0d25 添加拉取配置缓存 2024-03-14 14:07:09 +08:00
8f0f40cc56 定时任务 2024-03-14 11:49:24 +08:00
92bf6f549f 调试轨迹刷新 2024-03-14 10:10:04 +08:00
柳文翔
6a6e46482a 修改拉取缓存设置 2024-03-14 09:21:22 +08:00
dingenwen
1718ede2ee 修复异常 2024-03-13 19:33:04 +08:00
柳文翔
c0b5db3ab5 修改错误语句 2024-03-13 17:16:15 +08:00
6a911177f7 add 校验订单至少有一个模板 2024-03-13 15:41:59 +08:00
moyongzhen
10a68b817a 重新解决报错 2024-03-12 21:23:47 +08:00
moyongzhen
d23edffffc 轨迹订单添加问题类型字段和问题描述返参 2024-03-12 21:13:20 +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
柳文翔
b1441abf26 添加轨迹拉取内容入参校验 2024-03-12 10:19:02 +08:00
柳文翔
2ce73fd57b 修改错误 2024-03-12 10:11:17 +08:00
ba78ba46ae change 整合轨迹服务、订单服务 2024-03-11 10:19:06 +08:00
柳文翔
be45223b94 Merge branch 'S02-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台 2024-03-11 09:46:18 +08:00
柳文翔
edf9704ffe 修改参数表字段;添加拉去配置缓存 2024-03-11 09:46:17 +08:00
88aba1edb8 add【轨迹中心对外接口提供--新增轨迹/更新轨迹订单】https://www.tapd.cn/60863849/prong/tasks/view/1160863849001016386 2024-03-11 09:10:03 +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
cd60b420ac 轨迹明细调整 2024-03-06 17:44:26 +08:00
0cf97ffd93 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-06 11:03:41 +08:00
7365a23f63 fix 轨迹查询时区不传默认为+8 2024-03-06 11:03:25 +08:00
moyongzhen
279bfcd1a4 提供接口去掉 轨迹订单和明细 2024-03-06 11:03:13 +08:00
moyongzhen
6d03e3b786 Merge branch 'S01-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S01-轨迹中台 2024-03-06 11:02:17 +08:00
moyongzhen
b337ea937b 轨迹明细查询一个变量写错了 2024-03-06 11:02:10 +08:00
447ea8ae8f fix【S1-更新轨迹成功后,时区没有按照传参来存储】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029832 2024-03-06 10:56:00 +08:00
de42e9e5cf fix 轨迹查询单号去空 2024-03-06 10:48:15 +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
25e3172275 1 2024-03-05 20:12:39 +08:00
moyongzhen
140ba7465a 轨迹明细调整 2024-03-05 20:11:49 +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
柳文翔
5f60f1ee06 修改 2024-03-05 19:01:59 +08:00
327db0fab1 fix【S1-订单关联接口,关联单号不填写,没有给出必填校验提示】https://www.tapd.cn/60863849/bugtrace/bugs/view?bug_id=1160863849001029771 2024-03-05 16:58:00 +08:00
5c0216a013 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-05 16:56:42 +08:00
272e740dac change 创建订单,子系统id从header取 2024-03-05 16:56:18 +08:00
moyongzhen
4f42663ad5 合并解决冲突 2024-03-05 16:55:28 +08:00
moyongzhen
4622906c29 调整轨迹订单明细 2024-03-05 16:53:51 +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
3c14a38578 change 更新轨迹时区 2024-03-05 14:46:26 +08:00
f62cb2cf56 attach 2024-03-05 11:36:56 +08:00
柳文翔
d21c832439 修改 2024-03-05 11:18:49 +08:00
柳文翔
9d8cdadc9c 修改问题和提示语 2024-03-05 10:50:07 +08:00
e7b80fb1fd change 添加提供接口路由前缀 2024-03-04 18:51:56 +08:00
e055bedaf1 Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台 2024-03-04 18:48:59 +08:00
22dd02507f test 轨迹查询、新增、修改、软删除 2024-03-04 18:48:43 +08:00
moyongzhen
9ba8266480 轨迹模版分页查询添加参数子系统id 2024-03-04 18:05:41 +08:00
moyongzhen
c2e3a4d26e Merge branch 'test' into S01-轨迹中台 2024-03-04 16:43:36 +08:00