|
|
cfe56effb2
|
Merge branch 'refs/heads/S04轨迹预警' into test
|
2024-08-07 09:51:21 +08:00 |
|
|
|
a4f78e7bb6
|
Revert "temp"
This reverts commit b59418e6ff.
|
2024-08-07 09:51:14 +08:00 |
|
|
|
69f01afd6f
|
Merge branch 'refs/heads/S04轨迹预警' into test
|
2024-08-07 09:42:57 +08:00 |
|
|
|
b59418e6ff
|
temp
|
2024-08-07 09:42:42 +08:00 |
|
|
|
c155a9d673
|
Merge branch 'refs/heads/S04轨迹预警' into test
|
2024-08-07 09:16:09 +08:00 |
|
钟喜旺
|
f50d427325
|
feat: 修复更新推送预警单bug
|
2024-08-06 22:14:57 +08:00 |
|
|
|
89b4c3f25e
|
Merge branch 'refs/heads/S04轨迹预警' into test
|
2024-08-06 17:12:44 +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 |
|
|
|
4590f4f01b
|
Merge branch 'refs/heads/S04轨迹预警' into test
|
2024-08-05 16:09:32 +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 |
|
|
|
28a4b6879d
|
Merge remote-tracking branch 'refs/remotes/origin/S04轨迹预警' into test
|
2024-08-05 10:08:55 +08:00 |
|
|
|
a3c4199a30
|
Revert "【cheery pick】temp：remove notify table"
This reverts commit d7c84cfc4a.
|
2024-08-05 10:01:12 +08:00 |
|
|
|
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 |
|
