weizhihong
|
92b6722334
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-07-04 13:18:25 +08:00 |
|
weizhihong
|
4a37fd70b2
|
【坐标转换逻辑修改】
|
2023-07-04 13:18:18 +08:00 |
|
tiger_zhou
|
13f4bb4acb
|
模拟设备状态变更接口
|
2023-07-04 10:33:35 +08:00 |
|
weizhihong
|
c059ac912f
|
【坐标转换BUG】
|
2023-07-04 10:17:27 +08:00 |
|
weizhihong
|
f0a5b00f3a
|
【公里标转换】
|
2023-07-03 18:44:55 +08:00 |
|
|
|
e5ff8453c6
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# xian-ncc-da-message
|
2023-06-30 17:55:00 +08:00 |
|
|
|
1dfbacb370
|
修改报警的数据结构
|
2023-06-30 17:54:29 +08:00 |
|
weizhihong
|
4c1c7ff020
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-30 17:18:01 +08:00 |
|
weizhihong
|
56b7a0d14e
|
【线网测试数据查询频率】
|
2023-06-30 17:17:52 +08:00 |
|
tiger_zhou
|
9cedb63b0e
|
返回数据调整
|
2023-06-30 17:14:23 +08:00 |
|
weizhihong
|
f7879fe0d7
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-30 16:50:05 +08:00 |
|
weizhihong
|
e965a43c94
|
【修复线网数据发布出错】
|
2023-06-30 16:49:58 +08:00 |
|
tiger_zhou
|
460a449f38
|
数据解析调整，ws返回设备，列车没有数据的时候返回null
|
2023-06-30 16:08:17 +08:00 |
|
|
|
e29c999288
|
修改TopicMessage中的data类型为byte[]；修改监听器框架会触发事件的父类及接口的监听器；修改西安NCC报警信息通过ws发送时的数据格式
|
2023-06-30 15:14:09 +08:00 |
|
weizhihong
|
500f680d73
|
【调整道岔结构】
|
2023-06-30 14:19:14 +08:00 |
|
tiger_zhou
|
e51f673364
|
数据存储调整
|
2023-06-30 13:53:13 +08:00 |
|
weizhihong
|
06699a176a
|
【公里标属性设置】
|
2023-06-30 09:30:05 +08:00 |
|
weizhihong
|
5697eae75a
|
【修复保存内容不生效BUG】
|
2023-06-29 16:26:20 +08:00 |
|
|
|
61e7006286
|
Merge remote-tracking branch 'origin/master'
|
2023-06-29 16:11:28 +08:00 |
|
|
|
37445a2723
|
修改fastjson2序列化时将byte[]序列化为Base64字符串，反之在反序列化时将Base64字符串反序列化为byte[]
|
2023-06-29 16:11:15 +08:00 |
|
weizhihong
|
3bc08e1280
|
【公里标修改long类型】
|
2023-06-29 15:58:29 +08:00 |
|
|
|
c046a52214
|
Merge remote-tracking branch 'origin/master'
|
2023-06-29 14:16:36 +08:00 |
|
|
|
db61e44edc
|
修改报警任务及报警信息发送服务的注册启动的位置和时机
|
2023-06-29 14:16:26 +08:00 |
|
tiger_zhou
|
9b240b8e17
|
ws 订阅地址调整
|
2023-06-29 13:28:52 +08:00 |
|
tiger_zhou
|
e8ba67dae7
|
模拟数据请求
|
2023-06-29 13:18:08 +08:00 |
|
|
|
494e8ccb2e
|
Merge remote-tracking branch 'origin/master'
|
2023-06-28 16:29:46 +08:00 |
|
|
|
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 |
|
