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

Merge branch 'dyf-device'

Browse Source
This commit is contained in:
daiyongfei
2025-07-23 19:23:57 +08:00
parent f80debbf2b d849be68ed
commit f70c3fa399
1 changed files with 8 additions and 2 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

@ -190,7 +190,8 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
device.setPubTopic("A/" + device.getDeviceImei());
device.setSubTopic("B/" + device.getDeviceImei());
}
// 0 未绑定
device.setBindingStatus(0);
deviceMapper.insert(device);
// 新增设备类型记录
@ -303,7 +304,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
throw new BadRequestException(device.getDeviceName() + ":设备已分配，请先解绑设备！！！");
}
if (device.getBindingStatus().equals(1)){
if (device.getBindingStatus() != null && device.getBindingStatus().equals(1)) {
throw new BadRequestException(device.getDeviceName() + ":设备已绑定，请先解绑设备！！！");
}
@ -312,6 +313,11 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
invalidIds.add(deviceAssignment.getDeviceId());
}
// 删除设备:分配记录
deviceAssignmentsMapper.delete(new LambdaQueryWrapper<DeviceAssignments>()
.eq(DeviceAssignments::getDeviceId, deviceAssignment.getDeviceId())
.eq(DeviceAssignments::getAssigneeId, deviceAssignment.getAssigneeId()));
}
deviceAssignmentsMapper.deleteByIds(ids);