1111

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/CameraController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.scene.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 相机主表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@RestController
+@RequestMapping("/scene/camera")
+public class CameraController {
+
+}
+

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/CameraDetailController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.scene.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 相机子表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@RestController
+@RequestMapping("/scene/cameraDetail")
+public class CameraDetailController {
+
+}
+

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/CompanyController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.scene.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 客户企业logo信息 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@RestController
+@RequestMapping("/scene/company")
+public class CompanyController {
+
+}
+

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneCooperationController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.scene.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@RestController
+@RequestMapping("/scene/sceneCooperation")
+public class SceneCooperationController {
+
+}
+

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneEditController.java

@@ -524,7 +524,7 @@ public class SceneEditController extends BaseController {
     @CheckCooperationPermit
     @PostMapping(value = "/getAuth")
     public SceneAuthVO getAuth(@RequestParam("num") String num) throws Exception{
-        return sceneEditService.getAuth(num, this.getToken());
+        return sceneEditService.getAuth(num, this.getSSOUser());
     }
 
     /**

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneResourceController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.scene.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 场景资源表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@RestController
+@RequestMapping("/scene/sceneResource")
+public class SceneResourceController {
+
+}
+

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneResourceCooperationController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.scene.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 场景资源和协作用户关联表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@RestController
+@RequestMapping("/scene/sceneResourceCooperation")
+public class SceneResourceCooperationController {
+
+}
+

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/UserController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.scene.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 用户信息表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@RestController
+@RequestMapping("/scene/user")
+public class UserController {
+
+}
+

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/UserIncrementController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.scene.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 用户增值权益表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@RestController
+@RequestMapping("/scene/userIncrement")
+public class UserIncrementController {
+
+}
+

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/Camera.java

@@ -0,0 +1,90 @@
+package com.fdkankan.scene.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;
+
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/CameraDetail.java

@@ -0,0 +1,151 @@
+package com.fdkankan.scene.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;
+
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/Company.java

@@ -0,0 +1,111 @@
+package com.fdkankan.scene.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>
+ * 客户企业logo信息
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@Getter
+@Setter
+@TableName("t_company")
+public class Company implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 公司名称
+     */
+    @TableField("company_name")
+    private String companyName;
+
+    /**
+     * 顶部logo
+     */
+    @TableField("top_logo")
+    private String topLogo;
+
+    /**
+     * 地面logo
+     */
+    @TableField("floor_logo")
+    private String floorLogo;
+
+    /**
+     * 地面点位logo
+     */
+    @TableField("marker_logo")
+    private String markerLogo;
+
+    /**
+     * 二维码logo
+     */
+    @TableField("qr_logo")
+    private String qrLogo;
+
+    /**
+     * 是否显示初始logo，0隐藏，1显示
+     */
+    @TableField("show_logo")
+    private Integer showLogo;
+
+    /**
+     * t_manager表的id
+     */
+    @TableField("manager_id")
+    private Long managerId;
+
+    /**
+     * 新增的相机是否注册，0否，1删
+     */
+    @TableField("camera_delete")
+    private Integer cameraDelete;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
+
+    @TableField("calculate_flexibility")
+    private Boolean calculateFlexibility;
+
+    /**
+     * 数据同步类型
+     */
+    @TableField("data_sync")
+    private String dataSync;
+
+    @TableField("company_desc")
+    private String companyDesc;
+
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneCooperation.java

@@ -0,0 +1,54 @@
+package com.fdkankan.scene.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_scene_cooperation")
+public class SceneCooperation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 场景码
+     */
+    @TableField("scene_num")
+    private String sceneNum;
+
+    /**
+     * 协作的用户id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
+
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneDataDownload.java

@@ -56,11 +56,11 @@ public class SceneDataDownload implements Serializable {
     private Date updateTime;
 
     /**
-     * 0-有效，1-删除
+     * 记录的状态，A: 生效，I: 禁用
      */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneDownloadLog.java

@@ -1,84 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 场景下载记录
- * </p>
- *
- * @author 
- * @since 2022-01-20
- */
-@Getter
-@Setter
-@TableName("t_scene_download_log")
-public class SceneDownloadLog implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 用户id
-     */
-    @TableField("user_id")
-    private Long userId;
-
-    /**
-     * 场景码
-     */
-    @TableField("num")
-    private String num;
-
-    /**
-     * 场景版本
-     */
-    @TableField("scene_version")
-    private Integer sceneVersion;
-
-    /**
-     * 场景打包之后的连接
-     */
-    @TableField("download_url")
-    private String downloadUrl;
-
-    /**
-     * 0下载中，1下载成功，2下载失败
-     */
-    @TableField("download_status")
-    private Integer downloadStatus;
-
-    /**
-     * 下载失败原因
-     */
-    @TableField("reason")
-    private String reason;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 0-有效，1-删除
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
-
-
-}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/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;
 
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/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;
 
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneEditInfoExt.java

@@ -74,11 +74,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;
 
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneExt.java

@@ -1,168 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 场景表
- * </p>
- *
- * @author 
- * @since 2022-01-20
- */
-@Getter
-@Setter
-@TableName("t_scene_ext")
-public class SceneExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 外键id
-     */
-    @TableField("scene_id")
-    private Long sceneId;
-
-    /**
-     * 要上传的热点的id集合，用逗号隔开
-     */
-    @TableField("hots_ids")
-    private String hotsIds;
-
-    /**
-     * 表示初始点信息
-     */
-    @TableField("entry")
-    private String entry;
-
-    /**
-     * 拍摄数量
-     */
-    @TableField("shoot_count")
-    private Integer shootCount;
-
-    /**
-     * 风格
-     */
-    @TableField("style")
-    private Integer style;
-
-    /**
-     * 要gps定位
-     */
-    @TableField("gps")
-    private String gps;
-
-    /**
-     * 方案：1是双目，2是转台，3是六目,4是八目
-     */
-    @TableField("scene_scheme")
-    private Integer sceneScheme;
-
-    /**
-     * 背景音乐名称
-     */
-    @TableField("bg_music")
-    private String bgMusic;
-
-    /**
-     * 普通录屏文件地址
-     */
-    @TableField("screencap_voice_src")
-    private String screencapVoiceSrc;
-
-    /**
-     * 旧版录屏数据地址
-     */
-    @TableField("screencap_music")
-    private String screencapMusic;
-
-    /**
-     * 录屏文件个数
-     */
-    @TableField("screencap_len")
-    private Integer screencapLen;
-
-    /**
-     * 录音文件地址
-     */
-    @TableField("screencap_voice_sound")
-    private String screencapVoiceSound;
-
-    /**
-     * 选择的类型，sound为screencapVoiceSound，file为screencapVoiceSrc
-     */
-    @TableField("screencap_voice_type")
-    private String screencapVoiceType;
-
-    /**
-     * 录屏文件地址
-     */
-    @TableField("play_data")
-    private String playData;
-
-    /**
-     * 算法类型
-     */
-    @TableField("algorithm")
-    private String algorithm;
-
-    /**
-     * oss服务商
-     */
-    @TableField("oss")
-    private String oss;
-
-    /**
-     * 重新建模的版本
-     */
-    @TableField("floor_edit_ver")
-    private Integer floorEditVer;
-
-    /**
-     * 正式发布重新建模的版本
-     */
-    @TableField("floor_publish_ver")
-    private Integer floorPublishVer;
-
-    /**
-     * 使用容量
-     */
-    @TableField("space")
-    private Long space;
-
-    /**
-     * 录屏图片存放文件
-     */
-    @TableField("screencap_thumb")
-    private String screencapThumb;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 0-有效，1-删除
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
-
-
-}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneFeedback.java

@@ -1,84 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 大场景反馈信息表
- * </p>
- *
- * @author 
- * @since 2022-01-20
- */
-@Getter
-@Setter
-@TableName("t_scene_feedback")
-public class SceneFeedback implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 大场景序号
-     */
-    @TableField("num")
-    private String num;
-
-    /**
-     * 联系电话
-     */
-    @TableField("phone")
-    private String phone;
-
-    /**
-     * 留言
-     */
-    @TableField("message")
-    private String message;
-
-    /**
-     * 提交时间
-     */
-    @TableField("submit_time")
-    private Date submitTime;
-
-    /**
-     * 解决状态，0-未解决，1-已解决
-     */
-    @TableField("solve_status")
-    private Integer solveStatus;
-
-    /**
-     * 解决时间
-     */
-    @TableField("solve_time")
-    private Date solveTime;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 0-有效，1-删除
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
-
-
-}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneFileBuild.java

@@ -1,87 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 场景文件建模表
- * </p>
- *
- * @author 
- * @since 2022-01-20
- */
-@Getter
-@Setter
-@TableName("t_scene_file_build")
-public class SceneFileBuild implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 相机的Mac地址
-     */
-    @TableField("child_name")
-    private String childName;
-
-    /**
-     * 文件id
-     */
-    @TableField("file_id")
-    private String fileId;
-
-    /**
-     * unicode
-     */
-    @TableField("unicode")
-    private String unicode;
-
-    /**
-     * 上传状态，0-上传中，1-上传成功，-1-上传失败
-     */
-    @TableField("upload_status")
-    private Integer uploadStatus;
-
-    /**
-     * 建模状态，0-未建模，1-请求建模，2-等待建模（队列中），3-建模成功，-1-建模失败
-     */
-    @TableField("build_status")
-    private Integer buildStatus;
-
-    /**
-     * 照片总张数
-     */
-    @TableField("total_pic_num")
-    private Integer totalPicNum;
-
-    @TableField("chunks")
-    private Integer chunks;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 0-有效，1-删除
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
-
-
-}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneFileUpload.java

@@ -1,87 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 场景文件上传表
- * </p>
- *
- * @author 
- * @since 2022-01-20
- */
-@Getter
-@Setter
-@TableName("t_scene_file_upload")
-public class SceneFileUpload implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "Id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 文件id
-     */
-    @TableField("file_id")
-    private String fileId;
-
-    /**
-     * 文件原名称
-     */
-    @TableField("file_source_name")
-    private String fileSourceName;
-
-    /**
-     * 文件存放路径
-     */
-    @TableField("file_path")
-    private String filePath;
-
-    /**
-     * 状态，0-上传中，1-上传成功，-1-上传失败
-     */
-    @TableField("upload_status")
-    private Integer uploadStatus;
-
-    /**
-     * 文件大小
-     */
-    @TableField("size")
-    private Integer size;
-
-    /**
-     * 文件MD5值
-     */
-    @TableField("md5")
-    private String md5;
-
-    @TableField("chunk")
-    private Integer chunk;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 0-有效，1-删除
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
-
-
-}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneModuleVideo.java

