|
|
6e740fc924
|
Merge remote-tracking branch 'origin/master'
|
2023-07-27 10:39:54 +08:00 |
|
|
|
107c5918e0
|
增加正式服务器发布配置
|
2023-07-27 10:39:25 +08:00 |
|
tiger_zhou
|
9412712aa3
|
数据收集还使用json
|
2023-07-26 16:16:54 +08:00 |
|
|
|
5658ef7ad7
|
修改json序列化配置bug
|
2023-07-26 14:32:00 +08:00 |
|
tiger_zhou
|
b6c89e3857
|
Merge remote-tracking branch 'origin/master'
|
2023-07-26 11:21:01 +08:00 |
|
tiger_zhou
|
b76ce9a69b
|
收集设备状态数据-protobuf
|
2023-07-26 11:20:52 +08:00 |
|
|
|
92a6cd33e4
|
Merge remote-tracking branch 'origin/master'
|
2023-07-26 11:17:02 +08:00 |
|
|
|
6e29fbaa07
|
设置序列化枚举使用名字而非序号
|
2023-07-26 11:16:49 +08:00 |
|
tiger_zhou
|
fafd45f130
|
收集设备状态数据-protobuf
|
2023-07-26 11:00:36 +08:00 |
|
|
|
138099b302
|
报警记录增加报警地点数据；AlertType和AlertLocation使用proto文件定义
|
2023-07-26 09:56:56 +08:00 |
|
|
|
9de0a24573
|
Merge remote-tracking branch 'origin/master'
|
2023-07-25 17:23:54 +08:00 |
|
|
|
2937319969
|
增加报警记录表、逻辑、接口
|
2023-07-25 17:23:38 +08:00 |
|
weizhihong
|
00c82d229e
|
【删除线网测试数据推送逻辑】
|
2023-07-25 16:51:59 +08:00 |
|
weizhihong
|
7f21bb2281
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-07-25 11:12:14 +08:00 |
|
weizhihong
|
e209801521
|
【列车运行方向判断逻辑增加车次号判断】
|
2023-07-25 11:12:07 +08:00 |
|
|
|
f4454c96c5
|
修改报警信息级别（列车延误2分钟III级，其余都是I级）
|
2023-07-25 09:56:13 +08:00 |
|
|
|
535d4dce08
|
消除报错
|
2023-07-24 16:26:34 +08:00 |
|
|
|
14454be2dc
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/club/joylink/xiannccda/ats/cache/LineGraphicDataRepository.java
# xian-ncc-da-message
|
2023-07-24 16:24:51 +08:00 |
|
|
|
49a56f880d
|
修改报警信息内容（proto文件同步修改）
|
2023-07-24 16:19:51 +08:00 |
|
weizhihong
|
5ce927a7df
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
# Conflicts:
# src/main/java/club/joylink/xiannccda/ats/cache/LineGraphicDataRepository.java
|
2023-07-21 17:04:45 +08:00 |
|
weizhihong
|
cfa8eb81a1
|
【修改设备公里标初始化，增加道岔区段初始化】
|
2023-07-21 17:01:43 +08:00 |
|
|
|
5fed73b214
|
修改设备数据维护及查询方式；修改报警信息中相关设备的描述信息
|
2023-07-21 14:15:56 +08:00 |
|
weizhihong
|
d338cbb135
|
Merge branch 'master' into develop_wei
|
2023-07-21 11:09:18 +08:00 |
|
weizhihong
|
04b47b5e16
|
【修改报错，去除无效日志打印】
|
2023-07-21 11:08:42 +08:00 |
|
|
|
e997462d4d
|
漏提交一个文件
|
2023-07-21 10:25:47 +08:00 |
|
|
|
bd3cbbbd6e
|
增加模拟故障接口；增加绘图数据维护；注释循环故障报警逻辑
|
2023-07-21 10:23:54 +08:00 |
|
weizhihong
|
4fe577e87c
|
线路数据匹配逻辑处理
|
2023-07-21 09:21:11 +08:00 |
|
tiger_zhou
|
604eb28066
|
Merge remote-tracking branch 'origin/master'
|
2023-07-20 17:02:09 +08:00 |
|
tiger_zhou
|
12a03596e7
|
修改逻辑区段名称解析最后字母前加"-"
|
2023-07-20 17:01:58 +08:00 |
|
weizhihong
|
78f7fe2024
|
【区段信息解析BUG修复】
|
2023-07-20 17:01:38 +08:00 |
|
tiger_zhou
|
c5cbe04ab8
|
修改
1 occ 消息解析资源释放
2生成protobuf设备名称解析
3添加消息处理类
4 删除老版本设备解析
|
2023-07-20 11:09:47 +08:00 |
|
tiger_zhou
|
43cd1bffb0
|
接受occ设备转换设备名称
|
2023-07-19 15:24:23 +08:00 |
|
weizhihong
|
03f9fb4807
|
线网图列车定位前做设备名称转换
|
2023-07-19 14:36:06 +08:00 |
|
weizhihong
|
56456614af
|
Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-server
|
2023-07-19 13:41:57 +08:00 |
|
weizhihong
|
f82fc994eb
|
【修改逻辑区段初始化逻辑】
|
2023-07-19 13:41:32 +08:00 |
|
|
|
5c4cc34acf
|
增加屏蔽门蓝显故障发布任务
|
2023-07-19 11:24:27 +08:00 |
|
tiger_zhou
|
dfef6a21e4
|
Merge remote-tracking branch 'origin/master'
|
2023-07-19 11:19:33 +08:00 |
|
tiger_zhou
|
bafe1940ce
|
模拟设备状态变更接口调整
|
2023-07-19 11:19:20 +08:00 |
|
weizhihong
|
ad9464b5d8
|
【区段逻辑区段信息初始化增加】
|
2023-07-19 11:16:16 +08:00 |
|
tiger_zhou
|
a50aaeaadf
|
设备名称变更
|
2023-07-19 10:10:38 +08:00 |
|
weizhihong
|
0eec98f251
|
【注释部分代码，数据正确后再处理】
|
2023-07-18 16:12:13 +08:00 |
|
tiger_zhou
|
a81568ebfb
|
设备名称变更
|
2023-07-18 14:19:00 +08:00 |
|
tiger_zhou
|
da6e506688
|
设备名称变更
|
2023-07-18 13:25:47 +08:00 |
|
tiger_zhou
|
d154d09855
|
模拟设备状态变更接口调整
|
2023-07-18 10:01:51 +08:00 |
|
weizhihong
|
77e2f2e104
|
【修改线网列车信息更新】
|
2023-07-18 09:49:24 +08:00 |
|
tiger_zhou
|
1cd2b8afb8
|
模拟设备状态变更接口调整
|
2023-07-17 17:34:03 +08:00 |
|
tiger_zhou
|
bea73f80fb
|
模拟设备状态变更接口调整
|
2023-07-17 17:32:14 +08:00 |
|
tiger_zhou
|
b706a19245
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/club/joylink/xiannccda/dto/protos/LayoutGraphicsProto.java
|
2023-07-17 17:30:59 +08:00 |
|
tiger_zhou
|
c7759c1372
|
更新列车目的地码
|
2023-07-17 17:30:32 +08:00 |
|
|
|
1dcd9682a5
|
增加根据id查询决策信息接口
|
2023-07-17 16:16:48 +08:00 |
|
