添加sn号更改接口

device-api-service/src/main/java/com/xy/service/DeviceRegisterServiceImpl.java

@@ -131,9 +131,7 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
             mqttUserService.save(mqttUserInfo);
         } else {
             updateById(deviceRegister);
-            deviceInfoMapper.updateById(deviceInfo);
             deviceSysinfoMapper.updateById(deviceSysinfo);
-            deviceStatusMapper.updateById(deviceStatus);
             mqttUserService.update(new LambdaUpdateWrapper<MqttUser>()
                     .set(MqttUser::getSn, deviceRegister.getDeviceSn())
                     .eq(MqttUser::getDeviceId, deviceRegister.getDeviceId())
@@ -151,8 +149,11 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
                 .le(DeviceRegister::getCreateTime, page.getEndCreateTime())
                 .likeRight(DeviceRegister::getDeviceSn)
                 .build()
-                .isNotNull(page.getIsBind(), DeviceRegister::getDeviceSn)
-                .and(!page.getIsBind(), deviceRegisterLambdaQueryWrapper -> deviceRegisterLambdaQueryWrapper
+                .and(page.getIsBind() != null && page.getIsBind(), deviceRegisterLambdaQueryWrapper -> deviceRegisterLambdaQueryWrapper
+                        .isNotNull(DeviceRegister::getDeviceSn)
+                        .ne(DeviceRegister::getDeviceSn, "")
+                )
+                .and(page.getIsBind() != null && !page.getIsBind(), deviceRegisterLambdaQueryWrapper -> deviceRegisterLambdaQueryWrapper
                         .isNull(DeviceRegister::getDeviceSn)
                         .or()
                         .eq(DeviceRegister::getDeviceSn, "")

device-api/src/main/java/com/xy/dto/DeviceRegisterDto.java

@@ -64,7 +64,6 @@ public class DeviceRegisterDto {
         @ApiModelProperty(value = "创建时间-始")
         private LocalDate endCreateTime;
 
-        @NotNull(message = "isBind不能为空")
         @ApiModelProperty("是否已绑定")
         private Boolean isBind;