Merge remote-tracking branch 'origin/sp1.5.0' into test

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

@@ -49,17 +49,11 @@ public interface ICameraDetailService extends IService<CameraDetail> {
 
     List<CameraExcelVo> getListByUserAndTypeEx(Long cameraId);
 
-    void updateSpaceByCameraId(Long cameraId, Long cameraDetailSpace);
 
-    Long getTotalSpaceByCameraId(Long cameraId);
     Long getTotalSpaceByCameraId(CameraDetail detailEntity);
 
     Boolean checkSpace(CameraDetail detailEntity, IncrementType incrementType, Long space,CameraType cameraType);
 
-    Boolean checkSpace(CameraDetail detailEntity, Long space, CameraType cameraType);
-
-    Boolean checkSpace(Long cameraId, Long space);
-
     Boolean checkSpace(Long cameraId,CameraType cameraType);
     Boolean checkSpace(CameraDetail cameraId,CameraType cameraType);
 

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

@@ -257,28 +257,16 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         return this.getBaseMapper().getListByUserAndTypeEx(userId);
     }
 
-    @Override
-    public void updateSpaceByCameraId(Long cameraId, Long cameraDetailSpace) {
-        LambdaUpdateWrapper<CameraDetail> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(CameraDetail::getCameraId,cameraId)
-                .set(CameraDetail::getUsedSpace,cameraDetailSpace);
-        this.update(wrapper);
-    }
 
     @Override
-    public Long getTotalSpaceByCameraId(Long cameraId) {
-        CameraDetail cameraDetail = this.getByCameraId(cameraId);
-        if(cameraDetail == null){
-            return 0L;
-        }
-        return getTotalSpaceByCameraId(cameraDetail);
-    }
-    @Override
     public Long getTotalSpaceByCameraId(CameraDetail cameraDetail) {
         CameraType cameraType = cameraTypeService.getByCameraType(cameraDetail.getType());
         if (!"aws".equals(NacosProperty.uploadType) && cameraType.getIsLaser() == 1) {
             return -1L;
         }
+        if (cameraDetail.getCompanyId() != null && cameraDetail.getCompanyId() == 26L) {
+            return -1L;
+        }
         UserIncrement userIncrement = userIncrementService.getByCameraId(cameraDetail.getCameraId());
         if(userIncrement != null && userIncrement.getIsExpired() == 0){
             IncrementType incrementType = incrementTypeService.getById(userIncrement.getIncrementTypeId());
@@ -287,18 +275,6 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         return getTotalSpace(cameraDetail,null);
     }
 
-    @Override
-    public Boolean checkSpace(Long cameraId, Long space) {
-        CameraDetail cameraDetail = this.getByCameraId(cameraId);
-        if(cameraDetail == null){
-            return false;
-        }
-        CameraType cameraType = cameraTypeService.getByCameraType(cameraDetail.getType());
-        if (!"aws".equals(NacosProperty.uploadType) && cameraType.getIsLaser() == 1) {
-            return true;
-        }
-        return checkSpace(cameraDetail,space, cameraType);
-    }
 
     @Override
     public Boolean checkSpace(Long cameraId, CameraType cameraType) {
@@ -314,28 +290,15 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         if (!"aws".equals(NacosProperty.uploadType) && cameraType.getIsLaser() == 1) {
             return true;
         }
-        UserIncrement userIncrement = userIncrementService.getByCameraId(detailEntity.getCameraId());
-        if(userIncrement == null || userIncrement.getIsExpired() == 1){
-            return checkSpace(detailEntity,null,cameraType,true);
-        }
-        IncrementType incrementType = incrementTypeService.getById(userIncrement.getIncrementTypeId());
-        return checkSpace(detailEntity,incrementType,cameraType,true);
-    }
-
-    @Override
-    public Boolean checkSpace(CameraDetail detailEntity, Long space,CameraType cameraType) {
-        if(detailEntity == null){
-            return false;
-        }
-        if (!"aws".equals(NacosProperty.uploadType) && cameraType.getIsLaser() == 1) {
+        if (detailEntity.getCompanyId() != null && detailEntity.getCompanyId() == 26L) {
             return true;
         }
         UserIncrement userIncrement = userIncrementService.getByCameraId(detailEntity.getCameraId());
         if(userIncrement == null || userIncrement.getIsExpired() == 1){
-            return checkSpace(detailEntity,null,space,cameraType);
+            return checkSpace(detailEntity,null,cameraType,true);
         }
         IncrementType incrementType = incrementTypeService.getById(userIncrement.getIncrementTypeId());
-        return checkSpace(detailEntity,incrementType,space,cameraType);
+        return checkSpace(detailEntity,incrementType,cameraType,true);
     }
 
     @Override
@@ -344,6 +307,9 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         if (!"aws".equals(NacosProperty.uploadType) && cameraType.getIsLaser() == 1) {
             return true;
         }
+        if (detailEntity.getCompanyId() != null && detailEntity.getCompanyId() == 26L) {
+            return true;
+        }
         if("SP".equals(detailEntity.getUnit())){
             if(incrementType!=null && incrementType.getCameraSpace() == -1){
                 return true;