Commit Graph

1296 Commits

Author SHA1 Message Date
2f2805268e Revert "temp:remove notify table"
This reverts commit 9de31445a9.
2024-08-05 09:57:15 +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
4f0153c61c Merge remote-tracking branch 'origin/S04轨迹预警' into S04轨迹预警 2024-08-05 09:32:25 +08:00
d7c84cfc4a 【cheery pick】temp:remove notify table 2024-08-05 09:30:40 +08:00
db42bcc2b3 temp:remove notify table 2024-08-05 09:29:53 +08:00
9de31445a9 temp:remove notify table 2024-08-05 09:23:26 +08:00
decb50a085 Merge branch 'refs/heads/dev' into test 2024-08-02 17:52:48 +08:00
钟喜旺
8a2fb92900 feat: 限制只能输入英文和英文符号 2024-08-02 17:45:27 +08:00
c0cc783131 Merge branch 'refs/heads/S04轨迹预警' into test 2024-08-02 16:45:52 +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
bf91143197 Merge branch 'refs/heads/S04轨迹预警' into test 2024-08-02 15:01:40 +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
ef102e9177 Merge branch 'refs/heads/S04轨迹预警' into test 2024-08-02 09:08:32 +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
钟喜旺
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