|
@@ -62,10 +62,14 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
|
|
|
DeviceRegister deviceRegister = copy(DeviceRegister.class, save);
|
|
|
DeviceCreateIds deviceCreateIds = deviceCreateIdsMapper.selectById(deviceRegister.getDeviceId());
|
|
|
if (deviceCreateIds == null) {
|
|
|
- return R.fail("设备不存在");
|
|
|
+ return R.fail("设备ID不存在");
|
|
|
}
|
|
|
if (deviceCreateIds.getBindState()) {
|
|
|
- return R.fail("设备已被绑定");
|
|
|
+ return R.fail("设备ID已被绑定");
|
|
|
+ }
|
|
|
+ long count = count(new LambdaQueryWrapper<DeviceRegister>().eq(DeviceRegister::getDeviceSn, save.getDeviceSn()));
|
|
|
+ if (count > 0) {
|
|
|
+ return R.fail("设备SN已被绑定");
|
|
|
}
|
|
|
deviceRegister.setDeviceType(deviceCreateIds.getDeviceType())
|
|
|
.setCreateUser(AuthorizeUtils.getLoginId(Long.class))
|
|
@@ -79,7 +83,11 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
|
|
|
Integer registerNum = one == null || one.getRegisterNum() == null ? 0 : one.getRegisterNum();
|
|
|
deviceRegister.setRegisterNum(registerNum + 1);
|
|
|
//修改设备-机器ID号生成为已绑定
|
|
|
- deviceCreateIdsMapper.updateById(new DeviceCreateIds().setDeviceId(deviceRegister.getDeviceId()).setBindState(true).setBindTime(deviceRegister.getCreateTime()));
|
|
|
+ deviceCreateIdsMapper.updateById(new DeviceCreateIds()
|
|
|
+ .setDeviceId(deviceRegister.getDeviceId())
|
|
|
+ .setBindState(true)
|
|
|
+ .setBindTime(deviceRegister.getCreateTime())
|
|
|
+ );
|
|
|
//新增设备-注册登记
|
|
|
save(deviceRegister);
|
|
|
//新增设备信息
|