lyhzzz 1 year ago
parent
commit
47e55b5627

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

@@ -55,5 +55,5 @@ public interface ICameraDetailService extends IService<CameraDetail> {
     void initSpace(CameraDetail cameraDetail);
     void initSpace(Long cameraId);
 
-    void updateUseSpace(Long cameraId, Integer spase);
+    void updateUseSpace(Long cameraId, Long spase);
 }

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

@@ -343,7 +343,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
 
 
     @Override
-    public void updateUseSpace(Long cameraId, Integer spase) {
+    public void updateUseSpace(Long cameraId, Long spase) {
         LambdaUpdateWrapper<CameraDetail> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(CameraDetail::getCameraId,cameraId);
         wrapper.setSql("used_space = used_space + " + spase);

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

@@ -444,8 +444,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             //FileUtil.move(new File(dataSource +"_laserData"),new File(newDataSource+"_laserData"),true);
             laserService.move(num,oldCamera.getSnCode(),camera.getSnCode(),cameraDetail.getUserId(),dataSource);
         }
-        cameraDetailService.updateUseSpace(oldCameraDetail.getCameraId(),-1);
-        cameraDetailService.updateUseSpace(cameraDetail.getCameraId(),+1);
+        cameraDetailService.updateUseSpace(oldCameraDetail.getCameraId(),oldCameraDetail.getUnit().equals("sp")?-1L: -space);
+        cameraDetailService.updateUseSpace(cameraDetail.getCameraId(),cameraDetail.getUnit().equals("sp")?+1L: +space);
 
         if(!"aws".equals(CacheUtil.uploadType) && oldCameraDetail.getType() != 11 && oldCameraDetail.getType() != 10 && subSpace >0){           //有剩余容量解封容量内场景
             this.lockOrUnLockBySpace(oldCameraDetail.getCameraId());