joylink/xian-ncc-da-server
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【增加警告信息打印，修改方法名称】

Browse Source
This commit is contained in:
weizhihong 2023-07-17 14:16:59 +08:00
parent cf49960128
commit ead852b955
6 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/club/joylink/xiannccda/ats/cache/LineGraphicDataRepository.java vendored
View File

@ -61,7 +61,7 @@ public class LineGraphicDataRepository {
* @param sectionName 区段名称
* @return 公里标
*/
public static List<Long> getSectionDefaultKmCodeList(int lineId, String sectionName) {
public static List<Long> getKilometerCodeList(int lineId, String sectionName) {
Map<String, Map<String, Builder>> lineDataMap = lineGraphMap.get(lineId);
if (CollectionUtils.isNotEmpty(lineDataMap)) {
Map<String, Builder> sectionMap = lineDataMap.get(DeviceType.Section.name());
@ -71,6 +71,14 @@ public class LineGraphicDataRepository {
return builder.getConvertKilometerList();
}
}
Map<String, Builder> turnoutMap = lineDataMap.get(DeviceType.Turnout.name());
for (Builder v : turnoutMap.values()) {
DeviceInfoProto.Turnout.Builder builder = (DeviceInfoProto.Turnout.Builder) v;
if (Objects.equals(builder.getCode(), sectionName)) {
return builder.getConvertKilometerList();
}
}
}
return List.of();
}

2
src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainInitConvertor.java
View File

@ -51,7 +51,7 @@ public class LineNetTrainInitConvertor extends DeviceStatusConvertor {
// 获取到当前区段公里标
if (DeviceType.DEVICE_TYPE_TRACK.equals(trainCell.getDevType())) {
List<Long> kmCodeList =
LineGraphicDataRepository.getSectionDefaultKmCodeList(
LineGraphicDataRepository.getKilometerCodeList(
response.getLineId(), trainCell.getDevName());
if (CollectionUtils.isNotEmpty(kmCodeList)) {
offset.setShow(true); // 是否显示

4
src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainRecordConvertor.java
View File

@ -45,7 +45,7 @@ public class LineNetTrainRecordConvertor extends DeviceStatusConvertor {
offset.setShow(false);
// 获取到当前区段公里标
List<Long> kmCodeList =
LineGraphicDataRepository.getSectionDefaultKmCodeList(
LineGraphicDataRepository.getKilometerCodeList(
response.getLineId(), response.getTrackName());
if (CollectionUtils.isNotEmpty(kmCodeList)) {
offset.setShow(true); // 如果公里标存在则
@ -58,6 +58,8 @@ public class LineNetTrainRecordConvertor extends DeviceStatusConvertor {
kilometer = kmCodeList.get(0);
}
offset.setKilometerCode(kilometer);
} else {
log.warn(String.format("设备%s没有公里标信息", response.getTrackName()));
}
buildList.add(offset);
}

6
src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainRemoveConvertor.java
View File

@ -17,9 +17,7 @@ import java.util.List;
import java.util.Objects;
import lombok.extern.slf4j.Slf4j;
/**
* 列车信息移除时，线网信息处理
*/
/** 列车信息移除时，线网信息处理 */
@Slf4j
public class LineNetTrainRemoveConvertor extends DeviceStatusConvertor {
@ -50,7 +48,7 @@ public class LineNetTrainRemoveConvertor extends DeviceStatusConvertor {
// 获取到当前区段公里标
if (DeviceType.DEVICE_TYPE_TRACK.equals(response.getDevType())) {
List<Long> kmCodeList =
LineGraphicDataRepository.getSectionDefaultKmCodeList(
LineGraphicDataRepository.getKilometerCodeList(
response.getLineId(), response.getDevName());
if (CollectionUtils.isNotEmpty(kmCodeList)) {
offset.setKilometerCode(kmCodeList.get(0));

2
src/main/java/club/joylink/xiannccda/ats/message/collect/convertor/LineNetTrainUpdateConvertor.java
View File

@ -48,7 +48,7 @@ public class LineNetTrainUpdateConvertor extends DeviceStatusConvertor {
// 获取到当前区段公里标
if (DeviceType.DEVICE_TYPE_TRACK.equals(response.getDevType())) {
List<Long> kmCodeList =
LineGraphicDataRepository.getSectionDefaultKmCodeList(
LineGraphicDataRepository.getKilometerCodeList(
response.getLineId(), response.getDevName());
if (CollectionUtils.isNotEmpty(kmCodeList)) {
offset.setShow(true); // 是否显示

2
xian-ncc-da-message

@ -1 +1 @@
Subproject commit 874a6fe4fafcda375e7479e7da0d67d1061ab2f1
Subproject commit e8ac23070828a1eca3bd68b6f78e4e419123d139