修改计算逻辑

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

@@ -93,9 +93,8 @@ public class UserIncrement implements Serializable {
     /**
      * 0正常，1删除
      */
-   @TableField("tb_status")
-@TableLogic(value="0",delval = "1")
-    private Integer tbStatus;
+    @TableField("rec_status")
+    private String recStatus;
 
 
 }

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

@@ -21,10 +21,7 @@ import java.util.List;
 public interface ICameraSpaceMapper extends BaseMapper<CameraSpace> {
 
     @Select(" select s.id, s.space_end_time, c.child_name, s.space from t_camera_space s " +
-            "LEFT JOIN t_camera c on s.camera_id = c.id where s.tb_status = 0 and " +
+            "LEFT JOIN t_camera c on s.camera_id = c.id where s.rec_status = 'A' and " +
             "s.space_type = 2 and s.camera_id = #{cameraId} and TIMESTAMPDIFF(MINUTE, NOW(), s.space_end_time) > -1 ORDER BY s.space_end_time ")
     List<ResponseCameraSpace> getVoListByCameraId(@Param("cameraId")Long cameraId);
-
-    @Select(" SELECT * FROM t_camera_space WHERE (DATEDIFF(space_end_time,NOW())=-1) AND ((space_type=1) or (space_type=2)) AND tb_status = 0 ")
-    List<CameraSpace> findExpiredList();
 }

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

@@ -19,6 +19,6 @@ import java.util.List;
 @Mapper
 public interface IUserIncrementMapper extends BaseMapper<UserIncrement> {
 
-    @Select("SELECT * FROM t_user_increment x LEFT JOIN t_camera c ON x.camera_id = c.id and c.tb_status = 0 WHERE c.child_name = #{childName} AND x.tb_status = 0 ")
+    @Select("SELECT * FROM t_user_increment x LEFT JOIN t_camera c ON x.camera_id = c.id and c.rec_status = 'A' WHERE c.child_name = #{childName} AND x.rec_status = 'A' ")
     List<UserIncrement> getByChildName(@Param("childName")String childName);
 }

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

@@ -28,7 +28,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
     @Override
     public UserIncrement getByCameraId(Long cameraId) {
         QueryWrapper<UserIncrement> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(UserIncrement::getTbStatus,TbStatus.VALID.code());
+        queryWrapper.lambda().eq(UserIncrement::getRecStatus,TbStatus.VALID.code());
         queryWrapper.lambda().eq(UserIncrement::getCameraId,cameraId);
         List<UserIncrement> list = this.list(queryWrapper);
         if(list == null || list.size()<=0){