lyhzzz 2 bulan lalu
induk
melakukan
d35ad3844b

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

@@ -296,8 +296,10 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
             if(incrementType!=null && incrementType.getCameraCapacity() == -1){
                 return true;
             }
+            Long proCount = sceneProService.getSpaceSumByCameraId(detailEntity.getCameraId());
+            Long plusCount = scenePlusService.getSpaceSumByCameraId(detailEntity.getCameraId());
             totalSpace = incrementType != null ?incrementType.getCameraCapacity()  * 1024 * 1024 * 1024L: detailEntity.getTotalSpace();
-            return detailEntity.getUsedSpace() + space <= totalSpace ;
+            return (proCount + plusCount + space ) <= totalSpace ;
         }
         return false;
     }