lyhzzz 1 anno fa
parent
commit
1908b59eff

+ 1 - 1
src/main/java/com/fdkankan/manage/service/impl/CameraDetailServiceImpl.java

@@ -226,7 +226,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         long usedSpace = cameraDetail.getUsedSpace() - space ;
         cameraDetail.setUsedSpace(usedSpace < 0 ? 0L :usedSpace);
         //解封封存场景
-        if(!CacheUtil.uploadType.equals("local") && cameraDetail.getType() != 10 ){
+        if(!CacheUtil.uploadType.equals("local") && cameraDetail.getType() != 10 && cameraDetail.getType() != 11){
             sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId(),1);
         }
         this.updateById(cameraDetail);

+ 3 - 3
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -522,9 +522,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(sceneSource != null && (sceneSource == 4 || sceneSource == 5)){
             laserService.delete(num);
         }
-        if(cameraId != null){
-            cameraDetailService.addUsedSpace(cameraId,space);
-        }
+//        if(cameraId != null){
+//            cameraDetailService.addUsedSpace(cameraId,space);
+//        }
 
     }