Merge branch 'lyh-bug-36975' into test

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

@@ -35,6 +35,8 @@ public interface ICameraDetailService extends IService<CameraDetail> {
 
     void addUsedSpace(HashMap<Long, Long> cameraMap);
 
+    void addUsedSpace(Long id,Long space);
+
     List<CameraAppVo> getListByUserAndType(Long userId, Integer cameraType);
 
     List<CameraAppVo> getListByUserIdsAndType(List<Long> userId, Integer cameraType);

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

@@ -171,6 +171,14 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     }
 
     @Override
+    public void addUsedSpace(Long id,Long space) {
+        LambdaUpdateWrapper<CameraDetail> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(CameraDetail::getId,id);
+        wrapper.setSql("used_space + " + space);
+        this.update(wrapper);
+    }
+
+    @Override
     public List<CameraAppVo> getListByUserAndType(Long userId, Integer cameraType) {
         return this.getBaseMapper().getListByUserAndType(userId,cameraType);
     }

src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java

@@ -267,8 +267,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 }
                 scenePlus.setSceneStatus(-2);
                 this.updateById(scenePlus);
-                cameraDetail.setUsedSpace(cameraDetail.getUsedSpace() + plusExt.getSpace());
-                cameraDetailService.updateById(cameraDetail);
+                cameraDetailService.addUsedSpace(cameraDetail.getId(),plusExt.getSpace());
                 sceneCopyLogService.saveByNum(oldNum,newNum,scenePlus.getUserId());
             }catch (Exception e){
                 log.error("复制场景失败-V4-sceneNum:{},error:{}",oldNum,e);

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

@@ -826,8 +826,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 }
                 scenePro.setStatus(-2);
                 this.updateById(scenePro);
-                cameraDetail.setUsedSpace(cameraDetail.getUsedSpace() + scenePro.getSpace());
-                cameraDetailService.updateById(cameraDetail);
+                cameraDetailService.addUsedSpace(cameraDetail.getId(),scenePro.getSpace());
                 sceneCopyLogService.saveByNum(oldNum,newNum,scenePro.getUserId());
 
             }catch ( Exception e){