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

【创建仿真时，项目为空默认处理；调度台设备为空处理；】

Browse Source
This commit is contained in:
weizhihong 2022-09-23 17:14:39 +08:00
parent 6178310259
commit c1f81a6fdf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/club/joylink/rtss/entity/project/Project.java
View File

@ -114,7 +114,7 @@ public class Project {
@JsonIgnore
public static boolean isDefault(String code) {
return DEFAULT_PROJECT_LABEL.contains(code);
return StringUtils.isEmpty(code) || DEFAULT_PROJECT_LABEL.contains(code);
}
/**

5
src/main/java/club/joylink/rtss/simulation/cbtc/CTC/rail/dcmd/service/DisCmdSendService.java
View File

@ -13,6 +13,7 @@ import club.joylink.rtss.websocket.StompMessageService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@ -33,7 +34,7 @@ public class DisCmdSendService {
*/
public void autoSendUnread(Simulation simulation, String userId) {
SimulationMember member = simulation.querySimulationMemberByUserId(userId);
if (null == member) return;
if (null == member || member.getDevice() == null) return;
DisCmdDb db = commonService.getCmdDb(simulation);
try {
db.lock();
@ -168,7 +169,7 @@ public class DisCmdSendService {
//机车号
String trainCode = to.getCode();
List<VirtualRealityTrain> trains = simulation.getRepository().getOnlineTrainList().stream().filter(tr -> {
return tr.getTripNumber().equals(trainNum)&&tr.getGroupNumber().equals(trainCode);
return tr.getTripNumber().equals(trainNum) && tr.getGroupNumber().equals(trainCode);
}).collect(Collectors.toList());
if (null != trains && !trains.isEmpty()) {
VirtualRealityTrain train = trains.get(0);