合并最新代码

src/main/java/com/fdkankan/ucenter/entity/Camera.java

@@ -83,8 +83,5 @@ public class Camera implements Serializable {
     @TableLogic(value = "A",delval = "I")
     private String recStatus;
 
-    @TableField("is_out")
-    private Integer isOut;
-
 
 }

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

@@ -3,23 +3,19 @@ package com.fdkankan.ucenter.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.common.constant.AppConstant;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.Constant;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.common.util.DateUtil;
+import com.fdkankan.common.util.FileSizeUtil;
 import com.fdkankan.ucenter.common.AgentConstant;
 import com.fdkankan.ucenter.common.CameraTypeEnum;
 import com.fdkankan.ucenter.common.PageInfo;
-import com.fdkankan.common.util.DateUtil;
-import com.fdkankan.common.util.FileSizeUtil;
-import com.fdkankan.ucenter.common.constants.NacosProperty;
-import com.fdkankan.ucenter.constant.CameraConstant;
 import com.fdkankan.ucenter.constant.LoginConstant;
-import com.fdkankan.ucenter.constant.OrderConstant;
 import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.httpClient.service.LaserService;
 import com.fdkankan.ucenter.mapper.ICameraMapper;
 import com.fdkankan.ucenter.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.ucenter.util.DateUserUtil;
 import com.fdkankan.ucenter.vo.request.CameraParam;
 import com.fdkankan.ucenter.vo.response.CameraAppVo;
@@ -34,7 +30,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * <p>
@@ -286,7 +281,6 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             camera.setWifiPassword(AgentConstant.WIFI_PASSWORD_VALUE);
             camera.setChildPassword(AgentConstant.CHILD_PASSWORD_VALUE);
             camera.setActivatedTime(DateUtil.date2String(new Date(),null));
-            camera.setIsOut(1);
             camera.setRecStatus("A");
             camera.setCreateTime(DateUserUtil.getDate(new Date()));
             camera.setUpdateTime(DateUserUtil.getDate(new Date()));