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