|
|
27af2ab543
|
修改报警提示信息的数据结构，在报警信息中增加对应的报警提示信息id；删除jackjson的LocalDateTime序列化反序列化配置；修改默认使用fastjson2作为序列化工具，增加fastjson2的全局LocalDateTime序列化反序列化配置
|
2023-06-28 16:29:34 +08:00 |
|
tiger_zhou
|
a7da2e5202
|
Merge remote-tracking branch 'origin/master'
|
2023-06-28 16:07:05 +08:00 |
|
tiger_zhou
|
2219ea9aa1
|
模拟数据接口调整
|
2023-06-28 16:06:53 +08:00 |
|
weizhihong
|
bca7885be7
|
【列车删除更新转换】
|
2023-06-28 16:01:31 +08:00 |
|
weizhihong
|
071e8b3231
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
# Conflicts:
# src/main/java/club/joylink/xiannccda/mock/message/NccMockDataService.java
# src/main/java/club/joylink/xiannccda/service/LineDeviceStatusService.java
|
2023-06-28 14:36:21 +08:00 |
|
weizhihong
|
35c9c6bd91
|
【测试列车报点数据】
|
2023-06-28 14:30:39 +08:00 |
|
tiger_zhou
|
909bd0bcac
|
模拟数据加载及线路设备，列车信息
|
2023-06-28 11:22:50 +08:00 |
|
weizhihong
|
6e7a720425
|
【增加列车信息转换】
|
2023-06-27 17:58:10 +08:00 |
|
weizhihong
|
465bb1c96d
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
# Conflicts:
# src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationInitResponse.java
# src/main/java/club/joylink/xiannccda/ats/message/line3/rep/TrainIndicationUpdateResponse.java
# src/main/java/club/joylink/xiannccda/dto/protos/WsMessageProto.java
|
2023-06-27 15:15:03 +08:00 |
|
weizhihong
|
fc3cc1d383
|
【修改线路构建信息】
|
2023-06-27 15:10:19 +08:00 |
|
tiger_zhou
|
c8c44a126b
|
列车数据mode属性调整
|
2023-06-26 15:32:25 +08:00 |
|
tiger_zhou
|
0dae9b7021
|
Merge remote-tracking branch 'origin/master'
|
2023-06-26 14:47:44 +08:00 |
|
tiger_zhou
|
148f2c38f5
|
拆分列车信息
|
2023-06-26 14:47:28 +08:00 |
|
weizhihong
|
d135e9398e
|
【非草稿创建人，不能编辑草稿】
|
2023-06-26 14:45:49 +08:00 |
|
weizhihong
|
df92af2318
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-26 10:22:50 +08:00 |
|
weizhihong
|
c89d49e0d5
|
【修改接口路径】
|
2023-06-26 10:22:39 +08:00 |
|
tiger_zhou
|
91907e6c21
|
线路模拟订阅数据
|
2023-06-26 09:56:42 +08:00 |
|
weizhihong
|
41e107139e
|
【注释错误内容】
|
2023-06-26 09:53:56 +08:00 |
|
weizhihong
|
1d040eb3b2
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-26 09:51:33 +08:00 |
|
weizhihong
|
01f67dc787
|
【列车设备消息转换】
|
2023-06-26 09:51:29 +08:00 |
|
|
|
90340d5897
|
Merge remote-tracking branch 'origin/master'
|
2023-06-26 09:33:35 +08:00 |
|
|
|
1ed726eb84
|
增加全局时间类型字段的序列化/反序列化配置
|
2023-06-26 09:33:16 +08:00 |
|
weizhihong
|
530e1666e0
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-25 17:53:32 +08:00 |
|
weizhihong
|
8653b5c69c
|
【查询已发布现网数据】
【修改发布逻辑】
|
2023-06-25 17:53:27 +08:00 |
|
tiger_zhou
|
31d7024d41
|
线路模拟订阅数据
|
2023-06-25 17:26:27 +08:00 |
|
weizhihong
|
ecf9672ce2
|
【主键递增设置】
|
2023-06-25 16:30:32 +08:00 |
|
|
|
0096c83d82
|
修改所有DTO为大写
|
2023-06-25 09:49:42 +08:00 |
|
|
|
fc362ebda6
|
增加：项目启动后注册报警事件及报警的辅助决策提示的增删改查接口
|
2023-06-25 09:44:14 +08:00 |
|
weizhihong
|
cf2dc72445
|
【修改列车主键标识】
|
2023-06-21 16:10:42 +08:00 |
|
weizhihong
|
06b5f499c4
|
【修改线路时，数据加锁】
|
2023-06-21 15:52:36 +08:00 |
|
weizhihong
|
28d55ef8db
|
【处理消息转换】
|
2023-06-21 14:37:11 +08:00 |
|
weizhihong
|
bcb50b8381
|
【设备状态转换】
|
2023-06-21 14:22:21 +08:00 |
|
tiger_zhou
|
95db3729b5
|
线路测试数据功能，ats接收数据添加转换proto接口
|
2023-06-20 16:36:10 +08:00 |
|
xzb
|
6f80cb25bc
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-20 15:55:04 +08:00 |
|
xzb
|
9b0194acab
|
删除TransProto.proto相关
|
2023-06-20 15:54:44 +08:00 |
|
weizhihong
|
ea14a277d0
|
【列车websocket修改字段】
|
2023-06-20 15:53:34 +08:00 |
|
weizhihong
|
1e12a5381c
|
【线网websocket测试数据】
|
2023-06-20 15:22:03 +08:00 |
|
weizhihong
|
b9478a544f
|
【删除对比逻辑】
|
2023-06-20 11:11:31 +08:00 |
|
weizhihong
|
48078e2186
|
【增加线路ID】
|
2023-06-20 09:28:35 +08:00 |
|
weizhihong
|
e1580dcac4
|
【websocket测试数据】
|
2023-06-20 08:45:42 +08:00 |
|
weizhihong
|
96f6a0a924
|
【增加注释】
|
2023-06-19 14:28:23 +08:00 |
|
weizhihong
|
037f3b890f
|
【websocket全量信息发送】
|
2023-06-19 09:30:39 +08:00 |
|
|
|
6e8ca3694c
|
Merge remote-tracking branch 'origin/master'
|
2023-06-19 09:26:46 +08:00 |
|
|
|
704526f5d7
|
事件框架v0.3.1
|
2023-06-19 09:26:32 +08:00 |
|
weizhihong
|
14a6489396
|
【设备状态比较逻辑】
|
2023-06-19 09:08:23 +08:00 |
|
weizhihong
|
484076b249
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-16 19:41:54 +08:00 |
|
weizhihong
|
c147993941
|
【线路数据websocket消息逻辑】
|
2023-06-16 19:41:49 +08:00 |
|
|
|
5e40849e16
|
Merge remote-tracking branch 'origin/master'
|
2023-06-16 18:32:13 +08:00 |
|
|
|
9006dd8ed9
|
事件框架v0.3
|
2023-06-16 18:31:59 +08:00 |
|
|
|
eac0d9fbe9
|
WebSocket消息服务定时发送实现
|
2023-06-16 18:23:39 +08:00 |
|
