joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

武汉8号线列车位置显示功能调整

Browse Source
This commit is contained in:
tiger_zhou 2022-09-09 08:51:33 +08:00
parent 5d66e5ae09
commit eaf30840a1
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/TrainPositionService.java
View File

@ -36,6 +36,8 @@ public class TrainPositionService {
*/ */
public void initTrainOrUpdate(String mapName,String json){ public void initTrainOrUpdate(String mapName,String json){
TrainPosition tp = JsonUtils.read(json, TrainPosition.class); TrainPosition tp = JsonUtils.read(json, TrainPosition.class);
tp.setReceiveTime(System.currentTimeMillis());
log.info(tp.toString());
List<Simulation> simulationList = this.findSimulationList(mapName); List<Simulation> simulationList = this.findSimulationList(mapName);
if(Objects.equals(true, CollectionUtils.isEmpty(simulationList))){ if(Objects.equals(true, CollectionUtils.isEmpty(simulationList))){
log.error("未找到对应的类型的仿真，无法渲染列车位置 param:{}",json); log.error("未找到对应的类型的仿真，无法渲染列车位置 param:{}",json);
@ -92,7 +94,7 @@ public class TrainPositionService {
list = list.stream().filter(d->d.getRoadType() == roadType && Objects.nonNull(d.getKmMin())) list = list.stream().filter(d->d.getRoadType() == roadType && Objects.nonNull(d.getKmMin()))
.sorted(Comparator.comparing(Section::getKmMin)).collect(Collectors.toList()); .sorted(Comparator.comparing(Section::getKmMin)).collect(Collectors.toList());
// simulationManager.putSectionDirCache(key,list); simulationManager.putSectionDirCache(key,list);
} }
return list; return list;
} }

9
src/main/java/club/joylink/rtss/vo/ws/TrainPosition.java
View File

@ -1,13 +1,14 @@
package club.joylink.rtss.vo.ws; package club.joylink.rtss.vo.ws;
import club.joylink.rtss.simulation.cbtc.data.map.Section; import club.joylink.rtss.simulation.cbtc.data.map.Section;
import club.joylink.rtss.util.JsonUtils;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.ToString; import lombok.ToString;
@Data @Data
@NoArgsConstructor @NoArgsConstructor
@ToString
public class TrainPosition { public class TrainPosition {
private String groupNum; private String groupNum;
/** /**
@ -15,7 +16,7 @@ public class TrainPosition {
*/ */
private int direction; private int direction;
private float location; private float location;
private Long receiveTime;
public Section.SectionRoadType getRoadType(){ public Section.SectionRoadType getRoadType(){
Section.SectionRoadType type = Section.SectionRoadType.LEFT; Section.SectionRoadType type = Section.SectionRoadType.LEFT;
if(this.direction == 1){ if(this.direction == 1){
@ -26,4 +27,8 @@ public class TrainPosition {
public boolean isRight(){ public boolean isRight(){
return this.direction == 1; return this.direction == 1;
} }
@Override
public String toString(){
return JsonUtils.writeValueNullableFieldAsString(this);
}
} }