Merge branch 'task-lyh-inctype2' into test

src/main/java/com/fdkankan/ucenter/mapper/IScenePlusMapper.java

@@ -22,4 +22,6 @@ public interface IScenePlusMapper extends BaseMapper<ScenePlus> {
     Page<AppSceneVo> pageList(Page<AppSceneVo> page, AppSceneParam param);
 
     Long getCountByUserId(@Param("userId") Long userId, @Param("cameraType") Integer cameraType);
+
+    Long getSpaceSumByCameraId(@Param("cameraId") Long cameraId);
 }

src/main/java/com/fdkankan/ucenter/mapper/ISceneProMapper.java

@@ -29,4 +29,6 @@ public interface ISceneProMapper extends BaseMapper<ScenePro> {
     Page<SceneVo> pageListAndFolder(Page<SceneVo>page,SceneParam param);
 
     Long getCountByUserId(@Param("userId") Long userId, @Param("cameraType") Integer cameraType);
+
+    Long getSpaceSumByCameraId(@Param("cameraId") Long cameraId);
 }

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

@@ -58,4 +58,7 @@ public interface ICameraDetailService extends IService<CameraDetail> {
     Boolean checkSpace(CameraDetail detailEntity, Long space);
 
     Boolean checkSpace(Long cameraId, Long space);
+
+    void initSpace(CameraDetail cameraDetail);
+    void initSpace(Long cameraId);
 }

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

@@ -47,5 +47,7 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
     Result getArPathByNum(String num);
 
-    Long getCountByCameraId(Long cameraId);
+    Long getCountByCameraId(Long cameraId,Boolean statsu);
+
+    Long getSpaceSumByCameraId(Long cameraId);
 }

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

@@ -90,5 +90,7 @@ public interface ISceneProService extends IService<ScenePro> {
 
     List<SimpleSceneVo> getSimpleSceneVo(Long cameraId);
 
-    Long getCountByCameraId(Long cameraId);
+    Long getCountByCameraId(Long cameraId,Boolean status);
+
+    Long getSpaceSumByCameraId(Long cameraId);
 }

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

@@ -14,6 +14,7 @@ import com.fdkankan.ucenter.vo.response.AppCameraSpace;
 import com.fdkankan.ucenter.vo.response.CameraAppVo;
 import com.fdkankan.ucenter.vo.response.GroupByCount;
 import org.apache.commons.lang3.StringUtils;
+import org.opencv.face.Face;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -196,8 +197,8 @@ public class AppCameraService {
         }
         Long sapce = cameraDetail.getUsedSpace();
         if("SP".equals(cameraDetail.getUnit())){
-            Long proCount = sceneProService.getCountByCameraId(cameraDetail.getCameraId());
-            Long pulsCount = scenePlusService.getCountByCameraId(cameraDetail.getCameraId());
+            Long proCount = sceneProService.getCountByCameraId(cameraDetail.getCameraId(),false);
+            Long pulsCount = scenePlusService.getCountByCameraId(cameraDetail.getCameraId(), false);
             sapce = proCount + pulsCount;
             ScenePro scenePro = sceneProService.getByUnicode(unicode);
             ScenePlusExt scenePlusExt = scenePlusExtService.getByUnicode(unicode);

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

@@ -163,13 +163,9 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         wrapper.in(CameraDetail::getCameraId,cameraIds);
         List<CameraDetail> list = this.list(wrapper);
         for (CameraDetail cameraDetail : list) {
-            long subSpace = cameraMap.get(cameraDetail.getCameraId()) == null ? 0L : cameraMap.get(cameraDetail.getCameraId());
-            if("SP".equals(cameraDetail.getUnit())){
-                subSpace = 1L;
-            }
             //解封封存场景
             sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId());
-            this.subUsedSpace(cameraDetail,subSpace);
+            this.initSpace(cameraDetail);
         }
     }
 
@@ -310,4 +306,29 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         }
         return 0L;
     }
+
+    @Override
+    public void initSpace(Long cameraId) {
+        CameraDetail cameraDetail = this.getByCameraId(cameraId);
+        if(cameraDetail != null){
+            initSpace(cameraDetail);
+        }
+    }
+
+    @Override
+    public void initSpace(CameraDetail cameraDetail) {
+        LambdaUpdateWrapper<CameraDetail> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(CameraDetail::getId,cameraDetail.getId());
+        if("GB".equals(cameraDetail.getUnit())){
+            Long proSpace = sceneProService.getSpaceSumByCameraId(cameraDetail.getCameraId());
+            Long plusSpace = scenePlusService.getSpaceSumByCameraId(cameraDetail.getCameraId());
+            wrapper.set(CameraDetail::getUsedSpace,(plusSpace == null ?0L:plusSpace) + (proSpace == null ?0L:proSpace));
+        }
+        if("SP".equals(cameraDetail.getUnit())){
+            Long proSpace = sceneProService.getCountByCameraId(cameraDetail.getCameraId(),true);
+            Long plusSpace = scenePlusService.getCountByCameraId(cameraDetail.getCameraId(),true);
+            wrapper.set(CameraDetail::getUsedSpace,(plusSpace == null ?0L:plusSpace )+( proSpace == null ?0L:proSpace));
+        }
+        this.update(wrapper);
+    }
 }

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

@@ -380,9 +380,17 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
 
     @Override
-    public Long getCountByCameraId(Long cameraId) {
+    public Long getCountByCameraId(Long cameraId,Boolean status) {
         LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ScenePlus::getCameraId,cameraId);
+        if(status){
+            wrapper.eq(ScenePlus::getSceneStatus,-2);
+        }
         return this.count(wrapper);
     }
+
+    @Override
+    public Long getSpaceSumByCameraId(Long cameraId) {
+        return this.getBaseMapper().getSpaceSumByCameraId(cameraId);
+    }
 }

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

@@ -1265,10 +1265,18 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     }
 
     @Override
-    public Long getCountByCameraId(Long cameraId) {
+    public Long getCountByCameraId(Long cameraId,Boolean status) {
         LambdaQueryWrapper<ScenePro> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ScenePro::getCameraId,cameraId);
         wrapper.eq(ScenePro::getIsUpgrade,0);
+        if(status){
+            wrapper.eq(ScenePro::getStatus,-2);
+        }
         return this.count(wrapper);
     }
+
+    @Override
+    public Long getSpaceSumByCameraId(Long cameraId) {
+        return this.getBaseMapper().getSpaceSumByCameraId(cameraId);
+    }
 }

src/main/resources/mapper/ucenter/ScenePlusMapper.xml

@@ -75,4 +75,8 @@
           and s.user_id = #{userId} and d.type = #{cameraType}
     </select>
 
+
+    <select id="getSpaceSumByCameraId" resultType="java.lang.Long">
+        select  sum(space) from  t_scene_plus p left join t_scene_plus_ext e on p.id = e.plus_id where p.rec_status = 'A' and p.scene_status = -2 and p.camera_id = #{cameraId}
+    </select>
 </mapper>

src/main/resources/mapper/ucenter/SceneProMapper.xml

@@ -143,4 +143,8 @@
         </if>
     </sql>
 
+
+    <select id="getSpaceSumByCameraId" resultType="java.lang.Long">
+        select  sum(space) from  t_scene_plus p left join t_scene_plus_ext e on p.id = e.plus_id where p.rec_status = 'A' and p.scene_status = -2 and p.camera_id = #{cameraId}
+    </select>
 </mapper>