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 2023-05-15 10:32:51 +08:00
parent efb68f9496
commit c16b415c86
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/club/joylink/rtss/services/mapFunction/RtsMapFunctionServiceImpl.java
View File

@ -431,9 +431,12 @@ public class RtsMapFunctionServiceImpl implements RtsMapFunctionService {
if (StringUtils.hasText(defaultClientType)) { if (StringUtils.hasText(defaultClientType)) {
String deviceCode = defaultMember != null ? defaultMember.getDeviceCode() : null; String deviceCode = defaultMember != null ? defaultMember.getDeviceCode() : null;
Optional<MapClientVO> defaultClientOptional = clientVOList.stream() Optional<MapClientVO> defaultClientOptional = clientVOList.stream()
.filter(c -> Objects.equals(c.getType(), defaultClientType) .filter(c -> Objects.equals(c.getType(), defaultClientType) && Objects.equals(deviceCode, c.getDeviceCode()))
&& (StringUtils.isEmpty(deviceCode) || Objects.equals(deviceCode, c.getDeviceCode()) .findFirst();
)).findFirst(); // 没有找到默认获取一个
if (defaultClientOptional.isEmpty()) {
defaultClientOptional = clientVOList.stream().filter(c -> Objects.equals(c.getType(), defaultClientType)).findFirst();
}
if (defaultClientOptional.isEmpty()) { if (defaultClientOptional.isEmpty()) {
msgList.add(String.format("地图[名:%s]设备[%s]不存在客户端类型[%s]", mapDetail.getName(), deviceCode, defaultClientType)); msgList.add(String.format("地图[名:%s]设备[%s]不存在客户端类型[%s]", mapDetail.getName(), deviceCode, defaultClientType));
} else { } else {