修改计算逻辑

src/main/java/com/fdkankan/contro/dto/Camera.java

@@ -1,67 +0,0 @@
-package com.fdkankan.contro.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class Camera implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-
-    /**
-     * 相机的Mac地址
-     */
-    private String childName;
-
-    /**
-     * 激活时间
-     */
-    private Date activatedTime;
-
-    /**
-     * 相机密码
-     */
-    private String childPassword;
-
-    /**
-     * sn码
-     */
-    private String snCode;
-
-    /**
-     * wifi名称
-     */
-    private String wifiName;
-
-    /**
-     * wifi密码
-     */
-    private String wifiPassword;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    private String recStatus;
-
-    /**
-     * 0正常，1删除
-     */
-    private Integer tbStatus;
-
-
-}
-

src/main/java/com/fdkankan/contro/dto/CameraDetail.java

@@ -1,121 +0,0 @@
-package com.fdkankan.contro.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 相机子表
- * </p>
- *
- * @author 
- * @since 2021-12-24
- */
-@Getter
-@Setter
-public class CameraDetail implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-
-    /**
-     * 余额
-     */
-    private String balance;
-
-    /**
-     * 用户表t_user的id
-     */
-    private Long userId;
-
-    /**
-     * 0表示客户，1表示员工，2表示赠送，3表示其他，4经销商销售
-     */
-    private Integer own;
-
-    /**
-     * 订单号
-     */
-    private String orderSn;
-
-    /**
-     * 0表示本国，1表示国外
-     */
-    private Integer country;
-
-    /**
-     * 经销商
-     */
-    private String agency;
-
-    /**
-     * 相机类型，0表示双目，1四维看看pro，2 四维看看lite，9 双目转台，10 激光转台
-     */
-    private Integer cameraType;
-
-    /**
-     * 总容量
-     */
-    private Long totalSpace;
-
-    /**
-     * 已使用容量
-     */
-    private Long usedSpace;
-
-    /**
-     * 相机主表t_camera的id
-     */
-    private Long cameraId;
-
-    /**
-     * 商品表t_goods的id
-     */
-    private Long goodsId;
-
-    /**
-     * 企业表t_company的id
-     */
-    private Long companyId;
-
-    /**
-     * 代理商架构管理t_agent_framework的id
-     */
-    private Long agentFrameworkId;
-
-    /**
-     * 相机协作用户id
-     */
-    private Long cooperationUser;
-
-    /**
-     * 设备地址（追溯管理后台）
-     */
-    private String address;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    private String recStatus;
-
-    /**
-     * 0正常，1删除
-     */
-    private Integer tbStatus;
-
-
-}

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

@@ -1,7 +1,9 @@
-package com.fdkankan.contro.dto;
+package com.fdkankan.contro.entity;
 
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -16,72 +18,83 @@ import java.util.Date;
  */
 @Getter
 @Setter
+@ToString
+@TableName("t_user_increment")
 public class UserIncrement implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @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
      */
+    @TableField("camera_id")
     private Long cameraId;
 
     /**
      * 会员权益类型Id
      */
+    @TableField("increment_type_id")
     private Integer incrementTypeId;
 
     /**
      * 结束时间
      */
+    @TableField("increment_end_time")
     private Date incrementEndTime;
 
     /**
      * 是否过期（1过期，0未过期）
      */
+    @TableField("is_expired")
     private Integer isExpired;
 
     /**
      * 创建时间
      */
+    @TableField("create_time")
     private Date createTime;
 
     /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    private String recStatus;
-
-    /**
      * 更新时间
      */
+    @TableField("update_time")
     private Date updateTime;
 
     /**
      * 扩容订单集合
      */
+    @TableField("order_sn")
     private String orderSn;
 
     /**
      * 生效时间
      */
+    @TableField("increment_start_time")
     private Date incrementStartTime;
 
+    @TableField("download_num")
     private Integer downloadNum;
 
     /**
      * 0正常，1删除
      */
+   @TableField("tb_status")
+@TableLogic(value="0",delval = "1")
     private Integer tbStatus;
 
 

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

@@ -1,7 +1,7 @@
 package com.fdkankan.contro.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.contro.dto.UserIncrement;
+import com.fdkankan.contro.entity.UserIncrement;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

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

@@ -1,8 +1,7 @@
 package com.fdkankan.contro.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.contro.dto.CameraDetail;
-import com.fdkankan.contro.dto.UserIncrement;
+import com.fdkankan.contro.entity.UserIncrement;
 
 import java.util.List;
 

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

@@ -13,7 +13,6 @@ import com.fdkankan.common.util.FileUtil;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.MatrixToImageWriterUtil;
 import com.fdkankan.contro.bean.*;
-import com.fdkankan.contro.dto.UserIncrement;
 import com.fdkankan.contro.entity.*;
 import com.fdkankan.contro.service.*;
 import com.fdkankan.contro.vo.SceneEditControlsVO;

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

@@ -3,7 +3,7 @@ package com.fdkankan.contro.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.TbStatus;
-import com.fdkankan.contro.dto.UserIncrement;
+import com.fdkankan.contro.entity.UserIncrement;
 import com.fdkankan.contro.mapper.IUserIncrementMapper;
 import com.fdkankan.contro.service.IUserIncrementService;
 import org.springframework.stereotype.Service;