1111

src/main/java/com/fdkankan/contro/controller/SceneFileController.java

@@ -118,14 +118,7 @@ public class SceneFileController{
      *
      * @return
      */
-//    @ApiOperation("计算双目场景 - 新双目相机上传 小红屋")
     @PostMapping("buildLiteScene")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "prefix", value = "文件下载前缀,结尾不加/", dataType = "String"),
-//            @ApiImplicitParam(name = "dataFdage", value = "dataFdage", dataType = "String"),
-//            @ApiImplicitParam(name = "zipName", value = "zip文件包名称", dataType = "String"),
-//            @ApiImplicitParam(name = "password", value = "密码", dataType = "String"),
-//            @ApiImplicitParam(name = "userName", value = "用户名", dataType = "String")})
     public ResultData buildLiteScene(String prefix, String dataFdage, String zipName, String userName, String password, String oldNum) throws Exception{
         return sceneFileBuildService.buildLiteScene(prefix, dataFdage, zipName, userName, password, oldNum);
 
@@ -137,11 +130,6 @@ public class SceneFileController{
      * @return
      */
     @PostMapping("buildScene")
-//    @ApiOperation("获取亚马逊S3文件上传url")
-//    @ApiImplicitParams({
-//        @ApiImplicitParam(name = "unicode", value = "unicode文件夹", dataType = "String"),
-//            @ApiImplicitParam(name = "zip", value = "zip包的名称", dataType = "String"),
-//            @ApiImplicitParam(name = "dataFdage", value = "dataFdage名称", dataType = "String")})
     public ResultData buildScene(String prefix, String unicode, String zip, String dataFdage) throws Exception{
         return sceneFileBuildService.buildScene(prefix, unicode, zip, dataFdage);
     }

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

@@ -0,0 +1,90 @@
+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.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 相机主表
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@Getter
+@Setter
+@TableName("t_camera")
+public class Camera implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 相机的Mac地址
+     */
+    @TableField("child_name")
+    private String childName;
+
+    /**
+     * 激活时间
+     */
+    @TableField("activated_time")
+    private Date activatedTime;
+
+    /**
+     * 相机密码
+     */
+    @TableField("child_password")
+    private String childPassword;
+
+    /**
+     * sn码
+     */
+    @TableField("sn_code")
+    private String snCode;
+
+    /**
+     * wifi名称
+     */
+    @TableField("wifi_name")
+    private String wifiName;
+
+    /**
+     * wifi密码
+     */
+    @TableField("wifi_password")
+    private String wifiPassword;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
+
+    @TableField("is_out")
+    private Boolean isOut;
+
+
+}

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

@@ -0,0 +1,151 @@
+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.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+
+/**
+ * <p>
+ * 相机子表
+ * </p>
+ *
+ * @author
+ * @since 2022-07-18
+ */
+@Getter
+@Setter
+@TableName("t_camera_detail")
+public class CameraDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 余额
+     */
+    @TableField("balance")
+    private String balance;
+
+    /**
+     * 用户表t_user的id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 0表示客户，1表示员工，2表示赠送，3表示其他，4经销商销售
+     */
+    @TableField("own")
+    private Integer own;
+
+    /**
+     * 订单号
+     */
+    @TableField("order_sn")
+    private String orderSn;
+
+    /**
+     * 0表示本国，1表示国外
+     */
+    @TableField("country")
+    private Integer country;
+
+    /**
+     * 经销商
+     */
+    @TableField("agency")
+    private String agency;
+
+    /**
+     * 相机类型，0表示双目，1四维看看pro，2 四维看看lite，9 双目转台，10 激光转台
+     */
+    @TableField("type")
+    private Integer type;
+
+    /**
+     * 总容量
+     */
+    @TableField("total_space")
+    private Long totalSpace;
+
+    /**
+     * 已使用容量
+     */
+    @TableField("used_space")
+    private Long usedSpace;
+
+    /**
+     * 相机主表t_camera的id
+     */
+    @TableField("camera_id")
+    private Long cameraId;
+
+    /**
+     * 商品表t_goods的id
+     */
+    @TableField("goods_id")
+    private Long goodsId;
+
+    /**
+     * 企业表t_company的id
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+    /**
+     * 代理商架构管理t_agent_framework的id
+     */
+    @TableField("agent_framework_id")
+    private Long agentFrameworkId;
+
+    /**
+     * 相机协作用户id
+     */
+    @TableField("cooperation_user")
+    private Long cooperationUser;
+
+    /**
+     * 设备地址（追溯管理后台）
+     */
+    @TableField("address")
+    private String address;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
+
+    @TableField("user_camera_version")
+    private String userCameraVersion;
+
+    @TableField("app_version")
+    private String appVersion;
+
+    @TableField("last_request_time")
+    private Date lastRequestTime;
+
+
+}

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