@@ -1,66 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 场景模块视频
- * </p>
- *
- * @author 
- * @since 2022-01-20
- */
-@Getter
-@Setter
-@TableName("t_scene_module_video")
-public class SceneModuleVideo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 场景码
-     */
-    @TableField("num")
-    private String num;
-
-    /**
-     * 模块名称
-     */
-    @TableField("module_name")
-    private String moduleName;
-
-    /**
-     * 视频地址
-     */
-    @TableField("video_url")
-    private String videoUrl;
-
-    /**
-     * 缩略图地址
-     */
-    @TableField("images")
-    private String images;
-
-    @TableField("create_time")
-    private Date createTime;
-
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 0-有效，1-删除
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
-
-
-}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/ScenePlus.java

@@ -107,11 +107,10 @@ 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;
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/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;
 
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/ScenePro.java

@@ -158,7 +158,7 @@ public class ScenePro implements Serializable {
      * 记录的状态，A: 生效，I: 禁用
      */
     @TableField("rec_status")
-    @TableLogic
+    @TableLogic("A")
     private String recStatus;
 
     /**

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneProEdit.java

@@ -1,168 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * pro场景编辑数据表
- * </p>
- *
- * @author 
- * @since 2022-01-20
- */
-@Getter
-@Setter
-@TableName("t_scene_pro_edit")
-public class SceneProEdit implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * pro场景id
-     */
-    @TableField("pro_id")
-    private Long proId;
-
-    /**
-     * 大场景的密钥
-     */
-    @TableField("scene_key")
-    private String sceneKey;
-
-    /**
-     * 展示页面密码，0不需要，1需要
-     */
-    @TableField("need_key")
-    private Integer needKey;
-
-    /**
-     * 版本
-     */
-    @TableField("version")
-    private Integer version;
-
-    /**
-     * 表示缩略图是否存在
-     */
-    @TableField("thumb_status")
-    private Integer thumbStatus;
-
-    /**
-     * 地面点位标志
-     */
-    @TableField("marker_logo")
-    private String markerLogo;
-
-    /**
-     * 0表示默认，1表示自己上传
-     */
-    @TableField("floor_logo")
-    private String floorLogo;
-
-    /**
-     * 标记大小
-     */
-    @TableField("floor_logo_size")
-    private Integer floorLogoSize;
-
-    /**
-     * 要上传的热点的id集合，用逗号隔开
-     */
-    @TableField("hots_ids")
-    private String hotsIds;
-
-    /**
-     * 表示初始点信息
-     */
-    @TableField("entry")
-    private String entry;
-
-    /**
-     * 背景音乐名称
-     */
-    @TableField("bg_music")
-    private String bgMusic;
-
-    /**
-     * 普通录屏文件地址
-     */
-    @TableField("screencap_voice_src")
-    private String screencapVoiceSrc;
-
-    /**
-     * 录音文件地址
-     */
-    @TableField("screencap_voice_sound")
-    private String screencapVoiceSound;
-
-    /**
-     * 同步录音地址
-     */
-    @TableField("screencap_voice_soundsync")
-    private String screencapVoiceSoundsync;
-
-    /**
-     * 选择的类型，sound为screencapVoiceSound，file为screencapVoiceSrc，soundsync为screencap_voice_soundsync
-     */
-    @TableField("screencap_voice_type")
-    private String screencapVoiceType;
-
-    /**
-     * 录屏文件地址
-     */
-    @TableField("play_data")
-    private String playData;
-
-    /**
-     * 重新建模的版本
-     */
-    @TableField("floor_edit_ver")
-    private Integer floorEditVer;
-
-    /**
-     * 正式发布重新建模的版本
-     */
-    @TableField("floor_publish_ver")
-    private Integer floorPublishVer;
-
-    /**
-     * 录屏图片存放文件
-     */
-    @TableField("screencap_thumb")
-    private String screencapThumb;
-
-    /**
-     * 分享的logo和生成二维码的logo
-     */
-    @TableField("share_logo")
-    private String shareLogo;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 0-有效，1-删除
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
-
-
-}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneProEditExt.java

@@ -1,168 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * pro场景编辑数据表
- * </p>
- *
- * @author 
- * @since 2022-01-20
- */
-@Getter
-@Setter
-@TableName("t_scene_pro_edit_ext")
-public class SceneProEditExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * pro场景编辑数据表id
-     */
-    @TableField("pro_edit_id")
-    private Long proEditId;
-
-    /**
-     * 场景proid
-     */
-    @TableField("pro_id")
-    private Long proId;
-
-    /**
-     * 小地图浏览
-     */
-    @TableField("map_visi")
-    private Integer mapVisi;
-
-    /**
-     * 自动导览
-     */
-    @TableField("tour_visi")
-    private Integer tourVisi;
-
-    /**
-     * vr模式
-     */
-    @TableField("vr_visi")
-    private Integer vrVisi;
-
-    /**
-     * 展示页面是否显示标尺
-     */
-    @TableField("ruler_visi")
-    private Integer rulerVisi;
-
-    /**
-     * 展示页面cad图在平面图是否显示
-     */
-    @TableField("cad_img_visi")
-    private Integer cadImgVisi;
-
-    /**
-     * cad平面图
-     */
-    @TableField("floor_plan_png")
-    private String floorPlanPng;
-
-    /**
-     * cad平面图参数
-     */
-    @TableField("cad_info")
-    private String cadInfo;
-
-    @TableField("pano_visi")
-    private Integer panoVisi;
-
-    @TableField("m2d_visi")
-    private Integer m2dVisi;
-
-    @TableField("m3d_visi")
-    private Integer m3dVisi;
-
-    @TableField("measure_visi")
-    private Integer measureVisi;
-
-    /**
-     * 肖安需求，场景于场景之间的关联
-     */
-    @TableField("link_scene")
-    private String linkScene;
-
-    @TableField("overlay")
-    private String overlay;
-
-    /**
-     * 是否显示底部logo，1显示，0不显示
-     */
-    @TableField("show_logo_bottom")
-    private Integer showLogoBottom;
-
-    /**
-     * 全景图版本号
-     */
-    @TableField("images_version")
-    private Integer imagesVersion;
-
-    /**
-     * 上传的背景音乐
-     */
-    @TableField("bg_music_name")
-    private String bgMusicName;
-
-    @TableField("jump_scene")
-    private Boolean jumpScene;
-
-    /**
-     * 旋转角度
-     */
-    @TableField("floor_plan_angle")
-    private String floorPlanAngle;
-
-    /**
-     * 场景下载次数
-     */
-    @TableField("download_num")
-    private Integer downloadNum;
-
-    /**
-     * 绿幕抠图json数据
-     */
-    @TableField("videos_user")
-    private String videosUser;
-
-    /**
-     * 大场景序号(随心装场景码)
-     */
-    @TableField("vr_num")
-    private String vrNum;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 0-有效，1-删除
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
-
-
-}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneProEditV3.java

@@ -1,288 +0,0 @@
-package com.fdkankan.scene.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>
- * pro场景编辑数据表
- * </p>
- *
- * @author 
- * @since 2022-04-22
- */
-@Getter
-@Setter
-@TableName("t_scene_pro_edit_v3")
-public class SceneProEditV3 implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * pro场景id
-     */
-    @TableField("pro_id")
-    private Long proId;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 大场景的密钥
-     */
-    @TableField("scene_key")
-    private String sceneKey;
-
-    /**
-     * 展示页面密码，0不需要，1需要
-     */
-    @TableField("need_key")
-    private Integer needKey;
-
-    /**
-     * 版本
-     */
-    @TableField("version")
-    private Integer version;
-
-    /**
-     * 表示缩略图是否存在
-     */
-    @TableField("thumb_status")
-    private Integer thumbStatus;
-
-    /**
-     * 地面点位标志
-     */
-    @TableField("marker_logo")
-    private String markerLogo;
-
-    /**
-     * 0表示默认，1表示自己上传
-     */
-    @TableField("floor_logo")
-    private String floorLogo;
-
-    /**
-     * 标记大小
-     */
-    @TableField("floor_logo_size")
-    private Integer floorLogoSize;
-
-    /**
-     * 要上传的热点的id集合，用逗号隔开
-     */
-    @TableField("hots_ids")
-    private String hotsIds;
-
-    /**
-     * 表示初始点信息
-     */
-    @TableField("entry")
-    private String entry;
-
-    /**
-     * 背景音乐名称
-     */
-    @TableField("bg_music")
-    private String bgMusic;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 普通录屏文件地址
-     */
-    @TableField("screencap_voice_src")
-    private String screencapVoiceSrc;
-
-    /**
-     * 录音文件地址
-     */
-    @TableField("screencap_voice_sound")
-    private String screencapVoiceSound;
-
-    /**
-     * 同步录音地址
-     */
-    @TableField("screencap_voice_soundsync")
-    private String screencapVoiceSoundsync;
-
-    /**
-     * 选择的类型，sound为screencapVoiceSound，file为screencapVoiceSrc，soundsync为screencap_voice_soundsync
-     */
-    @TableField("screencap_voice_type")
-    private String screencapVoiceType;
-
-    /**
-     * 录屏文件地址
-     */
-    @TableField("play_data")
-    private String playData;
-
-    /**
-     * 重新建模的版本
-     */
-    @TableField("floor_edit_ver")
-    private Integer floorEditVer;
-
-    /**
-     * 正式发布重新建模的版本
-     */
-    @TableField("floor_publish_ver")
-    private Integer floorPublishVer;
-
-    /**
-     * 录屏图片存放文件
-     */
-    @TableField("screencap_thumb")
-    private String screencapThumb;
-
-    /**
-     * 分享的logo和生成二维码的logo
-     */
-    @TableField("share_logo")
-    private String shareLogo;
-
-    /**
-     * 小地图浏览
-     */
-    @TableField("map_visi")
-    private Integer mapVisi;
-
-    /**
-     * 自动导览
-     */
-    @TableField("tour_visi")
-    private Integer tourVisi;
-
-    /**
-     * vr模式
-     */
-    @TableField("vr_visi")
-    private Integer vrVisi;
-
-    /**
-     * 展示页面是否显示标尺
-     */
-    @TableField("ruler_visi")
-    private Integer rulerVisi;
-
-    /**
-     * 展示页面cad图在平面图是否显示
-     */
-    @TableField("cad_img_visi")
-    private Integer cadImgVisi;
-
-    /**
-     * cad平面图
-     */
-    @TableField("floor_plan_png")
-    private String floorPlanPng;
-
-    /**
-     * cad平面图参数
-     */
-    @TableField("cad_info")
-    private String cadInfo;
-
-    @TableField("pano_visi")
-    private Integer panoVisi;
-
-    @TableField("m2d_visi")
-    private Integer m2dVisi;
-
-    @TableField("m3d_visi")
-    private Integer m3dVisi;
-
-    @TableField("measure_visi")
-    private Integer measureVisi;
-
-    /**
-     * 肖安需求，场景于场景之间的关联
-     */
-    @TableField("link_scene")
-    private String linkScene;
-
-    @TableField("overlay")
-    private String overlay;
-
-    /**
-     * 是否显示底部logo，1显示，0不显示
-     */
-    @TableField("show_logo_bottom")
-    private Boolean showLogoBottom;
-
-    /**
-     * 全景图版本号
-     */
-    @TableField("images_version")
-    private Integer imagesVersion;
-
-    /**
-     * 上传的背景音乐
-     */
-    @TableField("bg_music_name")
-    private String bgMusicName;
-
-    @TableField("jump_scene")
-    private Boolean jumpScene;
-
-    /**
-     * 旋转角度
-     */
-    @TableField("floor_plan_angle")
-    private String floorPlanAngle;
-
-    /**
-     * 场景下载次数
-     */
-    @TableField("download_num")
-    private Integer downloadNum;
-
-    /**
-     * 绿幕抠图json数据
-     */
-    @TableField("videos_user")
-    private String videosUser;
-
-    /**
-     * 大场景序号(随心装场景码)
-     */
-    @TableField("vr_num")
-    private String vrNum;
-
-    /**
-     * 随心装封面图
-     */
-    @TableField("vr_thumb")
-    private String vrThumb;
-
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
-
-
-}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneProExt.java

