Merge branch 'feature-容量计算方式改造-20230624-dsx' into test

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

@@ -34,13 +34,15 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Override
     public Long sumUsedSpaceByCameraId(Long cameraId, String spaceTypeStr) {
-        LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<ScenePro>().select(ScenePro::getSpace)
+        LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<ScenePro>()
+                .eq(ScenePro::getCameraId, cameraId)
                 .in(ScenePro::getStatus, SceneStatus.SUCCESS.code(), SceneStatus.NO_DISPLAY.code())
                 .eq(ScenePro::getPayStatus, PayStatus.PAY.code());
 
         SpaceType spaceType = SpaceType.get(spaceTypeStr);
         switch (spaceType){
             case GB:
+                wrapper.select(ScenePro::getSpace);
                 List<ScenePro> list = this.list(wrapper);
                 if(CollUtil.isEmpty(list)){
                     return 0L;