修改相机容量更新逻辑

src/main/java/com/fdkankan/contro/entity/IncrementType.java

@@ -0,0 +1,93 @@
+package com.fdkankan.contro.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 会员权益类型
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-01
+ */
+@Getter
+@Setter
+@TableName("t_increment_type")
+public class IncrementType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 权益类型名称
+     */
+    @TableField("name")
+    private String name;
+
+    @TableField("type")
+    private String type;
+
+    /**
+     * 下载次数，-1代表无限次
+     */
+    @TableField("download_num")
+    private Integer downloadNum;
+    /**
+     * 下载次数，-1代表无限次
+     */
+    @TableField("download_price")
+    private BigDecimal downloadPrice;
+
+    /**
+     * 相机容量 单位 G
+     */
+    @TableField("camera_capacity")
+    private Integer cameraCapacity;
+
+    /**
+     * 购买之后，有效期天数，-1代表无限制
+     */
+    @TableField("valid_time")
+    private Integer validTime;
+
+    /**
+     * 0:年;1:月：2：日
+     */
+    @TableField("valid_time_type")
+    private Integer validTimeType;
+
+    /**
+     * 权益价格
+     */
+    @TableField("price")
+    private BigDecimal price;
+
+    /**
+     * 价格符号
+     */
+    @TableField("symbol")
+    private String symbol;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+
+}

src/main/java/com/fdkankan/contro/entity/UserIncrement.java

@@ -27,17 +27,6 @@ public class UserIncrement implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 权益包标识
-     */
-    @TableField("key_word")
-    private String keyWord;
-
-    /**
-     * 用户表t_user的id
-     */
-    @TableField("user_id")
-    private Long userId;
 
     /**
      * 相机主表t_camera的id
@@ -76,19 +65,11 @@ public class UserIncrement implements Serializable {
     private Date updateTime;
 
     /**
-     * 扩容订单集合
-     */
-    @TableField("order_sn")
-    private String orderSn;
-
-    /**
      * 生效时间
      */
     @TableField("increment_start_time")
     private Date incrementStartTime;
 
-    @TableField("download_num")
-    private Integer downloadNum;
 
     /**
      * 0正常，1删除
@@ -96,5 +77,4 @@ public class UserIncrement implements Serializable {
     @TableField("rec_status")
     private String recStatus;
 
-
 }

src/main/java/com/fdkankan/contro/mapper/IIncrementTypeMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.contro.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.contro.entity.IncrementType;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 会员权益类型 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-01
+ */
+@Mapper
+public interface IIncrementTypeMapper extends BaseMapper<IncrementType> {
+
+}

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -104,6 +104,10 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     @Autowired
     private IBuildSceneDTService buildSceneDTService;
 
+
+    @Autowired
+    private IIncrementTypeService incrementTypeService;
+
     @Override
     public void buildScenePre(BuildSceneCallMessage message) {
         boolean success = false;
@@ -717,13 +721,15 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         //更新相机使用用量
         CameraDetail cameraDetail = cameraDetailService.updateCameraDetailByCameraIdAndSpace(cameraId, space);
         UserIncrement userIncrement = userIncrementService.getByCameraId(cameraId);
-        if( userIncrement == null || userIncrement.getIsExpired() == ExpiredStatus.Expired.code()) {
-            // 新上传的场景，如果总容量小于使用容量，则该大场景保留在临时存储空间30天
-            if (cameraDetail.getTotalSpace().compareTo(cameraDetail.getUsedSpace()) == -1){
-                return true;
+
+        if(!ObjectUtils.isEmpty(userIncrement)){
+            IncrementType type = incrementTypeService.getById(userIncrement.getIncrementTypeId());
+            if(type.getType().equals("cn") && userIncrement.getIsExpired().equals(ExpiredStatus.NOT_EXPIRED.code())){
+                return false;
             }
         }
-        return false;
+
+        return cameraDetail.getTotalSpace().compareTo(cameraDetail.getUsedSpace()) == -1;
     }
 
     private Object[] updateEditInfo(ScenePlus scenePlus){

src/main/java/com/fdkankan/contro/mq/service/impl/BuildV3SceneServiceImpl.java

@@ -15,6 +15,7 @@ import com.fdkankan.common.constant.PayStatus;
 import com.fdkankan.common.constant.SceneStatus;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.contro.entity.CameraDetail;
+import com.fdkankan.contro.entity.IncrementType;
 import com.fdkankan.contro.entity.ScenePro;
 import com.fdkankan.contro.entity.UserIncrement;
 import com.fdkankan.contro.mq.service.IBuildSceneService;
@@ -94,6 +95,9 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
     private FdkkV4Service fdkkV4Service;
 
     @Autowired
+    private IIncrementTypeService incrementTypeService;
+
+    @Autowired
     private IBuildSceneDTService buildSceneDTService;
 
     @Override
@@ -614,13 +618,15 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
         //更新相机使用用量
         CameraDetail cameraDetail = cameraDetailService.updateCameraDetailByCameraIdAndSpace(cameraId, space);
         UserIncrement userIncrement = userIncrementService.getByCameraId(cameraId);
-        if( userIncrement == null || userIncrement.getIsExpired() == ExpiredStatus.Expired.code()) {
-            // 新上传的场景，如果总容量小于使用容量，则该大场景保留在临时存储空间30天
-            if (cameraDetail.getTotalSpace().compareTo(cameraDetail.getUsedSpace()) == -1){
-                return true;
+
+        if(!ObjectUtils.isEmpty(userIncrement)){
+            IncrementType type = incrementTypeService.getById(userIncrement.getIncrementTypeId());
+            if(type.getType().equals("cn") && userIncrement.getIsExpired().equals(ExpiredStatus.NOT_EXPIRED.code())){
+                return false;
             }
         }
-        return false;
+
+        return cameraDetail.getTotalSpace().compareTo(cameraDetail.getUsedSpace()) == -1;
     }
 
     public void uploadHouseTypeJson(String num, String floorPlanCardFilePath) {

src/main/java/com/fdkankan/contro/service/IIncrementTypeService.java

@@ -0,0 +1,18 @@
+package com.fdkankan.contro.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.contro.entity.IncrementType;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 会员权益类型 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-01
+ */
+public interface IIncrementTypeService extends IService<IncrementType> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.fdkankan.contro.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.contro.entity.IncrementType;
+import com.fdkankan.contro.mapper.IIncrementTypeMapper;
+import com.fdkankan.contro.service.IIncrementTypeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 会员权益类型 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-01
+ */
+@Service
+public class IncrementTypeServiceImpl extends ServiceImpl<IIncrementTypeMapper, IncrementType> implements IIncrementTypeService {
+
+}