设备升级任务

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

@@ -148,8 +148,11 @@ public class DeviceStatusServiceImpl extends ServiceImpl<DeviceStatusMapper, Dev
                     LambdaQueryWrapper<DeviceVersionUp> lambdaQueryWrapper = new LambdaQueryWrapper<DeviceVersionUp>()
                             .eq(DeviceVersionUp::getDeviceId, up.getDeviceId())
                             .ge(DeviceVersionUp::getDeviceVersion, upInfo.getVersion())
-                            .eq(DeviceVersionUp::getStatus, 4)
-                            .eq(DeviceVersionUp::getProgress, 100);
+                            .and(deviceVersionUpLambdaQueryWrapper -> deviceVersionUpLambdaQueryWrapper
+                                    .in(DeviceVersionUp::getStatus, Arrays.asList(2, 4, 5))
+                                    .or()
+                                    .eq(DeviceVersionUp::getProgress, 100)
+                            );
                     long count = deviceVersionUpService.count(lambdaQueryWrapper);
                     if (count > 0) {
                         return;