mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 11:05:18 +08:00
蓝牙桩分享
This commit is contained in:
@@ -496,7 +496,6 @@ public class PileService {
|
||||
// 充电桩没有绑定任何人
|
||||
throw new BusinessException(ReturnCodeEnum.CODE_NO_ADMIN_FOR_PILE);
|
||||
}
|
||||
|
||||
// 使用stream把relationList转为map, key为type, value为List<PileMemberRelation>
|
||||
Map<String, List<PileMemberRelation>> map = relationList.stream().collect(Collectors.groupingBy(PileMemberRelation::getType));
|
||||
List<PileMemberRelation> adminMemberRelationList = map.get(Constants.ONE); // 管理员列表
|
||||
@@ -513,26 +512,28 @@ public class PileService {
|
||||
// 如果不为空,说明被分享的用户是管理员,抛出异常
|
||||
throw new BusinessException(ReturnCodeEnum.CODE_ALREADY_AN_ADMIN);
|
||||
}
|
||||
List<String> userList = userMemberRelations.stream()
|
||||
.map(PileMemberRelation::getMemberId)
|
||||
.collect(Collectors.toList());
|
||||
List<String> userList = Lists.newArrayList();
|
||||
if (CollectionUtils.isNotEmpty(userMemberRelations)) {
|
||||
userList = userMemberRelations.stream()
|
||||
.map(PileMemberRelation::getMemberId)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
// 校验身份 入参是否是普通用户
|
||||
if (userList.contains(memberId)) {
|
||||
// 不为空说明已绑定
|
||||
throw new BusinessException(ReturnCodeEnum.CODE_ALREADY_AN_USER);
|
||||
} else {
|
||||
PileMemberRelation pileMemberRelation = adminMemberRelationList.get(0); // 获取管理员列表的第一个元素
|
||||
// 进行绑定,此用户为普通用户
|
||||
PileMemberRelation info = new PileMemberRelation();
|
||||
info.setPileSn(dto.getPileSn());
|
||||
info.setMemberId(memberId);
|
||||
info.setType(Constants.TWO);
|
||||
if (pileMemberRelation != null && StringUtils.isNotBlank(pileMemberRelation.getDeviceId())) {
|
||||
info.setDeviceId(pileMemberRelation.getDeviceId());
|
||||
info.setDeviceName(pileMemberRelation.getDeviceName());
|
||||
}
|
||||
pileMemberRelationService.insertPileMemberRelation(info);
|
||||
}
|
||||
PileMemberRelation pileMemberRelation = adminMemberRelationList.get(0); // 获取管理员列表的第一个元素
|
||||
// 进行绑定,此用户为普通用户
|
||||
PileMemberRelation info = new PileMemberRelation();
|
||||
info.setPileSn(dto.getPileSn());
|
||||
info.setMemberId(memberId);
|
||||
info.setType(Constants.TWO);
|
||||
if (pileMemberRelation != null && StringUtils.isNotBlank(pileMemberRelation.getDeviceId())) {
|
||||
info.setDeviceId(pileMemberRelation.getDeviceId());
|
||||
info.setDeviceName(pileMemberRelation.getDeviceName());
|
||||
}
|
||||
pileMemberRelationService.insertPileMemberRelation(info);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user