@@ -1,153 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * pro场景表
- * </p>
- *
- * @author 
- * @since 2022-01-20
- */
-@Getter
-@Setter
-@TableName("t_scene_pro_ext")
-public class SceneProExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 外键id，t_scene_pro_id
-     */
-    @TableField("scene_pro_id")
-    private Long sceneProId;
-
-    /**
-     * 原始的大场景数据（七牛）
-     */
-    @TableField("data_source")
-    private String dataSource;
-
-    /**
-     * 手机id
-     */
-    @TableField("phone_id")
-    private String phoneId;
-
-    /**
-     * 1表示推荐，0表示正常
-     */
-    @TableField("recommend")
-    private Integer recommend;
-
-    /**
-     * 所有资源文件名
-     */
-    @TableField("files_name")
-    private String filesName;
-
-    /**
-     * 算法类型
-     */
-    @TableField("algorithm")
-    private String algorithm;
-
-    /**
-     * 服务器的服务商
-     */
-    @TableField("ecs")
-    private String ecs;
-
-    /**
-     * 使用容量
-     */
-    @TableField("space")
-    private Long space;
-
-    /**
-     * 固件版本
-     */
-    @TableField("firmware_version")
-    private String firmwareVersion;
-
-    /**
-     * 计算时间（秒为单位）
-     */
-    @TableField("compute_time")
-    private Long computeTime;
-
-    /**
-     * 场景来源，相机拍摄10以内表示，1表示八目，2双目，3转台，4 激光  其他来源10以上，11：一键换装，12：123看房，13文通虚拟场景
-     */
-    @TableField("scene_source")
-    private Integer sceneSource;
-
-    /**
-     * 全景图加载方式，tiles/1k：1k瓦片图，tiles/2：2k瓦片图，tiles/4k：4k瓦片图，pan：全景图 ，local：本地切片，cube：立体图
-     */
-    @TableField("scene_resolution")
-    private String sceneResolution;
-
-    /**
-     * 场景来源，lite：双目lite相机，pro：八目相机，minion：双面转台相机，laser：激光相机，virtual：虚拟场景，sketch：图片建模场景
-     */
-    @TableField("scene_from")
-    private String sceneFrom;
-
-    /**
-     * 大场景序号(随心装场景码)
-     */
-    @TableField("vrnum")
-    private String vrnum;
-
-    @TableField("unicode")
-    private String unicode;
-
-    /**
-     * 浏览次数
-     */
-    @TableField("view_count")
-    private Integer viewCount;
-
-    /**
-     * 拍摄数量
-     */
-    @TableField("shoot_count")
-    private Integer shootCount;
-
-    /**
-     * 相机类型，0表示双目，1四维看看pro，2 四维看看lite，9 双目转台，10 激光转台
-     */
-    @TableField("camera_type")
-    private Integer cameraType;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 0-有效，1-删除
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
-
-
-}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneProPO.java

@@ -1,184 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import java.util.Date;
-import lombok.Data;
-import org.springframework.data.annotation.Transient;
-
-@Data
-public class SceneProPO {
-
-    private Long id;
-
-    /**
-     * 场景名称
-     */
-    private String sceneName;
-
-    /**
-     * 场景描述
-     */
-    private String sceneDec;
-
-    /**
-     * 场景的链接地址
-     */
-    private String webSite;
-
-    /**
-     * 场景缩略图
-     */
-    private String thumb;
-
-    /**
-     * 用户表t_user的id
-     */
-    private Long userId;
-
-    /**
-     * 相机主表t_camera的id
-     */
-    private Long cameraId;
-
-    /**
-     * 场景logo
-     */
-    private String sceneLogo;
-
-    /**
-     * 大场景序号
-     */
-    private String num;
-
-    /**
-     * 0-其他，1-文博，2-地产，3-电商，4-餐饮，5-家居,99-一件换装虚拟房源
-     */
-    private Integer sceneType;
-
-    /**
-     * 浏览次数
-     */
-    private Integer viewCount;
-
-    /**
-     * 拍摄数量
-     */
-    private Integer shootCount;
-
-    /**
-     * 点位视频
-     */
-    private String videos;
-
-    /**
-     * 要gps定位
-     */
-    private String gps;
-
-    /**
-     * 方案：1-双目，2-转台，3-六目,4-八目,10-获取4k图，11-获取2k，12-获取1k
-     */
-    private Integer sceneScheme;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    private String recStatus;
-
-    /**
-     * 算法类型（V2,V3）
-     */
-    private String buildType;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 0-有效，1-删除
-     */
-    private Integer tbStatus;
-
-    private Integer sceneStatus;
-
-    /**
-     * 原始的大场景数据（七牛）
-     */
-    private String dataSource;
-
-    /**
-     * 0表示未付款，1表示付款了，-1表示欠费，-2表示容量不足
-     */
-    private Integer payStatus;
-
-    /**
-     * 手机id
-     */
-    private String phoneId;
-
-    /**
-     * 1表示推荐，0表示正常
-     */
-    private Integer recommend;
-
-    /**
-     * 所有资源文件名
-     */
-    private String filesName;
-
-    /**
-     * 算法类型
-     */
-    private String algorithm;
-
-    /**
-     * 服务器的服务商
-     */
-    private String ecs;
-
-    /**
-     * 使用容量
-     */
-    private Long space;
-
-    /**
-     * 固件版本
-     */
-    private String firmwareVersion;
-
-    /**
-     * 计算时间（秒为单位）
-     */
-    private Long computeTime;
-
-    /**
-     * 场景来源，相机拍摄10以内表示，1表示八目，2双目，3转台，4 激光  其他来源10以上，11：一键换装，12：123看房，13文通虚拟场景
-     */
-    private Integer sceneSource;
-
-    /**
-     * 大场景序号(随心装场景码)
-     */
-    private String vrnum;
-
-    private String unicode;
-
-    /**
-     * 相机类型
-     */
-    private Integer cameraType;
-
-    @Transient
-    private String cooperationUserId;
-
-//    /**
-//     * 触发mq调度，事务最后触发
-//     */
-//    private BuildSceneMqMessage mqMsg;
-
-}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneProV3.java

@@ -1,228 +0,0 @@
-package com.fdkankan.scene.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>
- * pro场景表
- * </p>
- *
- * @author 
- * @since 2022-04-22
- */
-@Getter
-@Setter
-@TableName("t_scene_pro_v3")
-public class SceneProV3 implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 场景名称
-     */
-    @TableField("scene_name")
-    private String sceneName;
-
-    /**
-     * 场景描述
-     */
-    @TableField("scene_dec")
-    private String sceneDec;
-
-    /**
-     * 场景的链接地址
-     */
-    @TableField("web_site")
-    private String webSite;
-
-    /**
-     * 场景缩略图
-     */
-    @TableField("thumb")
-    private String thumb;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 0表示未建好，1表示建好，-1表示出错，-2表示不要在官网上显示
-     */
-    @TableField("status")
-    private Integer status;
-
-    /**
-     * 原始的大场景数据（七牛）
-     */
-    @TableField("data_source")
-    private String dataSource;
-
-    /**
-     * 用户表t_user的id
-     */
-    @TableField("user_id")
-    private Long userId;
-
-    /**
-     * 0表示未付款，1表示付款了，-1表示欠费，-2表示容量不足
-     */
-    @TableField("pay_status")
-    private Integer payStatus;
-
-    /**
-     * 相机主表t_camera的id
-     */
-    @TableField("camera_id")
-    private Long cameraId;
-
-    /**
-     * 手机id
-     */
-    @TableField("phone_id")
-    private String phoneId;
-
-    /**
-     * 场景logo
-     */
-    @TableField("scene_logo")
-    private String sceneLogo;
-
-    /**
-     * 大场景序号
-     */
-    @TableField("num")
-    private String num;
-
-    /**
-     * 0表示其他，1表示文博，2表示地产，3表示电商，4表示餐饮，5表示家居,99一件换装虚拟房源
-     */
-    @TableField("scene_type")
-    private Integer sceneType;
-
-    /**
-     * 1表示推荐，0表示正常
-     */
-    @TableField("recommend")
-    private Integer recommend;
-
-    /**
-     * 浏览次数
-     */
-    @TableField("view_count")
-    private Integer viewCount;
-
-    /**
-     * 拍摄数量
-     */
-    @TableField("shoot_count")
-    private Integer shootCount;
-
-    /**
-     * 所有资源文件名
-     */
-    @TableField("files_name")
-    private String filesName;
-
-    /**
-     * 点位视频
-     */
-    @TableField("videos")
-    private String videos;
-
-    /**
-     * 要gps定位
-     */
-    @TableField("gps")
-    private String gps;
-
-    /**
-     * 方案：1是双目，2是转台，3是六目,4是八目,10获取4k图，11获取2k，12获取1k
-     */
-    @TableField("scene_scheme")
-    private Integer sceneScheme;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 算法类型
-     */
-    @TableField("algorithm")
-    private String algorithm;
-
-    /**
-     * 服务器的服务商
-     */
-    @TableField("ecs")
-    private String ecs;
-
-    /**
-     * 使用容量
-     */
-    @TableField("space")
-    private Long space;
-
-    /**
-     * 固件版本
-     */
-    @TableField("firmware_version")
-    private String firmwareVersion;
-
-    /**
-     * 调用V2还是V3的算法
-     */
-    @TableField("build_type")
-    private String buildType;
-
-    /**
-     * 计算时间（秒为单位）
-     */
-    @TableField("compute_time")
-    private Long computeTime;
-
-    /**
-     * 场景来源，相机拍摄10以内表示，1表示八目，2双目，3转台，4 激光  其他来源10以上，11：一键换装，12：123看房，13文通虚拟场景,14上传的matterport场景
-     */
-    @TableField("scene_source")
-    private Integer sceneSource;
-
-    /**
-     * 大场景序号(随心装场景码)
-     */
-    @TableField("vrnum")
-    private String vrnum;
-
-    @TableField("unicode")
-    private String unicode;
-
-    @TableField("mosaics")
-    private String mosaics;
-
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
-
-
-}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneRecord.java

