异物侵限报警修改

business-service/src/main/java/com/ozs/service/entity/BaseDeviceResume.java

@@ -24,7 +24,7 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class BaseDeviceResume extends BaseEntity implements Serializable {
+public class BaseDeviceResume  implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

business-service/src/main/java/com/ozs/service/entity/BaseElectricityResume.java

@@ -24,7 +24,7 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class BaseElectricityResume extends BaseEntity implements Serializable {
+public class BaseElectricityResume  implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -1050,14 +1050,18 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
             BaseDeviceDynamicManagement deviceDynamicManagement = baseDeviceDynamicManagementService.getOne(
                     new LambdaQueryWrapper<BaseDeviceDynamicManagement>()
                             .eq(BaseDeviceDynamicManagement::getCameraCode, cameraCode));
+            Long count = baseDeviceResumeService.count(
+                    new LambdaQueryWrapper<BaseDeviceResume>()
+                            .eq(BaseDeviceResume::getCameraCode, cameraCode)
+                            .eq(BaseDeviceResume::getIsDisable, status));
 
-            boolean shouldDisable = (status == 1) || (deviceDynamicManagement != null && deviceDynamicManagement.getIsDisable().equals(1));
+            boolean shouldDisable = (status == 1) || (deviceDynamicManagement != null && (status == 2 && deviceDynamicManagement.getIsDisable().equals(1)));
 
             BaseDeviceResume resume = new BaseDeviceResume();
             resume.setCameraCode(cameraCode);
             resume.setIsDisable(status);
 
-            if (shouldDisable) {
+            if (shouldDisable||count<=0) {
                 resumes.add(resume);
             }
         }