fys/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

删除设备

Browse Source
This commit is contained in:
daiyongfei
2025-07-23 10:53:26 +08:00
parent d84a7cde3b
commit 619356209b
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
View File

@ -297,14 +297,18 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
for (Long id : ids) {
DeviceAssignments deviceAssignment = deviceAssignmentsMapper.selectById(id);
Device deviceType = deviceMapper.selectById(deviceAssignment.getDeviceId());
Device device = deviceMapper.selectById(deviceAssignment.getDeviceId());
if (StringUtils.isNotEmpty(deviceAssignment.getAssigneeName())) {
throw new BadRequestException(deviceType.getDeviceName() + ":设备已分配，请先解绑设备！！！");
throw new BadRequestException(device.getDeviceName() + ":设备已分配，请先解绑设备！！！");
}
if (device.getBindingStatus().equals(1)){
throw new BadRequestException(device.getDeviceName() + ":设备已绑定，请先解绑设备！！！");
}
// 接收者
if (Objects.equals(deviceAssignment.getAssigneeId(), deviceType.getOriginalOwnerId())) {
if (Objects.equals(deviceAssignment.getAssigneeId(), device.getOriginalOwnerId())) {
invalidIds.add(deviceAssignment.getDeviceId());
}