@@ -1,72 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 大场景编辑记录表
- * </p>
- *
- * @author 
- * @since 2022-01-20
- */
-@Getter
-@Setter
-@TableName("t_scene_record")
-public class SceneRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 大场景序号
-     */
-    @TableField("num")
-    private String num;
-
-    /**
-     * 发布时间
-     */
-    @TableField("publish_time")
-    private Date publishTime;
-
-    /**
-     * 热点个数
-     */
-    @TableField("hots_count")
-    private Integer hotsCount;
-
-    /**
-     * 消费
-     */
-    @TableField("pay")
-    private Integer pay;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 0-有效，1-删除
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
-
-
-}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneRepairLog.java

@@ -59,11 +59,11 @@ public class SceneRepairLog 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;
 
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneResource.java

@@ -1,11 +1,14 @@
 package com.fdkankan.scene.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
+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>
@@ -13,7 +16,7 @@ import java.util.Date;
  * </p>
  *
  * @author 
- * @since 2022-01-20
+ * @since 2022-07-18
  */
 @Getter
 @Setter
@@ -28,8 +31,8 @@ public class SceneResource implements Serializable {
     /**
      * 权限名称
      */
-    @TableField("resource_name")
-    private String resourceName;
+    @TableField("name")
+    private String name;
 
     /**
      * 英文名
@@ -56,23 +59,20 @@ public class SceneResource implements Serializable {
     private String description;
 
     /**
-     * 创建时间
+     * 版本(v3,v4)
      */
+    @TableField("version")
+    private String version;
+
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 更新时间
-     */
     @TableField("update_time")
     private Date updateTime;
 
-    /**
-     * 0-有效，1-删除
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneResourceCamera.java

@@ -1,60 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 场景资源和相机关联表
- * </p>
- *
- * @author 
- * @since 2022-01-20
- */
-@Getter
-@Setter
-@TableName("t_scene_resource_camera")
-public class SceneResourceCamera implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 场景资源id
-     */
-    @TableField("scene_resource_id")
-    private Long sceneResourceId;
-
-    /**
-     * 协作相机的id
-     */
-    @TableField("camera_id")
-    private Long cameraId;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 0-有效，1-删除
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
-
-
-}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneResourceCooperation.java

@@ -1,11 +1,14 @@
 package com.fdkankan.scene.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
+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>
@@ -13,7 +16,7 @@ import java.util.Date;
  * </p>
  *
  * @author 
- * @since 2022-01-20
+ * @since 2022-07-18
  */
 @Getter
 @Setter
@@ -37,24 +40,15 @@ public class SceneResourceCooperation implements Serializable {
     @TableField("scene_cooperation_id")
     private Long sceneCooperationId;
 
-    /**
-     * 创建时间
-     */
     @TableField("create_time")
     private Date createTime;
 
-    /**
-     * 更新时间
-     */
     @TableField("update_time")
     private Date updateTime;
 
-    /**
-     * 0-有效，1-删除
-     */
-    @TableField("tb_status")
+    @TableField("rec_status")
     @TableLogic
-    private Integer tbStatus;
+    private String recStatus;
 
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneStatistics.java

@@ -1,115 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 百度统计场景流量量表
- * </p>
- *
- * @author 
- * @since 2022-01-20
- */
-@Getter
-@Setter
-@TableName("t_scene_statistics")
-public class SceneStatistics implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 场景码
-     */
-    @TableField("num")
-    private String num;
-
-    /**
-     * 浏览量(PV)
-     */
-    @TableField("pv_count")
-    private Integer pvCount;
-
-    /**
-     * 访客数(UV)
-     */
-    @TableField("visitor_count")
-    private Integer visitorCount;
-
-    /**
-     * IP 数
-     */
-    @TableField("ip_count")
-    private Integer ipCount;
-
-    /**
-     * 入口页次数
-     */
-    @TableField("visit1_count")
-    private Integer visit1Count;
-
-    /**
-     * 贡献下游浏览量
-     */
-    @TableField("outward_count")
-    private Integer outwardCount;
-
-    /**
-     * 退出页次数
-     */
-    @TableField("exit_count")
-    private Integer exitCount;
-
-    /**
-     * 平均停留时长， 秒
-     */
-    @TableField("average_stay_time")
-    private Integer averageStayTime;
-
-    /**
-     * 退出率，%
-     */
-    @TableField("exit_ratio")
-    private BigDecimal exitRatio;
-
-    /**
-     * 1:场景，2:热点，3:视频
-     */
-    @TableField("resources_type")
-    private Integer resourcesType;
-
-    /**
-     * 日期（年月日）
-     */
-    @TableField("statistics_date")
-    private Date statisticsDate;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 0-有效，1-删除
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
-
-
-}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/SceneUpload.java

@@ -3,6 +3,7 @@ package com.fdkankan.scene.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 lombok.Getter;
 import lombok.Setter;
@@ -61,8 +62,12 @@ public class SceneUpload implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-    @TableField("tb_status")
-    private Integer tbStatus;
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    @TableField("rec_status")
+    @TableLogic("A")
+    private String recStatus;
 
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/User.java

@@ -0,0 +1,141 @@
+package com.fdkankan.scene.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_user")
+public class User implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 头像对应的链接地址
+     */
+    @TableField("head")
+    private String head;
+
+    /**
+     * 用户密码
+     */
+    @TableField("password")
+    private String password;
+
+    /**
+     * 用户邮箱
+     */
+    @TableField("email")
+    private String email;
+
+    /**
+     * 注册时间
+     */
+    @TableField("register_time")
+    private Date registerTime;
+
+    /**
+     * 用户名
+     */
+    @TableField("user_name")
+    private String userName;
+
+    /**
+     * 昵称
+     */
+    @TableField("nick_name")
+    private String nickName;
+
+    /**
+     * 0表示禁言（bbs）
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 0表示拒绝通知，1表示接受通知
+     */
+    @TableField("is_notice")
+    private Integer isNotice;
+
+    /**
+     * 机构名称
+     */
+    @TableField("organization_name")
+    private String organizationName;
+
+    /**
+     * 主页链接
+     */
+    @TableField("main_page")
+    private String mainPage;
+
+    /**
+     * 所在国家，默认是86
+     */
+    @TableField("country")
+    private String country;
+
+    /**
+     * 所在省份
+     */
+    @TableField("province")
+    private String province;
+
+    /**
+     * 所在城市
+     */
+    @TableField("city")
+    private String city;
+
+    /**
+     * 可下载场景总数
+     */
+    @TableField("download_num_total")
+    private Integer downloadNumTotal;
+
+    /**
+     * 已下载场景总数
+     */
+    @TableField("download_num")
+    private Integer downloadNum;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    @TableField("rec_status")
+    @TableLogic
+    private String recStatus;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/UserIncrement.java

@@ -0,0 +1,102 @@
+package com.fdkankan.scene.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_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: 禁用
+     */
+    @TableField("rec_status")
+    @TableLogic
+    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;
+
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/VideoSceneProgress.java

@@ -1,102 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 视频重算进度
- * </p>
- *
- * @author 
- * @since 2022-01-20
- */
-@Getter
-@Setter
-@TableName("t_video_scene_progress")
-public class VideoSceneProgress implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 大场景序号
-     */
-    @TableField("num")
-    private String num;
-
-    /**
-     * 重算开始时间（进入队列）
-     */
-    @TableField("rebuild_queue_start_time")
-    private Date rebuildQueueStartTime;
-
-    /**
-     * 重算开始时间
-     */
-    @TableField("rebuild_start_time")
-    private Date rebuildStartTime;
-
-    /**
-     * 重算结束时间
-     */
-    @TableField("rebuild_end_time")
-    private Date rebuildEndTime;
-
-    /**
-     * 视频名称
-     */
-    @TableField("video_name")
-    private String videoName;
-
-    /**
-     * 原场景路径
-     */
-    @TableField("data_source")
-    private String dataSource;
-
-    /**
-     * 重算结果  0-失败，1-成功，2-等待， 3-重算中，9-成功且轮询过
-     */
-    @TableField("rebuild_result")
-    private Integer rebuildResult;
-
-    /**
-     * 重算参数
-     */
-    @TableField("rebuild_param")
-    private String rebuildParam;
-
-    /**
-     * videos_hdr_param 参数
-     */
-    @TableField("hdr_param")
-    private String hdrParam;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 0-有效，1-删除
-     */
-    @TableField("tb_status")
-    @TableLogic
-    private Integer tbStatus;
-
-
-}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/generate/AutoGenerate.java

@@ -19,7 +19,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") + "\\4dkankan-center-scene";
 
         generate(path,"scene", getTables(new String[]{
-                "t_scene_pro"
+                "t_scene_resource_cooperation"
         }));
 
 //        generate(path,"goods", getTables(new String[]{