@@ -80,11 +80,11 @@ public class CameraSpace implements Serializable {
     private String orderSn;
 
     /**
-     * 0正常，1删除
+     * A正常，I删除
      */
-   @TableField("tb_status")
-@TableLogic(value="0",delval = "1")
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

@@ -100,10 +100,10 @@ public class Company implements Serializable {
     private Date updateTime;
 
     /**
-     * 0正常，1删除
+     * A正常，I删除
      */
-    @TableField("tb_status")
-    @TableLogic(value="0",delval = "1")
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 }

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

@@ -80,11 +80,11 @@ public class Manager implements Serializable {
     private Date updateTime;
 
     /**
-     * 0正常，1删除
+     * A正常，I删除
      */
-   @TableField("tb_status")
-@TableLogic(value="0",delval = "1")
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

@@ -152,11 +152,11 @@ public class Scene implements Serializable {
     private Date updateTime;
 
     /**
-     * 0-有效，1-删除
+     * A正常，I删除
      */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

@@ -56,11 +56,11 @@ public class Scene3dNum implements Serializable {
     private Date createTime;
 
     /**
-     * 0-有效，1-删除
+     * A正常，I删除
      */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

@@ -56,11 +56,11 @@ public class SceneCooperation implements Serializable {
     private Date updateTime;
 
     /**
-     * 0-有效，1-删除
+     * A正常，I删除
      */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

@@ -101,11 +101,11 @@ public class SceneEditControls implements Serializable {
     private Date updateTime;
 
     /**
-     * 0-有效，1-删除, 2-禁用
+     * A正常，I删除
      */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

@@ -173,11 +173,11 @@ public class SceneEditInfo implements Serializable {
     private Date updateTime;
 
     /**
-     * 0-有效，1-删除, 2-禁用
+     * A正常，I删除
      */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

@@ -80,11 +80,11 @@ public class SceneEditInfoExt {
     private Date updateTime;
 
     /**
-     * 0-有效，1-删除
+     * A正常，I删除
      */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

@@ -158,11 +158,11 @@ public class SceneExt implements Serializable {
     private Date updateTime;
 
     /**
-     * 0-有效，1-删除
+     * A正常，I删除
      */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

@@ -77,11 +77,11 @@ public class SceneFileBuild implements Serializable {
     private Date updateTime;
 
     /**
-     * 0-有效，1-删除
+     * A正常，I删除
      */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

@@ -77,11 +77,10 @@ public class SceneFileUpload implements Serializable {
     private Date updateTime;
 
     /**
-     * 0-有效，1-删除
+     * A正常，I删除
      */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
-
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 }

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

@@ -104,11 +104,11 @@ public class ScenePlus implements Serializable {
     private Date updateTime;
 
     /**
-     * 0-有效，1-删除, 2-禁用
+     * A正常，I删除
      */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

@@ -143,11 +143,11 @@ public class ScenePlusExt implements Serializable {
     private Date updateTime;
 
     /**
-     * 0-有效，1-删除, 2-禁用
+     * A正常，I删除
      */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

@@ -128,11 +128,11 @@ public class ScenePro implements Serializable {
     private Date updateTime;
 
     /**
-     * 0-有效，1-删除
+     * A正常，I删除
      */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

@@ -158,11 +158,11 @@ public class SceneProEdit implements Serializable {
     private Date updateTime;
 
     /**
-     * 0-有效，1-删除
+     * A正常，I删除
      */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

@@ -158,11 +158,11 @@ public class SceneProEditExt implements Serializable {
     private Date updateTime;
 
     /**
-     * 0-有效，1-删除
+     * A正常，I删除
      */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

@@ -143,11 +143,11 @@ public class SceneProExt implements Serializable {
     private Date updateTime;
 
     /**
-     * 0-有效，1-删除
+     * A正常，I删除
      */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

@@ -50,11 +50,11 @@ public class SceneResourceCamera implements Serializable {
     private Date updateTime;
 
     /**
-     * 0-有效，1-删除
+     * A正常，I删除
      */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

@@ -50,11 +50,11 @@ public class SceneResourceCooperation implements Serializable {
     private Date updateTime;
 
     /**
-     * 0-有效，1-删除
+     * A正常，I删除
      */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

@@ -130,11 +130,11 @@ public class User implements Serializable {
     private Date updateTime;
 
     /**
-     * 0正常，1删除
+     * A正常，I删除
      */
-   @TableField("tb_status")
-@TableLogic(value="0",delval = "1")
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

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

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

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

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

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

@@ -1,7 +1,7 @@
 package com.fdkankan.contro.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.contro.dto.CameraDetail;
+import com.fdkankan.contro.entity.CameraDetail;
 import com.fdkankan.contro.vo.RequestCamera;
 import com.fdkankan.contro.vo.ResponseCamera;
 

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

@@ -1,7 +1,7 @@
 package com.fdkankan.contro.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.contro.dto.Camera;
+import com.fdkankan.contro.entity.Camera;
 
 /**
  * <p>

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

@@ -17,4 +17,8 @@ public interface IScenePlusService extends IService<ScenePlus> {
     ScenePlus getScenePlusByNum(String num);
 
     ResultData resetSpace(String sceneNum) throws Exception;
+
+    String getDataSourceLikeUnicode(String unicode);
+
+    ScenePlus getByFileId(String fileId);
 }

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.CameraDetail;
 import com.fdkankan.contro.dto.UserIncrement;
 import com.fdkankan.contro.entity.*;
 import com.fdkankan.contro.service.*;

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

@@ -1,11 +1,12 @@
 package com.fdkankan.contro.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.contro.dto.CameraDetail;
+import com.fdkankan.contro.entity.CameraDetail;
 import com.fdkankan.contro.mapper.ICameraDetailMapper;
 import com.fdkankan.contro.service.ICameraDetailService;
 import org.springframework.stereotype.Service;
@@ -26,14 +27,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
 
     @Override
     public CameraDetail getByCameraId(Long cameraId) {
-        QueryWrapper<CameraDetail> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(CameraDetail :: getTbStatus,TbStatus.VALID.code());
-        queryWrapper.lambda().eq(CameraDetail :: getCameraId,cameraId);
-        List<CameraDetail> list = this.list(queryWrapper);
-        if(list == null || list.size()<=0){
-            return null;
-        }
-        return list.get(0);
+        return this.getOne(new LambdaQueryWrapper<CameraDetail>().eq(CameraDetail::getCameraId, cameraId));
     }
 
 

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

@@ -1,15 +1,12 @@
 package com.fdkankan.contro.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.common.constant.TbStatus;
-import com.fdkankan.contro.dto.Camera;
+import com.fdkankan.contro.entity.Camera;
 import com.fdkankan.contro.mapper.ICameraMapper;
 import com.fdkankan.contro.service.ICameraService;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * <p>
  * 相机主表 服务实现类
@@ -23,28 +20,13 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
 
     @Override
     public Camera getByChildName(String childName){
-        QueryWrapper<Camera> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Camera::getTbStatus,TbStatus.VALID.code());
-        queryWrapper.lambda().eq(Camera::getChildName,childName);
-        return this.getEntityByQuery(queryWrapper);
+        return this.getOne(new LambdaQueryWrapper<Camera>().eq(Camera::getChildName,childName));
     }
 
 
     @Override
     public Camera getBySnCode(String snCode) {
-        QueryWrapper<Camera> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(Camera::getTbStatus,TbStatus.VALID.code());
-        queryWrapper.lambda().eq(Camera::getSnCode,snCode);
-        return this.getEntityByQuery(queryWrapper);
-    }
-
-
-    private Camera getEntityByQuery(QueryWrapper<Camera> queryWrapper ){
-        List<Camera> list = this.list(queryWrapper);
-        if(list == null || list.size() <= 0){
-            return null;
-        }
-        return list.get(0);
+        return this.getOne(new LambdaQueryWrapper<Camera>().eq(Camera::getSnCode,snCode));
     }
 
 }

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

@@ -163,7 +163,6 @@ public class Scene3dNumServiceImpl extends ServiceImpl<IScene3dNumMapper, Scene3
     @Override
     public Scene3dNum findByNum(String sceneCode) {
         List<Scene3dNum> list = this.list(new LambdaQueryWrapper<Scene3dNum>()
-                .eq(Scene3dNum::getTbStatus, TbStatus.VALID.code())
                 .eq(Scene3dNum::getNum, sceneCode));
         if(CollUtil.isEmpty(list)){
             return null;

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

@@ -22,7 +22,6 @@ public class SceneEditControlsServiceImpl extends ServiceImpl<ISceneEditControls
     @Override
     public SceneEditControls getBySceneEditId(long sceneEditInfoId) {
         return this.getOne(new LambdaQueryWrapper<SceneEditControls>()
-                .eq(SceneEditControls::getTbStatus, TbStatus.VALID.code())
                 .eq(SceneEditControls::getEditInfoId, sceneEditInfoId));
     }
 }

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

@@ -27,7 +27,6 @@ public class SceneFileUploadServiceImpl extends ServiceImpl<ISceneFileUploadMapp
     public Long countUploadSuccessByFileId(String fileId) {
 
         return this.count(new LambdaQueryWrapper<SceneFileUpload>()
-                .eq(SceneFileUpload::getTbStatus, TbStatus.VALID.code())
                 .eq(SceneFileUpload::getFileId, fileId)
                 .eq(SceneFileUpload::getUploadStatus ,UploadStatus.SUCCESS.code()));
 
@@ -37,7 +36,6 @@ public class SceneFileUploadServiceImpl extends ServiceImpl<ISceneFileUploadMapp
     public SceneFileUpload findByFileIdAndChunk(String fileId, Integer chunk) {
 
         List<SceneFileUpload> list = this.list(new LambdaQueryWrapper<SceneFileUpload>()
-                .eq(SceneFileUpload::getTbStatus, TbStatus.VALID.code())
                 .eq(SceneFileUpload::getFileId, fileId)
                 .eq(SceneFileUpload::getChunk, chunk)
                 .orderByDesc(SceneFileUpload::getId));

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

@@ -3,6 +3,7 @@ package com.fdkankan.contro.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.contro.entity.ScenePlus;
 import com.fdkankan.contro.entity.ScenePlusExt;
@@ -15,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Objects;
+import org.springframework.validation.BindException;
 
 /**
  * <p>
@@ -59,4 +61,28 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         return ResultData.ok();
     }
 
+    @Override
+    public String getDataSourceLikeUnicode(String unicode) {
+
+        ScenePlusExt scenePlusExt = scenePlusExtService.getOne(
+            new LambdaQueryWrapper<ScenePlusExt>().like(ScenePlusExt::getDataSource, unicode));
+
+        if(Objects.isNull(scenePlusExt)){
+            return null;
+        }
+
+        return scenePlusExt.getDataSource();
+    }
+
+    @Override
+    public ScenePlus getByFileId(String fileId) {
+
+        ScenePlusExt scenePlusExt = scenePlusExtService.getOne(
+            new LambdaQueryWrapper<ScenePlusExt>().like(ScenePlusExt::getDataSource, fileId));
+
+        if(Objects.isNull(scenePlusExt)){
+            return null;
+        }
+        return this.getById(scenePlusExt.getPlusId());
+    }
 }

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.SceneStatus;
-import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.contro.entity.ScenePro;
 import com.fdkankan.contro.entity.SceneProExt;
@@ -16,15 +15,14 @@ import com.fdkankan.contro.service.ICameraDetailService;
 import com.fdkankan.contro.service.ISceneProExtService;
 import com.fdkankan.contro.service.ISceneProService;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
+import java.util.Calendar;
+import java.util.List;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
-import java.util.Calendar;
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * <p>
  * pro场景表 服务实现类
@@ -49,7 +47,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     @Override
     public ScenePro findBySceneNum(String sceneNum) {
         return this.getOne(new LambdaQueryWrapper<ScenePro>()
-                .eq(ScenePro::getTbStatus, TbStatus.VALID.code())
                 .eq(ScenePro::getNum, sceneNum));
     }
 

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

@@ -24,8 +24,7 @@ public class SceneResourceCameraServiceImpl extends ServiceImpl<ISceneResourceCa
     @Override
     public List<SceneResourceCamera> findListByCameraId(Long id) {
         return this.list(new LambdaQueryWrapper<SceneResourceCamera>()
-                .eq(SceneResourceCamera::getTbStatus, TbStatus.VALID.code())
-                .eq(SceneResourceCamera::getTbStatus, TbStatus.VALID.code()).eq(SceneResourceCamera::getCameraId, id));
+                .eq(SceneResourceCamera::getCameraId, id));
     }
 
 }

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

@@ -8,6 +8,7 @@ import com.fdkankan.contro.entity.User;
 import com.fdkankan.contro.mapper.IUserMapper;
 import com.fdkankan.contro.service.IUserService;
 import com.fdkankan.redis.util.RedisUtil;
+import java.util.Objects;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -41,7 +42,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     @Override
     public SSOUser getSSOUserByUserId(Long userId) {
         User user = this.getById(userId);
-        if(user == null || 1 == user.getTbStatus()){
+        if(Objects.isNull(user)){
             throw new BusinessException(ErrorCode.USER_NOT_EXIST);
         }
         return this.getSsoUserByUserName(user,user.getUserName());

src/main/java/com/fdkankan/contro/vo/ScenePlusVO.java

@@ -14,6 +14,8 @@ import lombok.Data;
 @Data
 public class ScenePlusVO {
 
+    private Long id;
+
     /**
      * 场景码
      */
@@ -129,4 +131,6 @@ public class ScenePlusVO {
      */
     private String buildType;
 
+    private String recStatus;
+
 }