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 |
|
|
|
51433579b3
|
Merge remote-tracking branch 'origin/master'
|
2023-06-16 17:51:49 +08:00 |
|
|
|
b50c73f30e
|
事件框架v0.2
|
2023-06-16 17:51:37 +08:00 |
|
|
|
5f6a36e933
|
WebSocket 消息服务抽象和demo
|
2023-06-16 17:16:53 +08:00 |
|
|
|
98a4ba7571
|
Merge remote-tracking branch 'origin/master'
|
2023-06-16 13:53:34 +08:00 |
|
|
|
6f711099dd
|
事件框架v0.1
|
2023-06-16 13:53:19 +08:00 |
|
weizhihong
|
89a57588b1
|
【websocket消息体结构】
|
2023-06-16 11:16:18 +08:00 |
|
|
|
3a952286e0
|
Merge remote-tracking branch 'origin/master'
|
2023-06-15 16:33:42 +08:00 |
|
|
|
de84ccf650
|
优化websocket连接认证异常处理
|
2023-06-15 16:33:34 +08:00 |
|
weizhihong
|
60fdee1c54
|
【设备定时发送任务】
|
2023-06-15 15:17:58 +08:00 |
|
tiger_zhou
|
ebc4af3b62
|
调整日志输出
|
2023-06-15 14:29:19 +08:00 |
|
tiger_zhou
|
e7dd8162dc
|
调整mock 结构
|
2023-06-15 13:42:29 +08:00 |
|
tiger_zhou
|
7ade47acac
|
Merge remote-tracking branch 'origin/master'
|
2023-06-15 13:25:14 +08:00 |
|
tiger_zhou
|
ddb8cd2b78
|
收集模拟数据，事后删除
|
2023-06-15 13:25:04 +08:00 |
|
weizhihong
|
49fa9ef858
|
【设备状态存储集合】
|
2023-06-15 13:19:15 +08:00 |
|
weizhihong
|
6c549b4b39
|
【判断设备状态信息不同逻辑修改】
|
2023-06-15 11:04:31 +08:00 |
|
weizhihong
|
fe25394e96
|
【状态信息对比逻辑】
|
2023-06-15 09:17:49 +08:00 |
|
weizhihong
|
718e0c7770
|
【删除无效引入】
|
2023-06-14 17:09:31 +08:00 |
|
weizhihong
|
c36cda43e2
|
【设备状态信息存储、对比】
|
2023-06-14 17:08:37 +08:00 |
|
tiger_zhou
|
982f5613db
|
mock 接口
|
2023-06-14 13:14:15 +08:00 |
|
tiger_zhou
|
b49a8a3805
|
mock 接口
|
2023-06-14 10:01:45 +08:00 |
|
|
|
49a955deb6
|
Merge remote-tracking branch 'origin/master'
|
2023-06-13 18:40:12 +08:00 |
|
|
|
f7ed4ffa36
|
添加websocket配置
|
2023-06-13 18:40:02 +08:00 |
|
tiger_zhou
|
72839b5870
|
mock 接口
|
2023-06-13 16:45:48 +08:00 |
|
tiger_zhou
|
483b4fb01c
|
代码调整
|
2023-06-13 13:42:10 +08:00 |
|
xzb
|
f1cdafac78
|
ncc协议x
|
2023-06-13 13:37:59 +08:00 |
|
xzb
|
94b37287ab
|
ncc协议x
|
2023-06-13 13:32:34 +08:00 |
|
xzb
|
624d2715f7
|
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/convertor/DeviceStatusConvertor.java
|
2023-06-13 13:14:44 +08:00 |
|
xzb
|
77f4d6f43d
|
ncc协议x
|
2023-06-13 13:12:30 +08:00 |
|
tiger_zhou
|
2ccb69710c
|
代码调整
|
2023-06-13 10:08:15 +08:00 |
|
tiger_zhou
|
2599d0bef3
|
调整移位计算
|
2023-06-13 10:05:29 +08:00 |
|
tiger_zhou
|
f475a82217
|
文件调整
|
2023-06-13 09:51:19 +08:00 |
|
xzb
|
8d00fa337b
|
ncc协议x
|
2023-06-12 16:56:17 +08:00 |
|
xzb
|
5a94989472
|
ncc协议x
|
2023-06-12 10:37:26 +08:00 |
|
xzb
|
4488352fa1
|
ncc协议x
|
2023-06-12 10:30:21 +08:00 |
|
xzb
|
d216411cf8
|
ncc协议x
|
2023-06-12 10:25:15 +08:00 |
|
xzb
|
46da540963
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-12 10:02:30 +08:00 |
|
xzb
|
f6f14d4e71
|
ncc协议x
|
2023-06-12 10:02:19 +08:00 |
|
xzb
|
69220a6edf
|
ncc协议x
|
2023-06-12 09:58:16 +08:00 |
|
tiger_zhou
|
16e7da5494
|
非实时消息
|
2023-06-09 17:55:34 +08:00 |
|
xzb
|
e185c2fe77
|
ncc协议x--设备位图复合状态转换为proto定义的状态
|
2023-06-09 16:09:52 +08:00 |
|
xzb
|
f930f97a08
|
ncc协议x--设备位图复合状态转换为proto定义的状态
|
2023-06-09 15:37:51 +08:00 |
|
xzb
|
d47214cc32
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-09 14:59:14 +08:00 |
|
xzb
|
ed5de037bc
|
ncc协议x
|
2023-06-09 14:58:59 +08:00 |
|
tiger_zhou
|
da77905c1a
|
Merge remote-tracking branch 'origin/master'
|
2023-06-09 14:47:26 +08:00 |
|
tiger_zhou
|
c721febcc0
|
非实时消息
|
2023-06-09 14:47:06 +08:00 |
|
weizhihong
|
e6925eea9c
|
【增加发布信息判断】
|
2023-06-09 14:46:27 +08:00 |
|
weizhihong
|
4e84442313
|
【线路管理非空验证BUG】
|
2023-06-09 14:32:29 +08:00 |
|
xzb
|
55cbaf5aef
|
ncc协议x
|
2023-06-09 14:15:50 +08:00 |
|
xzb
|
fc3a511749
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-09 10:14:17 +08:00 |
|
xzb
|
c6ac513148
|
ncc协议x
|
2023-06-09 10:13:44 +08:00 |
|
tiger_zhou
|
251e99b63c
|
非实时消息
|
2023-06-09 09:57:59 +08:00 |
|
tiger_zhou
|
f4c54a0424
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
|
2023-06-09 09:43:38 +08:00 |
|
tiger_zhou
|
68c7cb0a4d
|
非实时消息
|
2023-06-09 09:43:27 +08:00 |
|
xzb
|
30a4372b17
|
ncc协议x
|
2023-06-09 09:37:16 +08:00 |
|
xzb
|
2021a5d921
|
ncc协议x
|
2023-06-09 09:18:09 +08:00 |
|
tiger_zhou
|
2687a98b76
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
|
2023-06-08 18:08:09 +08:00 |
|
tiger_zhou
|
670a103e7b
|
非实时消息
|
2023-06-08 18:07:58 +08:00 |
|
xzb
|
986aa282b9
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-08 18:02:47 +08:00 |
|
xzb
|
a4dfde4ffe
|
ncc协议x
|
2023-06-08 18:02:20 +08:00 |
|
weizhihong
|
5aac47bbac
|
【提取功能代码】
|
2023-06-08 17:51:30 +08:00 |
|
weizhihong
|
86826cdfb3
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-08 17:42:20 +08:00 |
|
weizhihong
|
be85419ab6
|
【线路、发布逻辑修改】
|
2023-06-08 17:42:08 +08:00 |
|
xzb
|
46f1de9c75
|
ncc协议x
|
2023-06-08 17:29:37 +08:00 |
|
xzb
|
2e9a85c962
|
ncc协议x
|
2023-06-08 17:27:20 +08:00 |
|
tiger_zhou
|
5c87f6a2bb
|
非实时消息
|
2023-06-08 17:16:28 +08:00 |
|
tiger_zhou
|
2f8a895764
|
非实时消息
|
2023-06-08 17:14:38 +08:00 |
|
tiger_zhou
|
5035199d0f
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
|
2023-06-08 17:14:27 +08:00 |
|
xzb
|
6104c3c6de
|
ncc协议x
|
2023-06-08 17:12:47 +08:00 |
|
tiger_zhou
|
6b0905f8fb
|
非实时消息
|
2023-06-08 17:12:29 +08:00 |
|
xzb
|
c926a4a6b5
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-08 17:06:54 +08:00 |
|
xzb
|
bb9f1d9f5b
|
ncc协议x
|
2023-06-08 17:06:40 +08:00 |
|
tiger_zhou
|
d3d856d45d
|
非实时消息
|
2023-06-08 17:05:43 +08:00 |
|
tiger_zhou
|
836d4b484b
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
|
2023-06-08 15:48:30 +08:00 |
|
xzb
|
e8ca05baa4
|
ncc协议x
|
2023-06-08 15:47:48 +08:00 |
|
xzb
|
d3ddc5e158
|
ncc协议x
|
2023-06-08 15:42:33 +08:00 |
|
tiger_zhou
|
7735b3e63b
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
|
2023-06-08 15:14:04 +08:00 |
|
xzb
|
78e8c82a46
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-08 15:14:02 +08:00 |
|
xzb
|
f20698d484
|
ncc协议x
|
2023-06-08 15:13:49 +08:00 |
|
tiger_zhou
|
7f72d50572
|
非实时消息
|
2023-06-08 15:12:02 +08:00 |
|
weizhihong
|
f1cb61ddf4
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-08 15:07:47 +08:00 |
|
weizhihong
|
2c3567ff2c
|
【修改发布图形接口、线路接口】
|
2023-06-08 15:07:36 +08:00 |
|
xzb
|
67c85e8594
|
ncc协议x
|
2023-06-08 14:59:05 +08:00 |
|
xzb
|
98f39938ab
|
ncc协议x
|
2023-06-08 14:54:43 +08:00 |
|
tiger_zhou
|
6c476e2f90
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
|
2023-06-08 14:27:40 +08:00 |
|
tiger_zhou
|
482d868824
|
非实时消息
|
2023-06-08 14:27:20 +08:00 |
|
weizhihong
|
a02837c2a9
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-08 14:26:00 +08:00 |
|
weizhihong
|
f213530179
|
【线路管理接口;发布图形接口】
|
2023-06-08 14:25:51 +08:00 |
|
xzb
|
ef9f091308
|
ncc协议x
|
2023-06-08 14:19:50 +08:00 |
|
xzb
|
0ca0971f07
|
ncc协议x
|
2023-06-08 14:05:19 +08:00 |
|
xzb
|
0434283e24
|
ncc协议x
|
2023-06-08 14:02:50 +08:00 |
|
xzb
|
6f5c63565e
|
ncc协议x
|
2023-06-08 13:57:16 +08:00 |
|
xzb
|
b2ff6a0334
|
ncc协议x
|
2023-06-08 13:47:47 +08:00 |
|
xzb
|
c023c4889a
|
ncc协议x
|
2023-06-08 13:40:44 +08:00 |
|
xzb
|
f6cc6bcba5
|
ncc协议x
|
2023-06-08 13:30:06 +08:00 |
|
xzb
|
631009eff1
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-08 13:20:34 +08:00 |
|
xzb
|
6023ff23ef
|
ncc协议x
|
2023-06-08 13:20:24 +08:00 |
|
tiger_zhou
|
4b8f32b146
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
|
2023-06-08 13:09:34 +08:00 |
|
tiger_zhou
|
61b15b4cdf
|
非实时消息
|
2023-06-08 13:09:16 +08:00 |
|
weizhihong
|
a295a59f06
|
【线路增删改查】
|
2023-06-08 13:04:29 +08:00 |
|
xzb
|
873a0d297b
|
ncc协议x
|
2023-06-08 11:26:06 +08:00 |
|
xzb
|
21567c062f
|
ncc协议x
|
2023-06-08 11:22:12 +08:00 |
|
xzb
|
bf3267a695
|
ncc协议x
|
2023-06-08 11:18:53 +08:00 |
|
tiger_zhou
|
50129e0e87
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server into master-zy
|
2023-06-08 11:09:15 +08:00 |
|
tiger_zhou
|
b7f6e20ce5
|
非实时消息
|
2023-06-08 11:08:55 +08:00 |
|
xzb
|
f6f30a083f
|
ncc协议x
|
2023-06-08 11:03:37 +08:00 |
|
tiger_zhou
|
2c0fbf4193
|
非实时消息
|
2023-06-08 10:36:18 +08:00 |
|
xzb
|
a6a09fc920
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-06-08 10:35:55 +08:00 |
|
xzb
|
bd6c3a080f
|
ncc协议x
|
2023-06-08 10:35:35 +08:00 |
|
|
|
0031c952ba
|
添加发布图形数据库相关
|
2023-06-08 10:17:50 +08:00 |
|
|
|
6582255309
|
调整OCC客户端及连接、超时重连逻辑
调整OCC测试服务，添加非实时服务
|
2023-06-07 17:51:49 +08:00 |
|