@@ -79,7 +79,7 @@ public class AutoGenerate {
 
                             .entityBuilder()
                             .enableLombok()
-                            .logicDeleteColumnName("tb_status")
+                            .logicDeleteColumnName("rec_status")
                             .enableTableFieldAnnotation()
 //                            .superClass(BaseEntity.class)
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/httpclient/FdkankanMiniClient.java

@@ -1,7 +1,6 @@
 package com.fdkankan.scene.httpclient;
 
 import com.dtflys.forest.annotation.Body;
-import com.dtflys.forest.annotation.Get;
 import com.dtflys.forest.annotation.Header;
 import com.dtflys.forest.annotation.Post;
 import com.dtflys.forest.annotation.Retry;
@@ -9,20 +8,10 @@ import com.dtflys.forest.annotation.Success;
 import com.dtflys.forest.annotation.Var;
 import com.dtflys.forest.callback.OnError;
 import com.dtflys.forest.callback.OnSuccess;
-import com.dtflys.forest.http.ForestResponse;
 import com.fdkankan.common.response.Result;
-import com.fdkankan.scene.bean.CameraBean;
 import com.fdkankan.scene.bean.RequestSceneProV4;
-import com.fdkankan.scene.bean.UserIncrementBean;
-//import com.fdkankan.scene.callback.FdkkMiniReqSuccessCondition;
 import com.fdkankan.scene.callback.FdkkMiniReqSuccessCondition;
-import com.fdkankan.scene.entity.SceneProV3;
-import java.io.File;
-import java.io.InputStream;
 import java.util.Map;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
 
 /**
  * <p>
@@ -35,33 +24,33 @@ import org.springframework.web.multipart.MultipartFile;
 @Success(condition = FdkkMiniReqSuccessCondition.class)
 public interface FdkankanMiniClient {
 
-    @Get(url="{url}"
-//        ,interceptor = TLogForestInterceptor.class    加这个拦截器，打印的tlog日志会详细一些，包括头信息等等
-    )
-    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
-    Result<String> getDataSyncType(@Var("url") String url, OnSuccess<Result> onSuccess, OnError onError);
-
-    @Get("{url}")
-    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
-    Result<UserIncrementBean> getUserIncrementByCameraId(@Var("url") String url, OnSuccess<Result> onSuccess, OnError onError);
-
-    @Get("{url}")
-    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
-    Result<CameraBean> getCameraByCameraId(@Var("url") String url, OnSuccess<Result> onSuccess, OnError onError);
-
-    @Get(url="{url}")
-    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
-    Result<SceneProV3> getSceneProByNum(@Var("url") String url, OnSuccess<Result> onSuccess, OnError onError);
-
-    @Post(url="{url}")
-    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
-    Result<Map<String, Object>> getIsLogin(@Var("url") String url, @Header("token") String token, OnSuccess<Result> onSuccess, OnError onError);
-
-    @Post(
-        url = "${url}",
-        contentType = "application/json"
-    )
-    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
-    Result upgradeToV4ResultSync(@Var("url") String url, @Body RequestSceneProV4 param, OnSuccess<Result> onSuccess, OnError onError);
+//    @Get(url="{url}"
+////        ,interceptor = TLogForestInterceptor.class    加这个拦截器，打印的tlog日志会详细一些，包括头信息等等
+//    )
+//    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
+//    Result<String> getDataSyncType(@Var("url") String url, OnSuccess<Result> onSuccess, OnError onError);
+//
+//    @Get("{url}")
+//    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
+//    Result<UserIncrementBean> getUserIncrementByCameraId(@Var("url") String url, OnSuccess<Result> onSuccess, OnError onError);
+//
+//    @Get("{url}")
+//    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
+//    Result<CameraBean> getCameraByCameraId(@Var("url") String url, OnSuccess<Result> onSuccess, OnError onError);
+
+//    @Get(url="{url}")
+//    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
+//    Result<SceneProV3> getSceneProByNum(@Var("url") String url, OnSuccess<Result> onSuccess, OnError onError);
+
+//    @Post(url="{url}")
+//    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
+//    Result<Map<String, Object>> getIsLogin(@Var("url") String url, @Header("token") String token, OnSuccess<Result> onSuccess, OnError onError);
+//
+//    @Post(
+//        url = "${url}",
+//        contentType = "application/json"
+//    )
+//    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
+//    Result upgradeToV4ResultSync(@Var("url") String url, @Body RequestSceneProV4 param, OnSuccess<Result> onSuccess, OnError onError);
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/mapper/ICameraDetailMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.mapper;
+
+import com.fdkankan.scene.entity.CameraDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 相机子表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@Mapper
+public interface ICameraDetailMapper extends BaseMapper<CameraDetail> {
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/mapper/ICameraMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.mapper;
+
+import com.fdkankan.scene.entity.Camera;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 相机主表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@Mapper
+public interface ICameraMapper extends BaseMapper<Camera> {
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/mapper/ICompanyMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.mapper;
+
+import com.fdkankan.scene.entity.Company;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 客户企业logo信息 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@Mapper
+public interface ICompanyMapper extends BaseMapper<Company> {
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/mapper/ISceneCooperationMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.mapper;
+
+import com.fdkankan.scene.entity.SceneCooperation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@Mapper
+public interface ISceneCooperationMapper extends BaseMapper<SceneCooperation> {
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/mapper/ISceneResourceCooperationMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.mapper;
+
+import com.fdkankan.scene.entity.SceneResourceCooperation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 场景资源和协作用户关联表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@Mapper
+public interface ISceneResourceCooperationMapper extends BaseMapper<SceneResourceCooperation> {
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/mapper/ISceneResourceMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.mapper;
+
+import com.fdkankan.scene.entity.SceneResource;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 场景资源表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@Mapper
+public interface ISceneResourceMapper extends BaseMapper<SceneResource> {
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/mapper/IUserIncrementMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.mapper;
+
+import com.fdkankan.scene.entity.UserIncrement;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 用户增值权益表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@Mapper
+public interface IUserIncrementMapper extends BaseMapper<UserIncrement> {
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/mapper/IUserMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.mapper;
+
+import com.fdkankan.scene.entity.User;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 用户信息表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@Mapper
+public interface IUserMapper extends BaseMapper<User> {
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ICameraDetailService.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.service;
+
+import com.fdkankan.scene.entity.CameraDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 相机子表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+public interface ICameraDetailService extends IService<CameraDetail> {
+
+    CameraDetail getByCameraId(long cameraId);
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ICameraService.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.service;
+
+import com.fdkankan.scene.entity.Camera;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 相机主表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+public interface ICameraService extends IService<Camera> {
+
+    Camera findByChildName(String childName);
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ICompanyService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.scene.service;
+
+import com.fdkankan.scene.entity.Company;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 客户企业logo信息 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+public interface ICompanyService extends IService<Company> {
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneCooperationService.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.service;
+
+import com.fdkankan.scene.entity.SceneCooperation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+public interface ISceneCooperationService extends IService<SceneCooperation> {
+
+    SceneCooperation getByNum(String num);
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneEditService.java

@@ -1,6 +1,7 @@
 package com.fdkankan.scene.service;
 
 import com.fdkankan.common.response.ResultData;
+import com.fdkankan.common.user.SSOUser;
 import com.fdkankan.scene.vo.BaseDataParamVO;
 import com.fdkankan.scene.vo.BaseSceneParamVO;
 import com.fdkankan.scene.vo.LocalesParamVO;
@@ -19,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  **/
 public interface ISceneEditService {
 
-    SceneAuthVO getAuth(String num, String token) throws Exception;
+    SceneAuthVO getAuth(String num, SSOUser ssoUser) throws Exception;
 
     ResultData locales(LocalesParamVO param) throws Exception;
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/IScenePlusService.java

@@ -5,9 +5,6 @@ import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
 import java.util.List;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * <p>
@@ -29,7 +26,8 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
     ResultData moveScene(List<String> numList, Long cameraId, Long userId);
 
+    ScenePlus checkSceneAvail(String num);
 
-
+    ResultData updateViewCount(String num) throws Exception;
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneResourceCooperationService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.scene.service;
+
+import com.fdkankan.scene.entity.SceneResourceCooperation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 场景资源和协作用户关联表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+public interface ISceneResourceCooperationService extends IService<SceneResourceCooperation> {
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneResourceService.java

@@ -0,0 +1,19 @@
+package com.fdkankan.scene.service;
+
+import com.fdkankan.scene.entity.SceneResource;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * <p>
+ * 场景资源表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+public interface ISceneResourceService extends IService<SceneResource> {
+
+    List<SceneResource> findByCooperationId(Long resourceCooperationId);
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/IUserIncrementService.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.service;
+
+import com.fdkankan.scene.entity.UserIncrement;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户增值权益表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+public interface IUserIncrementService extends IService<UserIncrement> {
+
+    UserIncrement findByCameraId(Long cameraId);
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/IUserService.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.service;
+
+import com.fdkankan.scene.entity.User;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户信息表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+public interface IUserService extends IService<User> {
+
+    User getByUserName(String userName);
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/CameraDetailServiceImpl.java

@@ -0,0 +1,24 @@
+package com.fdkankan.scene.service.impl;
+
+import com.fdkankan.scene.entity.CameraDetail;
+import com.fdkankan.scene.mapper.ICameraDetailMapper;
+import com.fdkankan.scene.service.ICameraDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 相机子表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@Service
+public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, CameraDetail> implements ICameraDetailService {
+
+    @Override
+    public CameraDetail getByCameraId(long cameraId) {
+        return null;
+    }
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/CameraServiceImpl.java

@@ -0,0 +1,26 @@
+package com.fdkankan.scene.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.scene.entity.Camera;
+import com.fdkankan.scene.mapper.ICameraMapper;
+import com.fdkankan.scene.service.ICameraService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 相机主表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@Service
+public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implements ICameraService {
+
+    @Override
+    public Camera findByChildName(String childName) {
+        return this.getOne(new LambdaQueryWrapper<Camera>().eq(Camera::getChildName, childName));
+    }
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/CompanyServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.scene.service.impl;
+
+import com.fdkankan.scene.entity.Company;
+import com.fdkankan.scene.mapper.ICompanyMapper;
+import com.fdkankan.scene.service.ICompanyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 客户企业logo信息 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@Service
+public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> implements ICompanyService {
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneCooperationServiceImpl.java

@@ -0,0 +1,27 @@
+package com.fdkankan.scene.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.scene.entity.SceneCooperation;
+import com.fdkankan.scene.mapper.ISceneCooperationMapper;
+import com.fdkankan.scene.service.ISceneCooperationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@Service
+public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMapper, SceneCooperation> implements ISceneCooperationService {
+
+    @Override
+    public SceneCooperation getByNum(String num) {
+        return this.getOne(
+            new LambdaQueryWrapper<SceneCooperation>()
+                .eq(SceneCooperation::getSceneNum, num));
+    }
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneDataDownloadServiceImpl.java

@@ -25,7 +25,6 @@ public class SceneDataDownloadServiceImpl extends ServiceImpl<ISceneDataDownload
     public SceneDataDownload findBySceneNum(String sceneNum) {
 
         List<SceneDataDownload> list = this.list(new LambdaQueryWrapper<SceneDataDownload>()
-                .eq(SceneDataDownload::getTbStatus, TbStatus.VALID.code())
                 .eq(SceneDataDownload::getNum, sceneNum)
                 .orderByDesc(SceneDataDownload::getId));
         if(CollUtil.isEmpty(list)){

4dkankan-center-scene/src/main/java/com/fdkankan/scene/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));
     }
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -17,13 +17,10 @@ import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.FileBizType;
 import com.fdkankan.common.constant.OperationType;
-import com.fdkankan.common.constant.PayStatus;
 import com.fdkankan.common.constant.SceneInfoReqType;
-import com.fdkankan.common.constant.SceneStatus;
 import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.Result;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.util.ComputerUtil;
 import com.fdkankan.common.util.CreateObjUtil;
@@ -33,8 +30,6 @@ import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.SceneUtil;
 import com.fdkankan.fyun.constant.StorageType;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
-import com.fdkankan.platform.api.dto.CameraDetail;
-import com.fdkankan.platform.api.dto.Company;
 import com.fdkankan.platform.api.feign.PlatformGoodsClient;
 import com.fdkankan.platform.api.feign.PlatformUserClient;
 import com.fdkankan.redis.constant.RedisKey;
@@ -47,15 +42,18 @@ import com.fdkankan.scene.bean.RequestSceneProV4;
 import com.fdkankan.scene.bean.SceneJsonBean;
 import com.fdkankan.scene.callback.FdkkMiniReqErrorCallback;
 import com.fdkankan.scene.callback.FdkkMiniReqSuccessCallback;
+import com.fdkankan.scene.entity.CameraDetail;
+import com.fdkankan.scene.entity.Company;
 import com.fdkankan.scene.entity.SceneDataDownload;
 import com.fdkankan.scene.entity.SceneEditControls;
 import com.fdkankan.scene.entity.SceneEditInfo;
 import com.fdkankan.scene.entity.SceneEditInfoExt;
 import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.entity.ScenePlusExt;
-import com.fdkankan.scene.entity.SceneProV3;
 import com.fdkankan.scene.httpclient.FdkankanMiniClient;
 import com.fdkankan.scene.mapper.ISceneEditInfoMapper;
+import com.fdkankan.scene.service.ICameraDetailService;
+import com.fdkankan.scene.service.ICompanyService;
 import com.fdkankan.scene.service.ISceneDataDownloadService;
 import com.fdkankan.scene.service.ISceneEditControlsService;
 import com.fdkankan.scene.service.ISceneEditInfoExtService;
@@ -166,6 +164,10 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     private FdkankanMiniClient fdkankanMiniClient;
     @Autowired
     private ISceneUploadService sceneUploadService;
+    @Autowired
+    private ICameraDetailService cameraDetailService;
+    @Autowired
+    private ICompanyService companyService;
 
     @Transactional
     @Override
@@ -312,18 +314,18 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 //            sceneEditControlsService.updateById(sceneEditControls);
 //        }
 
-        // todo 调用v3接口同步场景缩略图url---------------------------------start
-        String url = fkankanMiniHost + URL_UPGRADE_TO_V4_RESULT_SYNC;
-        fdkankanMiniClient.upgradeToV4ResultSync(url,
-            RequestSceneProV4.builder()
-                .id(scenePlus.getId())
-                .thumb(scenePlusExt.getThumb())
-                .sceneName(sceneEditInfo.getTitle())
-                .sceneDec(sceneEditInfo.getDescription())
-                .build(),
-            new FdkkMiniReqSuccessCallback(), new FdkkMiniReqErrorCallback()
-        );
-        // todo 调用v3接口同步场景缩略图url---------------------------------end
+//        // todo 调用v3接口同步场景缩略图url---------------------------------start
+//        String url = fkankanMiniHost + URL_UPGRADE_TO_V4_RESULT_SYNC;
+//        fdkankanMiniClient.upgradeToV4ResultSync(url,
+//            RequestSceneProV4.builder()
+//                .id(scenePlus.getId())
+//                .thumb(scenePlusExt.getThumb())
+//                .sceneName(sceneEditInfo.getTitle())
+//                .sceneDec(sceneEditInfo.getDescription())
+//                .build(),
+//            new FdkkMiniReqSuccessCallback(), new FdkkMiniReqErrorCallback()
+//        );
+//        // todo 调用v3接口同步场景缩略图url---------------------------------end
 
         return ResultData.ok();
     }
@@ -459,30 +461,27 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         sceneInfoVO.setSceneFrom(scenePlusExt.getSceneFrom());
         sceneInfoVO.setVideos(scenePlusExt.getVideos());
 
-        // TODO: 2022/4/24 v3版本停机要切换---------------------------start
-//        this.setExtData(sceneInfoVO, scenePlus.getCameraId());
-        this.setExtDataFromV3(sceneInfoVO, scenePlus.getCameraId());
-        // TODO: 2022/4/24 v3版本停机要切换---------------------------end
+        this.setExtData(sceneInfoVO, scenePlus.getCameraId());
 
         return sceneInfoVO;
     }
 
-    /**
-     * <p>
-     getInfo接口返回字段扩展
-     * </p>
-     * @author dengsixing
-     * @date 2022/3/9
-     **/
-    private void setExtDataFromV3(SceneInfoVO sceneInfoVO, Long cameraId) throws Exception{
-        if(Objects.isNull(cameraId)){
-            return;
-        }
-        String url = fkankanMiniHost + URL_GET_DATASYNC_BY_CAMERAID + cameraId;
-        Result<String> dataSyncResult = fdkankanMiniClient
-            .getDataSyncType(url, new FdkkMiniReqSuccessCallback(), new FdkkMiniReqErrorCallback());
-        sceneInfoVO.setDataSync(dataSyncResult.getMsg());
-    }
+//    /**
+//     * <p>
+//     getInfo接口返回字段扩展
+//     * </p>
+//     * @author dengsixing
+//     * @date 2022/3/9
+//     **/
+//    private void setExtDataFromV3(SceneInfoVO sceneInfoVO, Long cameraId) throws Exception{
+//        if(Objects.isNull(cameraId)){
+//            return;
+//        }
+//        String url = fkankanMiniHost + URL_GET_DATASYNC_BY_CAMERAID + cameraId;
+//        Result<String> dataSyncResult = fdkankanMiniClient
+//            .getDataSyncType(url, new FdkkMiniReqSuccessCallback(), new FdkkMiniReqErrorCallback());
+//        sceneInfoVO.setDataSync(dataSyncResult.getMsg());
+//    }
 
     /**
      * <p>
@@ -492,23 +491,18 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
      * @date 2022/3/9
      **/
     private void setExtData(SceneInfoVO sceneInfoVO, Long cameraId) throws Exception{
-
-        ResultData<CameraDetail> cameraResultData = platformGoodsClient.getCameraDetailByCameraId(cameraId);
-        if(!cameraResultData.getSuccess()){
-            throw new Exception(ServerCode.FEIGN_REQUEST_FAILD.message());
+        if(Objects.isNull(cameraId)){
+            return;
         }
-        CameraDetail camera = cameraResultData.getData();
-        if(Objects.isNull(camera)){
+
+        CameraDetail cameraDetail = cameraDetailService.getByCameraId(cameraId);
+        if(Objects.isNull(cameraDetail)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_7010);
         }
-        if(Objects.isNull(camera.getCompanyId())){
+        if(Objects.isNull(cameraDetail.getCompanyId())){
             return;
         }
-        ResultData<Company> companyResultData = platformUserClient.getCompanyById(camera.getCompanyId());
-        if(!companyResultData.getSuccess()){
-            throw new Exception(ServerCode.FEIGN_REQUEST_FAILD.message());
-        }
-        Company company = companyResultData.getData();
+        Company company = companyService.getById(cameraDetail.getCompanyId());
         if(Objects.isNull(company)){
             return;
         }
@@ -526,32 +520,11 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
      **/
     private SceneInfoVO getSceneInfo4View(String num) throws Exception{
 
-        // TODO: 2022/5/19 请求v3的接口，获取场景的状态 待v3停机后要换成v4d的逻辑-------------------------start
-        String url = fkankanMiniHost + URL_GET_SCENEPRO_BY_NUM + num + "&addViewCount=yes";
-        Result<SceneProV3> result = fdkankanMiniClient
-            .getSceneProByNum(url, new FdkkMiniReqSuccessCallback(),
-                new FdkkMiniReqErrorCallback());
-        SceneProV3 sceneProV3 = result.getData();
-        if(sceneProV3 == null || sceneProV3.getId() == null){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
-        }
-        if(sceneProV3.getRecStatus().equals("I")){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5009);
-        }
-        if(SceneStatus.SUCCESS.code() != sceneProV3.getStatus()
-            && SceneStatus.NO_DISPLAY.code() != sceneProV3.getStatus()){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5033);
-        }
-        if(PayStatus.PAY.code() != sceneProV3.getPayStatus()){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5034);
-        }
-        // TODO: 2022/5/19 请求v3的接口，获取场景的状态 待v3停机后要换成v4d的逻辑-------------------------send
+        //校验场景是否为空、封存、计算中
+        ScenePlus scenePlus = scenePlusService.checkSceneAvail(num);
 
-//        ScenePro scenePro = sceneProService.findBySceneNum(num);
-        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
-        if(Objects.isNull(scenePlus)){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
-        }
+        //访问量+1
+        scenePlusService.updateViewCount(num);
 
         String key = String.format(RedisKey.SCENE_JSON, num);
         String sceneJson = redisUtil.get(key);
@@ -559,10 +532,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         //先查询redis
         if(StrUtil.isNotEmpty(sceneJson)) {
             sceneInfoVO = JSON.parseObject(sceneJson, SceneInfoVO.class);
-            // TODO: 2022/4/24 v3版本停机要切换---------------------------start
-//        this.setExtData(sceneInfoVO, scenePlus.getCameraId());
-            this.setExtDataFromV3(sceneInfoVO, scenePlus.getCameraId());
-            // TODO: 2022/4/24 v3版本停机要切换---------------------------end
+            this.setExtData(sceneInfoVO, scenePlus.getCameraId());
             sceneInfoVO.setScenePassword(null);
             if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){
                 sceneInfoVO.setFloorPlanAngle(0f);
@@ -579,10 +549,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         if(StrUtil.isEmpty(objectContent))
             return null;
         sceneInfoVO = JSON.parseObject(objectContent, SceneInfoVO.class);
-        // TODO: 2022/4/24 v3版本停机要切换---------------------------start
-//        this.setExtData(sceneInfoVO, scenePlus.getCameraId());
-        this.setExtDataFromV3(sceneInfoVO, scenePlus.getCameraId());
-        // TODO: 2022/4/24 v3版本停机要切换---------------------------end
+        this.setExtData(sceneInfoVO, scenePlus.getCameraId());
         if(Objects.isNull(sceneInfoVO.getFloorPlanAngle())){
             sceneInfoVO.setFloorPlanAngle(0f);
         }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fdkankan.scene.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -8,25 +9,32 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.constant.PayStatus;
-import com.fdkankan.common.constant.SceneStatus;
 import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.Result;
 import com.fdkankan.common.response.ResultData;
+import com.fdkankan.common.user.SSOUser;
+import com.fdkankan.common.util.DateExtUtil;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
 import com.fdkankan.platform.api.feign.PlatformGoodsClient;
 import com.fdkankan.platform.api.feign.PlatformUserClient;
-import com.fdkankan.scene.callback.FdkkMiniReqErrorCallback;
-import com.fdkankan.scene.callback.FdkkMiniReqSuccessCallback;
+import com.fdkankan.scene.entity.Camera;
+import com.fdkankan.scene.entity.CameraDetail;
+import com.fdkankan.scene.entity.SceneCooperation;
 import com.fdkankan.scene.entity.ScenePlus;
-import com.fdkankan.scene.entity.SceneProV3;
-import com.fdkankan.scene.httpclient.FdkankanMiniClient;
+import com.fdkankan.scene.entity.SceneResource;
+import com.fdkankan.scene.entity.User;
+import com.fdkankan.scene.entity.UserIncrement;
+import com.fdkankan.scene.service.ICameraDetailService;
+import com.fdkankan.scene.service.ICameraService;
+import com.fdkankan.scene.service.ISceneCooperationService;
 import com.fdkankan.scene.service.ISceneEditInfoExtService;
 import com.fdkankan.scene.service.ISceneEditInfoService;
 import com.fdkankan.scene.service.ISceneEditService;
 import com.fdkankan.scene.service.IScenePlusService;
+import com.fdkankan.scene.service.ISceneResourceService;
 import com.fdkankan.scene.service.ISceneUploadService;
+import com.fdkankan.scene.service.IUserIncrementService;
+import com.fdkankan.scene.service.IUserService;
 import com.fdkankan.scene.vo.BaseDataParamVO;
 import com.fdkankan.scene.vo.BaseSceneParamVO;
 import com.fdkankan.scene.vo.DeleteFileParamVO;
@@ -35,9 +43,10 @@ import com.fdkankan.scene.vo.SceneAuthVO;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -51,6 +60,7 @@ import org.springframework.stereotype.Service;
  * @author dengsixing
  * @since 2022/3/11
  **/
+@Slf4j
 @Service
 @RefreshScope
 public class SceneEditServiceImpl implements ISceneEditService {
@@ -78,96 +88,142 @@ public class SceneEditServiceImpl implements ISceneEditService {
     @Autowired
     private ISceneEditInfoExtService sceneEditInfoExtService;
     @Autowired
-    private FdkankanMiniClient fdkankanMiniClient;
+    private ICameraDetailService cameraDetailService;
+    @Autowired
+    private ICameraService cameraService;
+    @Autowired
+    private IUserIncrementService userIncrementService;
+    @Value("${expected.time}")
+    private String expectedTime;
+    @Autowired
+    private IUserService userService;
+    @Autowired
+    private ISceneCooperationService sceneCooperationService;
+    @Autowired
+    private ISceneResourceService sceneResourceService;
 
     @Override
-    public SceneAuthVO getAuth(String num, String token) throws Exception{
-
-        // TODO: 2022/5/19 请求v3的接口，获取场景的状态 待v3停机后要换成v4d的逻辑-------------------------start
-        String url = fkankanMiniHost + URL_GET_SCENEPRO_BY_NUM + num;
-        Result<SceneProV3> result = fdkankanMiniClient
-            .getSceneProByNum(url, new FdkkMiniReqSuccessCallback(),
-                new FdkkMiniReqErrorCallback());
-        SceneProV3 sceneProV3 = result.getData();
-        if(sceneProV3 == null || sceneProV3.getId() == null){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+    public SceneAuthVO getAuth(String num, SSOUser ssoUser) throws Exception{
+
+        // 解密获得username，用于和数据库进行对比
+        String username = ssoUser.getUserName();
+
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
+
+        SceneAuthVO sceneAuthVO = new SceneAuthVO();
+
+        List<SceneResource> exclude = new ArrayList<>();
+        SceneResource excludeEntity = new SceneResource();
+        excludeEntity.setKeyWord("data");
+        exclude.add(excludeEntity);
+
+        Camera camera = cameraService.findByChildName(username);
+        sceneAuthVO.setExclude(exclude);
+        sceneAuthVO.setInclude(new ArrayList<>());
+        sceneAuthVO.setCompany(null);
+
+        //判断该场景是否属于增值权益
+        boolean isVip = false;
+        //获取该相机是否有权益
+        boolean isExpired  = false;
+        Camera sceneCamera = cameraService.getById(scenePlus.getCameraId());
+        if(sceneCamera != null){
+            UserIncrement userIncrementEntity = userIncrementService.findByCameraId(sceneCamera.getId());
+
+            if(userIncrementEntity != null){
+                if( userIncrementEntity.getIsExpired().intValue() == 0){
+                    isVip = true;
+                }
+                if(userIncrementEntity.getIsExpired().intValue() == 1){
+                    isExpired  = true;
+                }
+            }else{
+                try {
+                    Date date = DateUtil.parse("2021-09-09 00:00:00", DateExtUtil.dateStyle);
+
+                    //非07批次的放开
+                    String pc = sceneCamera.getSnCode().substring(0,2);
+                    if(!pc.equals("07") ){
+                        if(sceneCamera.getCreateTime()!=null && date.after(sceneCamera.getCreateTime())){
+                            isVip = true;
+                            isExpired  = false;
+                        }
+                    }
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        sceneAuthVO.setIsExpired(isExpired);
+        sceneAuthVO.setIsVip(isVip);
+
+        //判断过期时间
+        Date date = DateUtil.parse(expectedTime, DateExtUtil.dateStyle);
+
+        if(camera != null){
+            if(!scenePlus.getCameraId().equals(camera.getId())){
+                throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
+            }
+
+            CameraDetail cameraDetailEntity = cameraDetailService.getByCameraId(camera.getId());
+            if(cameraDetailEntity.getCompanyId() != null){
+                if(cameraDetailEntity.getCompanyId().longValue() == 1 || cameraDetailEntity.getCompanyId().longValue() == 14){
+                    sceneAuthVO.setExclude(new ArrayList<>());
+                    sceneAuthVO.setCompany(cameraDetailEntity.getCompanyId());
+                }
+            }
+            return sceneAuthVO;
         }
-        if(sceneProV3.getRecStatus().equals("I")){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5009);
+
+        User user = userService.getByUserName(username);
+        if("18750226207".equals(username)){
+            log.info("18750226207该账号默认超级管理员，可以操作所有场景");
         }
-        if(SceneStatus.SUCCESS.code() != sceneProV3.getStatus()
-            && SceneStatus.NO_DISPLAY.code() != sceneProV3.getStatus()){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5033);
+        else if(user == null || scenePlus.getUserId() == null || user.getId().longValue() != scenePlus.getUserId().longValue()){
+            log.info("user:" + user.getId() + ",scene:" + scenePlus.getUserId());
+
+            List<SceneCooperation> list =
+                sceneCooperationService.list(
+                    new LambdaQueryWrapper<SceneCooperation>()
+                        .eq(SceneCooperation::getSceneNum, num));
+            if(list != null && list.size() > 0){
+                if(list.get(0).getUserId().longValue() != user.getId().longValue()){
+                    throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
+                }
+            }else {
+                throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
+            }
         }
-        if(PayStatus.PAY.code() != sceneProV3.getPayStatus()){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5034);
+
+        if(scenePlus.getCameraId() != null){
+            camera = cameraService.getById(scenePlus.getCameraId());
+            if(camera != null){
+                CameraDetail cameraDetail = cameraDetailService.getByCameraId(camera.getId());
+                if(cameraDetail.getCompanyId() != null){
+                    if(cameraDetail.getCompanyId().longValue() == 1 || cameraDetail.getCompanyId().longValue() == 14){
+                        sceneAuthVO.setExclude(new ArrayList<>());
+                        sceneAuthVO.setCompany(cameraDetail.getCompanyId());
+                    }
+                }
+            }
         }
-        // TODO: 2022/5/19 请求v3的接口，获取场景的状态 待v3停机后要换成v4d的逻辑-------------------------send
-
-        ScenePlus scenePlus = scenePlusService.getOne(
-            new LambdaQueryWrapper<ScenePlus>().eq(ScenePlus::getNum, num)
-                .eq(ScenePlus::getPayStatus, PayStatus.PAY.code()));
-//                .in(ScenePlus::getSceneStatus, SceneStatus.SUCCESS.code(), SceneStatus.NO_DISPLAY.code()));
-        if(scenePlus == null){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+
+        //权限控制完后判断若是协作账号，获取协作权限
+        SceneCooperation sceneCooperation = sceneCooperationService.getByNum(num);
+        //若数据为空表示可操作全部资源
+        if(sceneCooperation == null || sceneCooperation.getUserId().longValue() != ssoUser.getId().longValue()){
+            return sceneAuthVO;
         }
-        if(scenePlus.getSceneStatus() == SceneStatus.FAILD.code()
-            || scenePlus.getSceneStatus() == SceneStatus.wait.code()){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5033);
+
+        if(scenePlus.getUserId()!= null && sceneCooperation.getUserId()!= null &&
+            scenePlus.getUserId().equals(sceneCooperation.getUserId())){
+            return sceneAuthVO;
         }
-        //判断该场景是否属于增值权益
-        boolean isVip = false;
-        //获取该相机是否有权益
-        boolean isExpired  = false;
-//        ResultData<Camera> cameraResultData = platformGoodsClient.getCameraById(scenePlus.getCameraId());
-//        if(!cameraResultData.getSuccess()){
-//            throw new Exception(ServerCode.FEIGN_REQUEST_FAILD.message());
-//        }
-//        Camera camera = cameraResultData.getData();
-//        if(camera != null){
-//            ResultData<UserIncrement> incrementResultData = platformUserClient
-//                .getUserIncrementByCameraId(camera.getId());
-//            if(!incrementResultData.getSuccess()){
-//                throw new Exception(ServerCode.FEIGN_REQUEST_FAILD.message());
-//            }
-//            UserIncrement userIncrement = incrementResultData.getData();
-//            if(userIncrement != null){
-//                if( userIncrement.getIsExpired().intValue() == 0){
-//                    isVip = true;
-//                }
-//                if(userIncrement.getIsExpired().intValue() == 1){
-//                    isExpired  = true;
-//                }
-//            }else{
-//                Date date = DateUtil.parse("2021-09-09 00:00:00", DateExtUtil.dateStyle);
-//
-//                //非07批次的放开
-//                String pc = camera.getSnCode().substring(0,2);
-//                if(!pc.equals("07") ){
-//                    if(camera.getCreateTime()!=null && date.after(camera.getCreateTime())){
-//                        isVip = true;
-//                        isExpired  = false;
-//                    }
-//                }
-//            }
-//        }
-        // TODO: 2022/4/25 v3v4共存过渡期结束需要删除，恢复上面注释内容 ------------------------------------------start
-        url = fkankanMiniHost + URL_ISLOGIN + num;
-        Result<Map<String, Object>> isLoginResult = fdkankanMiniClient
-            .getIsLogin(url, token, new FdkkMiniReqSuccessCallback(),
-                new FdkkMiniReqErrorCallback());
-        Map<String, Object> data = isLoginResult.getData();
-        isVip = (boolean)data.get("isIncrement");
-        isExpired = (boolean)data.get("isExpired");
-        Integer company = data.get("company") == null ? null : (int)data.get("company");
-        // TODO: 2022/4/25 v3v4共存过渡期结束需要删除，恢复上面注释内容 ------------------------------------------end
-
-        return SceneAuthVO.builder()
-            .isExpired(isExpired).isVip(isVip)
-            .company(company)
-            .exclude(data.get("exclude"))
-            .include(data.get("include"))
-            .build();
+
+        sceneAuthVO.setInclude(sceneResourceService.findByCooperationId(sceneCooperation.getId()));
+
+        return sceneAuthVO;
     }
 
     @Override

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/ScenePlusServiceImpl.java

@@ -1,25 +1,51 @@
 package com.fdkankan.scene.service.impl;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.PayStatus;
+import com.fdkankan.common.constant.SceneStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
+import com.fdkankan.common.user.SSOUser;
+import com.fdkankan.common.util.DateExtUtil;
 import com.fdkankan.platform.api.feign.PlatformGoodsClient;
+import com.fdkankan.redis.constant.RedisKey;
+import com.fdkankan.redis.constant.RedisLockKey;
+import com.fdkankan.redis.util.RedisLockUtil;
+import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.scene.entity.Camera;
+import com.fdkankan.scene.entity.CameraDetail;
+import com.fdkankan.scene.entity.SceneCooperation;
 import com.fdkankan.scene.entity.SceneEditInfo;
 import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.entity.ScenePlusExt;
+import com.fdkankan.scene.entity.SceneResource;
+import com.fdkankan.scene.entity.User;
+import com.fdkankan.scene.entity.UserIncrement;
 import com.fdkankan.scene.mapper.IScenePlusMapper;
+import com.fdkankan.scene.service.ICameraDetailService;
+import com.fdkankan.scene.service.ICameraService;
+import com.fdkankan.scene.service.ISceneCooperationService;
 import com.fdkankan.scene.service.ISceneEditInfoService;
 import com.fdkankan.scene.service.IScenePlusExtService;
 import com.fdkankan.scene.service.IScenePlusService;
+import com.fdkankan.scene.service.ISceneResourceService;
+import com.fdkankan.scene.service.IUserIncrementService;
+import com.fdkankan.scene.service.IUserService;
 import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 /**
@@ -42,6 +68,10 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     private IScenePlusService scenePlusService;
     @Autowired
     ISceneEditInfoService sceneEditInfoService;
+    @Autowired
+    private RedisUtil redisUtil;
+    @Autowired
+    private RedisLockUtil redisLockUtil;
 
     @Override
     public ScenePlus getScenePlusByNum(String num) {
@@ -112,4 +142,50 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         return ResultData.ok();
 
     }
+
+    @Override
+    public ScenePlus checkSceneAvail(String num) {
+        ScenePlus scenePlus = this.getScenePlusByNum(num);
+        if(Objects.isNull(scenePlus)){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+        }
+        if(SceneStatus.SUCCESS.code().equals(scenePlus.getSceneStatus())
+            && SceneStatus.NO_DISPLAY.code().equals(scenePlus.getSceneStatus())){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5033);
+        }
+        if(PayStatus.PAY.code().equals(scenePlus.getPayStatus())){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5034);
+        }
+
+        return scenePlus;
+    }
+
+    @Override
+    public ResultData updateViewCount(String sceneNum) {
+        String key = RedisKey.SCENE_VISIT_CNT;
+        if(!redisUtil.hHasKey(key, sceneNum)){
+            String lockKey = String.format(RedisLockKey.LOCK_SCENE_VISIT_CNT, sceneNum);
+            boolean lock = redisLockUtil.lock(lockKey, RedisKey.EXPIRE_TIME_10_MINUTE);
+            if(!lock){
+                return ResultData.ok();
+            }
+            try {
+                String cnt = redisUtil.hget(key, sceneNum);
+                if(StrUtil.isEmpty(cnt)){
+                    //标记是否找到了场景，如果找到就不往下找
+                    Integer viewCount = null;
+                    ScenePlus scenePlus = scenePlusService.getScenePlusByNum(sceneNum);
+                    ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
+                    viewCount = scenePlusExt.getViewCount();
+                    redisUtil.hset(key,  sceneNum, Objects.isNull(viewCount) ? "0" : String.valueOf(viewCount));
+                }
+            }finally {
+                redisLockUtil.unlockLua(lockKey);
+            }
+        }
+        redisUtil.hincr(key, sceneNum, 1);
+        return ResultData.ok();
+    }
+
+
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneResourceCooperationServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.scene.service.impl;
+
+import com.fdkankan.scene.entity.SceneResourceCooperation;
+import com.fdkankan.scene.mapper.ISceneResourceCooperationMapper;
+import com.fdkankan.scene.service.ISceneResourceCooperationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 场景资源和协作用户关联表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@Service
+public class SceneResourceCooperationServiceImpl extends ServiceImpl<ISceneResourceCooperationMapper, SceneResourceCooperation> implements ISceneResourceCooperationService {
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneResourceServiceImpl.java

@@ -0,0 +1,50 @@
+package com.fdkankan.scene.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.scene.entity.SceneResource;
+import com.fdkankan.scene.entity.SceneResourceCooperation;
+import com.fdkankan.scene.mapper.ISceneResourceMapper;
+import com.fdkankan.scene.service.ISceneResourceCooperationService;
+import com.fdkankan.scene.service.ISceneResourceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 场景资源表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@Service
+public class SceneResourceServiceImpl extends ServiceImpl<ISceneResourceMapper, SceneResource> implements ISceneResourceService {
+
+    @Autowired
+    private ISceneResourceCooperationService sceneResourceCooperationService;
+
+    @Override
+    public List<SceneResource> findByCooperationId(Long sceneCooperationId) {
+
+        List<SceneResourceCooperation> sceneResourceCooperationList
+            = sceneResourceCooperationService.list(
+            new LambdaQueryWrapper<SceneResourceCooperation>()
+                .eq(SceneResourceCooperation::getSceneCooperationId, sceneCooperationId));
+
+        List<Long> sceneResourceIdList = null;
+        if(CollUtil.isNotEmpty(sceneResourceCooperationList)){
+            sceneResourceIdList = sceneResourceCooperationList.stream()
+                .map(sceneResourceCooperation -> sceneResourceCooperation.getSceneResourceId())
+                .collect(Collectors.toList());
+        }
+        if(CollUtil.isEmpty(sceneResourceIdList)){
+            return null;
+        }
+
+        return this.listByIds(sceneResourceIdList);
+    }
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneUploadServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.RecStatus;
 import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.constant.UploadFilePath;
@@ -100,11 +101,11 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
         }
 
         this.update(new LambdaUpdateWrapper<SceneUpload>()
-            .set(SceneUpload::getTbStatus, TbStatus.DELETE.code())
+            .set(SceneUpload::getRecStatus, RecStatus.DISABLE.code())
             .eq(SceneUpload::getNum, param.getNum())
             .eq(SceneUpload::getBizType, param.getBizType())
             .in(SceneUpload::getFilePath, filePaths)
-            .eq(SceneUpload::getTbStatus, TbStatus.VALID.code()));
+            .eq(SceneUpload::getRecStatus, RecStatus.VALID.code()));
 
         return ResultData.ok();
     }
@@ -160,7 +161,7 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
         LambdaQueryWrapper<SceneUpload> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SceneUpload::getNum,sceneCode)
                 .eq(SceneUpload::getBizType,blzType)
-                .eq(SceneUpload::getTbStatus,0);
+                .eq(SceneUpload::getRecStatus,RecStatus.VALID.code());
         List<SceneUpload> list = this.list(queryWrapper);
 
         if(list != null && list.size() >0){
@@ -176,7 +177,7 @@ public class SceneUploadServiceImpl extends ServiceImpl<ISceneUploadMapper, Scen
     }
 
     private void removeEntity(SceneUpload sceneUpload) {
-        sceneUpload.setTbStatus(1);
+        sceneUpload.setRecStatus(RecStatus.DISABLE.code());
         this.updateById(sceneUpload);
     }
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/UserIncrementServiceImpl.java

@@ -0,0 +1,25 @@
+package com.fdkankan.scene.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.scene.entity.UserIncrement;
+import com.fdkankan.scene.mapper.IUserIncrementMapper;
+import com.fdkankan.scene.service.IUserIncrementService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户增值权益表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@Service
+public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper, UserIncrement> implements IUserIncrementService {
+
+    @Override
+    public UserIncrement findByCameraId(Long cameraId) {
+        return this.getOne(new LambdaQueryWrapper<UserIncrement>().eq(UserIncrement::getCameraId, cameraId));
+    }
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/UserServiceImpl.java

@@ -0,0 +1,25 @@
+package com.fdkankan.scene.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.scene.entity.User;
+import com.fdkankan.scene.mapper.IUserMapper;
+import com.fdkankan.scene.service.IUserService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户信息表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-07-18
+ */
+@Service
+public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements IUserService {
+
+    @Override
+    public User getByUserName(String userName) {
+        return this.getOne(new LambdaQueryWrapper<User>().eq(User::getUserName, userName));
+    }
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SceneAuthVO.java

@@ -35,7 +35,7 @@ public class SceneAuthVO {
      */
     private boolean isVip;
 
-    private Integer company;
+    private Long company;
 
     private Object exclude;
 

4dkankan-center-scene/src/main/resources/mapper/scene/CameraDetailMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.scene.mapper.ICameraDetailMapper">
+
+</mapper>

4dkankan-center-scene/src/main/resources/mapper/scene/CameraMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.scene.mapper.ICameraMapper">
+
+</mapper>

4dkankan-center-scene/src/main/resources/mapper/scene/CompanyMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.scene.mapper.ICompanyMapper">
+
+</mapper>

4dkankan-center-scene/src/main/resources/mapper/scene/SceneCooperationMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.scene.mapper.ISceneCooperationMapper">
+
+</mapper>

4dkankan-center-scene/src/main/resources/mapper/scene/SceneResourceCooperationMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.scene.mapper.ISceneResourceCooperationMapper">
+
+</mapper>

4dkankan-center-scene/src/main/resources/mapper/scene/SceneResourceMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.scene.mapper.ISceneResourceMapper">
+
+</mapper>

4dkankan-center-scene/src/main/resources/mapper/scene/UserIncrementMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.scene.mapper.IUserIncrementMapper">
+
+</mapper>

4dkankan-center-scene/src/main/resources/mapper/scene/UserMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.scene.mapper.IUserMapper">
+
+</mapper>

4dkankan-common/src/main/java/com/fdkankan/common/controller/BaseController.java

@@ -46,6 +46,10 @@ public class BaseController {
         return null;
     }
 
+    protected SSOUser getSSOUser(){
+        return ssoLoginHelper.loginCheck(request.getHeader("token"));
+    }
+
     public static void output(HttpServletResponse resp, File file) {
         OutputStream os = null;
         BufferedInputStream bis = null;