Merge branch 'test'

src/main/java/com/fdkankan/manage/httpClient/service/OverallService.java

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.httpClient.service;
 
+import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.manage.httpClient.client.OverallClient;
 import com.fdkankan.manage.httpClient.vo.OverallParam;
 import com.fdkankan.manage.httpClient.vo.OverallVo;
@@ -20,4 +21,9 @@ public class OverallService {
     public OverallVo list(OverallParam param) {
         return overallClient.list(param,appId,key);
     }
+
+    public static void main(String[] args) {
+        String username = JwtUtil.getUsername("eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxMzkyODUyNTYzOCIsImxvZ2luVHlwZSI6InVzZXIiLCJ1c2VyTmFtZSI6IjEzOTI4NTI1NjM4IiwiaWF0IjoxNzE2NDYwMjIyLCJqdGkiOiI2Nzc5OGM0Ni0wOTg0LTRiNjUtODYxMC02MGY0YmQ0NjhkZDQifQ.QM8oFz-H693qXxOz0oAAKXKGRP6GNA_L0GRSuktau8c");
+        System.out.println(username);
+    }
 }

src/main/java/com/fdkankan/manage/service/ICameraDetailService.java

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

src/main/java/com/fdkankan/manage/service/impl/CameraDetailServiceImpl.java

@@ -340,4 +340,13 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         }
         this.update(wrapper);
     }
+
+
+    @Override
+    public void updateUseSpace(Long cameraId, Long spase) {
+        LambdaUpdateWrapper<CameraDetail> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(CameraDetail::getCameraId,cameraId);
+        wrapper.setSql("used_space = used_space + " + spase);
+        this.update(wrapper);
+    }
 }

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -387,7 +387,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             dataSource = scenePlusExt.getDataSource();
         }
         space = space == null ? 0 :space;
-        cameraDetailService.initSpace(cameraDetail.getCameraId());
         Boolean checkSpace = cameraDetailService.checkSpace(cameraDetail, space);
         //深时场景无限容量
         if( !checkSpace){
@@ -446,8 +445,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.initSpace(oldCameraDetail);
-        cameraDetailService.initSpace(cameraDetail);
+        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());