|
@@ -188,13 +188,13 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
|
|
|
return R.ok(copy(DeviceRegisterDto.Vo.class, list));
|
|
|
}
|
|
|
|
|
|
- @ApiOperation("修改")
|
|
|
- @PostMapping("update")
|
|
|
+ @ApiOperation("修改sn")
|
|
|
+ @PostMapping("updateSn")
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public R update(@RequestBody @Validated DeviceRegisterDto.Update update) {
|
|
|
+ public R updateSn(@RequestBody @Validated DeviceRegisterDto.UpdateSn updateSn) {
|
|
|
//校验
|
|
|
- String deviceSn = update.getDeviceSn();
|
|
|
- Long deviceId = update.getDeviceId();
|
|
|
+ String deviceSn = updateSn.getDeviceSn();
|
|
|
+ Long deviceId = updateSn.getDeviceId();
|
|
|
if (Emptys.check(deviceSn)) {
|
|
|
DeviceRegister deviceRegister = getById(deviceId);
|
|
|
if (!deviceSn.equals(deviceRegister.getDeviceSn())) {
|
|
@@ -204,19 +204,18 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- //修改注册登记
|
|
|
- DeviceRegister deviceRegister = copy(DeviceRegister.class, update);
|
|
|
- updateById(deviceRegister);
|
|
|
- //修改其他表
|
|
|
- if (Emptys.check(deviceSn)) {
|
|
|
- //修改系统信息
|
|
|
- deviceSysinfoService.updateById(new DeviceSysinfo().setDeviceId(deviceId).setDeviceSn(deviceSn));
|
|
|
- //修改mqtt认证
|
|
|
- LambdaUpdateWrapper<MqttUser> mqttUserLambdaUpdateWrapper = new LambdaUpdateWrapper<MqttUser>()
|
|
|
- .set(MqttUser::getSn, deviceSn)
|
|
|
- .eq(MqttUser::getDeviceId, deviceId);
|
|
|
- mqttUserService.update(mqttUserLambdaUpdateWrapper);
|
|
|
- }
|
|
|
+ //修改注册等级
|
|
|
+ update(new LambdaUpdateWrapper<DeviceRegister>()
|
|
|
+ .set(DeviceRegister::getDeviceSn, updateSn.getDeviceSn())
|
|
|
+ .eq(DeviceRegister::getDeviceId, deviceId));
|
|
|
+ //修改系统信息
|
|
|
+ deviceSysinfoService.update(new LambdaUpdateWrapper<DeviceSysinfo>()
|
|
|
+ .set(DeviceSysinfo::getDeviceSn, updateSn.getDeviceSn())
|
|
|
+ .eq(DeviceSysinfo::getDeviceId, deviceId));
|
|
|
+ //修改mqtt认证
|
|
|
+ mqttUserService.update(new LambdaUpdateWrapper<MqttUser>()
|
|
|
+ .set(MqttUser::getSn, deviceSn)
|
|
|
+ .eq(MqttUser::getDeviceId, deviceId));
|
|
|
return R.ok();
|
|
|
}
|
|
|
}
|