添加sn号更改接口

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

@@ -60,6 +60,8 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
 
     private DeviceSysinfoServiceImpl deviceSysinfoService;
 
+    private DeviceCreateIdsServiceImpl deviceCreateIdsService;
+
     @PostMapping("save")
     @ApiOperation("添加")
     @Transactional(rollbackFor = Exception.class)
@@ -135,6 +137,11 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
                 .le(DeviceRegister::getCreateTime, page.getEndCreateTime())
                 .likeRight(DeviceRegister::getDeviceSn)
                 .build()
+                .and(page.getIsBind() != null && !page.getIsBind(), deviceRegisterLambdaQueryWrapper -> deviceRegisterLambdaQueryWrapper
+                        .isNull(DeviceRegister::getDeviceSn)
+                        .or()
+                        .eq(DeviceRegister::getDeviceSn, "")
+                )
                 .orderByDesc(!Emptys.check(pageBean.getOrders()), DeviceRegister::getCreateTime);
         IPage<DeviceRegister> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
         PageBean<DeviceRegisterDto.Vo> voPageBean = toPageBean(DeviceRegisterDto.Vo.class, iPage);
@@ -216,6 +223,14 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
         mqttUserService.update(new LambdaUpdateWrapper<MqttUser>()
                 .set(MqttUser::getSn, deviceSn)
                 .eq(MqttUser::getDeviceId, deviceId));
+        //机器ID号生成清除绑定
+        if (!Emptys.check(deviceSn)) {
+            deviceCreateIdsService.update(new LambdaUpdateWrapper<DeviceCreateIds>()
+                    .set(DeviceCreateIds::getBindState, false)
+                    .set(DeviceCreateIds::getBindTime, null)
+                    .eq(DeviceCreateIds::getDeviceId, deviceId)
+            );
+        }
         return R.ok();
     }
 }

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

@@ -64,6 +64,9 @@ public class DeviceRegisterDto {
         @ApiModelProperty(value = "创建时间-始")
         private LocalDate endCreateTime;
 
+        @ApiModelProperty("是否已绑定")
+        private Boolean isBind;
+
         public LocalDateTime getBeginCreateTime() {
             return beginCreateTime == null ? null : beginCreateTime.atTime(0, 0, 0);
         }