修改计算逻辑

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

@@ -1,162 +0,0 @@
-package com.fdkankan.contro.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")
-public class Scene 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;
-
-    /**
-     * 0表示未建好，1表示建好，-1表示出错，-2表示不要在官网上显示
-     */
-    @TableField("scene_status")
-    private Integer sceneStatus;
-
-    /**
-     * 原始的大场景数据（七牛）
-     */
-    @TableField("data_source")
-    private String dataSource;
-
-    /**
-     * 用户表t_user的id
-     */
-    @TableField("user_id")
-    private Long userId;
-
-    /**
-     * 0表示未付款，1表示付款了，-1表示欠费
-     */
-    @TableField("pay_status")
-    private Integer payStatus;
-
-    /**
-     * 相机主表t_camera的id
-     */
-    @TableField("camera_id")
-    private Long cameraId;
-
-    /**
-     * 手机id
-     */
-    @TableField("phone_id")
-    private String phoneId;
-
-    /**
-     * 大场景序号
-     */
-    @TableField("num")
-    private String num;
-
-    /**
-     * 大场景的密钥
-     */
-    @TableField("scene_key")
-    private String sceneKey;
-
-    /**
-     * 0表示其他，1表示文博，2表示地产，3表示电商，4表示餐饮，5表示家居
-     */
-    @TableField("scene_type")
-    private Integer sceneType;
-
-    /**
-     * 1表示推荐，0表示正常
-     */
-    @TableField("recommend")
-    private Integer recommend;
-
-    /**
-     * 浏览次数
-     */
-    @TableField("view_count")
-    private Integer viewCount;
-
-    /**
-     * 版本
-     */
-    @TableField("version")
-    private Integer version;
-
-    /**
-     * 表示缩略图是否存在
-     */
-    @TableField("thumb_status")
-    private Integer thumbStatus;
-
-    /**
-     * 0表示默认，1表示自己上传
-     */
-    @TableField("floor_logo")
-    private String floorLogo;
-
-    /**
-     * 标记大小
-     */
-    @TableField("floor_logo_size")
-    private Integer floorLogoSize;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * A正常，I删除
-     */
-    @TableField("rec_status")
-    @TableLogic("A")
-    private String recStatus;
-
-
-}

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

@@ -1,168 +0,0 @@
-package com.fdkankan.contro.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;
-
-    /**
-     * A正常，I删除
-     */
-    @TableField("rec_status")
-    @TableLogic("A")
-    private String recStatus;
-
-
-}

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

@@ -1,138 +0,0 @@
-package com.fdkankan.contro.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")
-public class ScenePro 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;
-
-    /**
-     * 用户表t_user的id
-     */
-    @TableField("user_id")
-    private Long userId;
-
-    /**
-     * 相机主表t_camera的id
-     */
-    @TableField("camera_id")
-    private Long cameraId;
-
-    /**
-     * 场景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;
-
-    /**
-     * 点位视频
-     */
-    @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;
-
-    /**
-     * 0表示未付款，1表示付款了，-1表示欠费，-2表示容量不足
-     */
-    @TableField("pay_status")
-    private Integer payStatus;
-
-    /**
-     * 0表示未建好，1表示建好，-1表示出错，-2表示不要在官网上显示
-     */
-    @TableField("scene_status")
-    private Integer sceneStatus;
-
-    /**
-     * 算法类型（V2,V3）
-     */
-    @TableField("build_type")
-    private String buildType;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * A正常，I删除
-     */
-    @TableField("rec_status")
-    @TableLogic("A")
-    private String recStatus;
-
-
-}

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

@@ -1,168 +0,0 @@
-package com.fdkankan.contro.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;
-
-    /**
-     * A正常，I删除
-     */
-    @TableField("rec_status")
-    @TableLogic("A")
-    private String recStatus;
-
-
-}

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

@@ -1,168 +0,0 @@
-package com.fdkankan.contro.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;
-
-    /**
-     * A正常，I删除
-     */
-    @TableField("rec_status")
-    @TableLogic("A")
-    private String recStatus;
-
-
-}

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

@@ -1,153 +0,0 @@
-package com.fdkankan.contro.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;
-
-    /**
-     * A正常，I删除
-     */
-    @TableField("rec_status")
-    @TableLogic("A")
-    private String recStatus;
-
-
-}

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

@@ -1,18 +0,0 @@
-package com.fdkankan.contro.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.contro.entity.SceneExt;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 场景表 Mapper 接口
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-30
- */
-@Mapper
-public interface ISceneExtMapper extends BaseMapper<SceneExt> {
-
-}

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

@@ -1,17 +0,0 @@
-package com.fdkankan.contro.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.contro.entity.Scene;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 场景表 Mapper 接口
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Mapper
-public interface ISceneMapper extends BaseMapper<Scene> {
-}

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

@@ -1,23 +0,0 @@
-package com.fdkankan.contro.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.contro.entity.SceneProEditExt;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * pro场景编辑数据表 Mapper 接口
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Mapper
-public interface ISceneProEditExtMapper extends BaseMapper<SceneProEditExt> {
-
-    Integer selectCntDownloadNum();
-
-    void updateImageVersionByProEditId(@Param("proEditId") Long proEditId);
-
-}

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

@@ -1,18 +0,0 @@
-package com.fdkankan.contro.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.contro.entity.SceneProEdit;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * pro场景编辑数据表 Mapper 接口
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Mapper
-public interface ISceneProEditMapper extends BaseMapper<SceneProEdit> {
-
-}

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

@@ -1,19 +0,0 @@
-package com.fdkankan.contro.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.contro.entity.SceneProExt;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * pro场景表 Mapper 接口
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Mapper
-public interface ISceneProExtMapper extends BaseMapper<SceneProExt> {
-
-
-}

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

@@ -1,27 +0,0 @@
-package com.fdkankan.contro.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.contro.entity.ScenePro;
-import com.fdkankan.contro.entity.SceneProPO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * pro场景表 Mapper 接口
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Mapper
-public interface ISceneProMapper extends BaseMapper<ScenePro> {
-
-    @Select("select * from t_scene_pro t left join t_scene_plus_ext plusExt on t.id = plusExt.plus_id WHERE plusExt.data_source LIKE CONCAT('%',#{unicode},'%') AND t.rec_status = 'A' order by t.create_time desc LIMIT 1")
-    SceneProPO getSceneStatusByUnicode(@Param("unicode") String unicode);
-
-    @Select("select * from t_scene_pro t left join t_scene_plus_ext plusExt on t.id = plusExt.plus_id WHERE plusExt.data_source LIKE CONCAT('%',#{fileId},'%') AND t.rec_status = 'A' order by t.create_time desc LIMIT 1")
-    SceneProPO findByFileId(@Param("fileId") String fileId);
-}

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

@@ -1,16 +0,0 @@
-package com.fdkankan.contro.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.contro.entity.SceneExt;
-
-/**
- * <p>
- * 场景表 服务类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-30
- */
-public interface ISceneExtService extends IService<SceneExt> {
-
-}

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

@@ -1,18 +0,0 @@
-package com.fdkankan.contro.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.contro.entity.SceneProEditExt;
-
-/**
- * <p>
- * pro场景编辑数据表 服务类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-public interface ISceneProEditExtService extends IService<SceneProEditExt> {
-
-    SceneProEditExt getByProEditId(Long proEditId);
-
-}

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

@@ -1,18 +0,0 @@
-package com.fdkankan.contro.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.contro.entity.SceneProEdit;
-
-/**
- * <p>
- * pro场景编辑数据表 服务类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-public interface ISceneProEditService extends IService<SceneProEdit> {
-
-     SceneProEdit findByProId(Long proId);
-
-}

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

@@ -1,17 +0,0 @@
-package com.fdkankan.contro.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.contro.entity.SceneProExt;
-
-/**
- * <p>
- * pro场景表 服务类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-public interface ISceneProExtService extends IService<SceneProExt> {
-
-    SceneProExt findBySceneProId(Long sceneProId);
-}

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

@@ -1,29 +0,0 @@
-package com.fdkankan.contro.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.common.response.ResultData;
-import com.fdkankan.contro.entity.ScenePro;
-import com.fdkankan.contro.entity.SceneProPO;
-
-/**
- * <p>
- * pro场景表 服务类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-public interface ISceneProService extends IService<ScenePro> {
-
-    ScenePro findBySceneNum(String sceneNum);
-
-    void updateStatus(String sceneNum, int sceneStatus);
-
-    void updateTime(String sceneNum, Long space, int payStatus, String videos, long computeTime);
-
-    SceneProPO getSceneStatusByUnicode(String s);
-
-    ResultData rebuildReduceSpaceBySceneNum(String sceneNum) throws Exception;
-
-    SceneProPO findByFileId(String s);
-}

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

@@ -1,20 +0,0 @@
-package com.fdkankan.contro.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.contro.entity.Scene;
-
-/**
- * <p>
- * 场景表 服务类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-public interface ISceneService extends IService<Scene> {
-
-    void updateStatus(String sceneNum, int status);
-
-    void updateTime(String sceneNum, Long space, int payStatus);
-
-}

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

@@ -63,14 +63,8 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
     private String bucket;
 
     @Autowired
-    private ISceneService sceneService;
-    @Autowired
     private ISceneFileBuildService sceneFileBuildService;
     @Autowired
-    private ISceneProService sceneProService;
-    @Autowired
-    private ISceneProExtService sceneProExtService;
-    @Autowired
     private ICameraDetailService cameraDetailService;
     @Autowired
     private ISceneEditInfoService sceneEditInfoService;
@@ -109,11 +103,6 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
         try {
             if(!buildSuccess){//建模失败，修改状态为失败状态
                 log.info("建模失败，修改状态为失败状态");
-                // TODO: 2022/3/21 plus版本稳定后删除------------------------start
-                sceneService.updateStatus(sceneCode, SceneStatus.FAILD.code());
-                sceneProService.updateStatus(sceneCode, SceneStatus.FAILD.code());
-                // TODO: 2022/3/21 plus版本稳定后删除------------------------send
-
                 scenePlusService.update(
                     new LambdaUpdateWrapper<ScenePlus>()
                         .set(ScenePlus::getSceneStatus, SceneStatus.FAILD.code())
@@ -134,10 +123,6 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
             long space = this.calUseSpace(uploadFiles);
 
             if(cameraType < 3){
-                // TODO: 2022/3/21 plus版本稳定后删除------------------------start
-                sceneService.updateTime(sceneCode, space, payStatus);
-                // TODO: 2022/3/21 plus版本稳定后删除------------------------send
-
                 this.updateDb4Sm(sceneCode, space);
 
                 uploadToOssUtil.uploadMulFiles(uploadFiles);
@@ -148,20 +133,16 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
             JSONObject videosJson = this.getVideosJson(path, videoVersion, sceneCode, cameraType);
 
             //写入数据库
-            // TODO: 2022/3/21 plus版本稳定后删除------------------------start
-            ScenePro scenePro = this.updateDbPro(sceneCode, space, payStatus, videosJson.toJSONString(), computeTime, fileId);
-            SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
-            // TODO: 2022/3/21 plus版本稳定后删除------------------------send
             ScenePlus scenePlus = this.updateDbPlus(sceneCode, space, payStatus, videosJson.toJSONString(), computeTime, fileId);
             ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
 
             //变更容量，arrearCap为true时，代表容量不足
-            boolean arrearCap = this.updateSpace(scenePlus.getCameraId(), space, scenePlus.getId(), scenePro.getId());
+            boolean arrearCap = this.updateSpace(scenePlus.getCameraId(), space);
 
             //如果相机容量不足，需要把场景的paystatus改为容量不足状态
-            this.sealScene(arrearCap, scenePlus.getId(), scenePro.getId());
+            this.sealScene(arrearCap, scenePlus.getId(), scenePlus.getId());
 
-            Object[] editInfoArr = this.updateEditInfo(scenePro, scenePlus);
+            Object[] editInfoArr = this.updateEditInfo(scenePlus);
             SceneEditInfo sceneEditInfo = (SceneEditInfo)editInfoArr[0];
             SceneEditInfoExt sceneEditInfoExt = (SceneEditInfoExt)editInfoArr[1];
             SceneEditControls sceneEditControls = (SceneEditControls)editInfoArr[2];
@@ -206,7 +187,7 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
                 sceneEditInfo, sceneEditInfoExt, sceneEditControls, scenePlus, scenePlusExt, arrearCap);
 
             //计算成功，发短信
-            this.sendSms(pushChannel,pushToken, cameraType, scenePro.getSceneName(), scenePro.getWebSite());
+            this.sendSms(pushChannel,pushToken, cameraType, scenePlus.getTitle(), scenePlusExt.getWebSite());
 
             log.info("场景计算结果处理结束，场景码：{}", message.getSceneCode());
 
@@ -496,14 +477,6 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
             new LambdaUpdateWrapper<ScenePlus>()
                 .set(ScenePlus::getPayStatus, PayStatus.NO_CAPACITY.code())
                 .eq(ScenePlus::getId, scenePlusId));
-
-
-        // TODO: 2022/3/22 plus版本稳定后删除---------------------------start
-        sceneProService.update(
-            new LambdaUpdateWrapper<ScenePro>()
-                .set(ScenePro::getPayStatus, PayStatus.NO_CAPACITY.code())
-                .eq(ScenePro::getId, sceneProId));
-        // TODO: 2022/3/22 plus版本稳定后删除---------------------------end
     }
 
     /**
@@ -540,44 +513,6 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
                 .set(ScenePlusExt::getSpace, space));
     }
 
-    private ScenePro updateDbPro(String sceneCode, Long space, Integer payStatus, String videosJson, Long computeTime, String fileId) throws Exception{
-        ScenePro scenePro = sceneProService.findBySceneNum(sceneCode);
-
-        sceneProService.updateTime(sceneCode, space, payStatus, videosJson, computeTime);
-        SceneFileBuild sceneFileBuild = sceneFileBuildService.findByFileId(fileId);
-        if(sceneFileBuild != null){
-            sceneFileBuild.setBuildStatus(BuildStatus.success.code());
-            sceneFileBuildService.updateById(sceneFileBuild);
-        }
-
-        if(Objects.nonNull(scenePro)){
-            SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
-            SceneSource sceneSource = SceneSource.get(sceneProExt.getSceneSource());
-            switch (sceneSource){
-                case BM:
-                    sceneProExt.setSceneResolution(SceneResolution.TILES_2K.code());
-                    sceneProExt.setSceneFrom(SceneFrom.PRO.code());
-                    break;
-                case SM:
-                    sceneProExt.setSceneResolution(SceneResolution.TILES_1K.code());
-                    sceneProExt.setSceneFrom(SceneFrom.LITE.code());
-                    break;
-                case ZT:
-                    sceneProExt.setSceneResolution(SceneResolution.TILES_4K.code());
-                    sceneProExt.setSceneFrom(SceneFrom.MINION.code());
-                    break;
-                case JG:
-                    sceneProExt.setSceneResolution(SceneResolution.TILES_4K.code());
-                    sceneProExt.setSceneFrom(SceneFrom.LASER.code());
-                    break;
-            }
-            sceneProExtService.updateById(sceneProExt);
-
-        }
-
-        return scenePro;
-    }
-
     private ScenePlus updateDbPlus(String num, Long space, Integer payStatus, String videosJson, Long computeTime, String fileId) throws Exception{
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
@@ -636,7 +571,7 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
         return scenePlus;
     }
 
-    private boolean updateSpace(Long cameraId, Long space, Long scenePlusId, Long sceneProId) throws Exception{
+    private boolean updateSpace(Long cameraId, Long space) throws Exception{
         //更新相机使用用量
         CameraDetail cameraDetail = cameraDetailService.updateCameraDetailByCameraIdAndSpace(cameraId, space);
         UserIncrement userIncrement = userIncrementService.getByCameraId(cameraId);
@@ -649,14 +584,13 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
         return false;
     }
 
-    private Object[] updateEditInfo(ScenePro scenePro, ScenePlus scenePlus){
+    private Object[] updateEditInfo(ScenePlus scenePlus){
         SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
         SceneEditControls sceneEditControls = null;
         SceneEditInfoExt sceneEditInfoExt = null;
         if(sceneEditInfo == null){
             sceneEditInfo = new SceneEditInfo();
             sceneEditInfo.setScenePlusId(scenePlus.getId());
-            sceneEditInfo.setSceneProId(scenePro.getId());
             sceneEditInfo.setDescription(scenePlus.getDescription());
             sceneEditInfo.setTitle(scenePlus.getTitle());
             sceneEditInfoService.save(sceneEditInfo);
@@ -675,7 +609,6 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
         if(sceneEditInfoExt == null){
             sceneEditInfoExt = new SceneEditInfoExt();
             sceneEditInfoExt.setScenePlusId(scenePlus.getId());
-            sceneEditInfoExt.setSceneProId(scenePro.getId());
             sceneEditInfoExt.setEditInfoId(sceneEditInfo.getId());
             sceneEditInfoExtService.save(sceneEditInfoExt);
         }

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

@@ -1,20 +0,0 @@
-package com.fdkankan.contro.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.contro.entity.SceneExt;
-import com.fdkankan.contro.mapper.ISceneExtMapper;
-import com.fdkankan.contro.service.ISceneExtService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 场景表 服务实现类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-30
- */
-@Service
-public class SceneExtServiceImpl extends ServiceImpl<ISceneExtMapper, SceneExt> implements ISceneExtService {
-
-}

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

@@ -10,63 +10,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.common.constant.CameraConstant;
-import com.fdkankan.common.constant.CommonStatus;
-import com.fdkankan.common.constant.ConstantFilePath;
-import com.fdkankan.common.constant.ConstantUrl;
-import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.constant.RecStatus;
-import com.fdkankan.common.constant.SceneStatus;
-import com.fdkankan.common.constant.UploadFilePath;
-import com.fdkankan.common.constant.UploadStatus;
+import com.fdkankan.common.constant.*;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.common.util.ComputerUtil;
-import com.fdkankan.common.util.CreateObjUtil;
-import com.fdkankan.common.util.DateExtUtil;
-import com.fdkankan.common.util.FileMd5Util;
-import com.fdkankan.common.util.FileUpload;
-import com.fdkankan.common.util.FileUtil;
-import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.common.util.MatrixToImageWriterUtil;
-import com.fdkankan.common.util.RSAEncrypt;
-import com.fdkankan.common.util.SnowflakeIdGenerator;
+import com.fdkankan.common.util.*;
 import com.fdkankan.contro.config.FileRouteConfig;
-import com.fdkankan.contro.entity.Camera;
-import com.fdkankan.contro.entity.CameraDetail;
-import com.fdkankan.contro.entity.Company;
-import com.fdkankan.contro.entity.SSOUser;
-import com.fdkankan.contro.entity.SceneCooperation;
-import com.fdkankan.contro.entity.SceneEditControls;
-import com.fdkankan.contro.entity.SceneEditInfo;
-import com.fdkankan.contro.entity.SceneEditInfoExt;
-import com.fdkankan.contro.entity.SceneFileBuild;
-import com.fdkankan.contro.entity.SceneFileUpload;
-import com.fdkankan.contro.entity.ScenePlus;
-import com.fdkankan.contro.entity.ScenePlusExt;
-import com.fdkankan.contro.entity.SceneProPO;
-import com.fdkankan.contro.entity.SceneResourceCamera;
-import com.fdkankan.contro.entity.SceneResourceCooperation;
+import com.fdkankan.contro.entity.*;
 import com.fdkankan.contro.mapper.ISceneFileBuildMapper;
-import com.fdkankan.contro.service.ICameraDetailService;
-import com.fdkankan.contro.service.ICameraService;
-import com.fdkankan.contro.service.ICompanyService;
-import com.fdkankan.contro.service.IScene3dNumService;
-import com.fdkankan.contro.service.ISceneCooperationService;
-import com.fdkankan.contro.service.ISceneEditControlsService;
-import com.fdkankan.contro.service.ISceneEditInfoExtService;
-import com.fdkankan.contro.service.ISceneEditInfoService;
-import com.fdkankan.contro.service.ISceneFileBuildService;
-import com.fdkankan.contro.service.ISceneFileUploadService;
-import com.fdkankan.contro.service.IScenePlusExtService;
-import com.fdkankan.contro.service.IScenePlusService;
-import com.fdkankan.contro.service.ISceneProEditExtService;
-import com.fdkankan.contro.service.ISceneProEditService;
-import com.fdkankan.contro.service.ISceneProExtService;
-import com.fdkankan.contro.service.ISceneProService;
-import com.fdkankan.contro.service.ISceneResourceCameraService;
-import com.fdkankan.contro.service.ISceneResourceCooperationService;
-import com.fdkankan.contro.service.IUserService;
+import com.fdkankan.contro.service.*;
 import com.fdkankan.contro.vo.ResponseSceneFile;
 import com.fdkankan.contro.vo.ScenePlusVO;
 import com.fdkankan.fyun.constant.StorageType;
@@ -74,18 +25,6 @@ import com.fdkankan.fyun.oss.UploadToOssUtil;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.util.RedisUtil;
-import java.io.File;
-import java.io.IOException;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
@@ -95,6 +34,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.util.*;
+
 /**
  * <p>
  * 场景文件建模表 服务实现类
@@ -145,9 +89,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     private ISceneFileUploadService sceneFileUploadService;
 
     @Autowired
-    private ISceneProService sceneProService;
-
-    @Autowired
     private RedisUtil redisUtil;
 
     @Autowired
@@ -169,9 +110,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     private RabbitMqProducer rabbitMqProducer;
 
     @Autowired
-    private ISceneProEditService sceneProEditService;
-
-    @Autowired
     private ISceneEditInfoService sceneEditInfoService;
     @Autowired
     private ISceneEditControlsService sceneEditControlsService;
@@ -197,12 +135,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     @Autowired
     private ICompanyService companyService;
 
-    @Autowired
-    private ISceneProEditExtService sceneProEditExtService;
-
-    @Autowired
-    private ISceneProExtService sceneProExtService;
-
     @Override
     public SceneFileBuild findByFileId(String fileId) {
 
@@ -919,9 +851,10 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         Object folderNameObject = redisUtil.get(fileId);
         String folderName = folderNameObject == null ? null : (String)folderNameObject;
         if(StringUtils.isEmpty(folderName)){
-            SceneProPO sceneProPO = sceneProService.getSceneStatusByUnicode("/" + fileId + "/");
-            if(sceneProPO != null){
-                folderName = sceneProPO.getDataSource().substring(sceneProPO.getDataSource().lastIndexOf("/") + 1);
+            ScenePlus scenePlus = scenePlusService.getByFileId("/" + fileId + "/");
+            if(scenePlus != null){
+                ScenePlusExt plusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
+                folderName = plusExt.getDataSource().substring(plusExt.getDataSource().lastIndexOf("/") + 1);
             }
 
             if(StringUtils.isEmpty(folderName)){

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

@@ -1,43 +0,0 @@
-package com.fdkankan.contro.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.common.constant.TbStatus;
-import com.fdkankan.common.response.ResultData;
-import com.fdkankan.contro.entity.ScenePro;
-import com.fdkankan.contro.entity.SceneProEdit;
-import com.fdkankan.contro.entity.SceneProEditExt;
-import com.fdkankan.contro.mapper.ISceneProEditExtMapper;
-import com.fdkankan.contro.service.ISceneProEditExtService;
-import com.fdkankan.contro.service.ISceneProEditService;
-import com.fdkankan.contro.service.ISceneProService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * pro场景编辑数据表 服务实现类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Service
-public class SceneProEditExtServiceImpl extends ServiceImpl<ISceneProEditExtMapper, SceneProEditExt> implements ISceneProEditExtService {
-
-    @Autowired
-    private ISceneProService sceneProService;
-    @Autowired
-    private ISceneProEditService sceneProEditService;
-
-    @Override
-    public SceneProEditExt getByProEditId(Long proEditId) {
-        return this.getOne(new QueryWrapper<SceneProEditExt>().eq("pro_edit_id", proEditId));
-    }
-
-}

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

@@ -1,35 +0,0 @@
-package com.fdkankan.contro.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.common.constant.TbStatus;
-import com.fdkankan.contro.entity.SceneProEdit;
-import com.fdkankan.contro.mapper.ISceneProEditExtMapper;
-import com.fdkankan.contro.mapper.ISceneProEditMapper;
-import com.fdkankan.contro.service.ISceneProEditService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * pro场景编辑数据表 服务实现类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Service
-public class SceneProEditServiceImpl extends ServiceImpl<ISceneProEditMapper, SceneProEdit> implements ISceneProEditService {
-
-    @Autowired
-    private ISceneProEditExtMapper sceneProEditExtMapper;
-
-    @Override
-    public SceneProEdit findByProId(Long proId) {
-        return this.getOne(new QueryWrapper<SceneProEdit>()
-                            .eq("tb_status", TbStatus.VALID.code())
-                            .eq("pro_id", proId));
-
-    }
-
-}

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

@@ -1,24 +0,0 @@
-package com.fdkankan.contro.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.contro.entity.SceneProExt;
-import com.fdkankan.contro.mapper.ISceneProExtMapper;
-import com.fdkankan.contro.service.ISceneProExtService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * pro场景表 服务实现类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Service
-public class SceneProExtServiceImpl extends ServiceImpl<ISceneProExtMapper, SceneProExt> implements ISceneProExtService {
-    @Override
-    public SceneProExt findBySceneProId(Long sceneProId) {
-        return this.getOne(new LambdaQueryWrapper<SceneProExt>().eq(SceneProExt::getSceneProId, sceneProId));
-    }
-}

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

@@ -1,121 +0,0 @@
-package com.fdkankan.contro.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-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.SceneStatus;
-import com.fdkankan.common.response.ResultData;
-import com.fdkankan.contro.entity.ScenePro;
-import com.fdkankan.contro.entity.SceneProExt;
-import com.fdkankan.contro.entity.SceneProPO;
-import com.fdkankan.contro.mapper.ISceneProMapper;
-import com.fdkankan.contro.service.ICameraDetailService;
-import com.fdkankan.contro.service.ISceneProExtService;
-import com.fdkankan.contro.service.ISceneProService;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
-import java.util.Calendar;
-import java.util.List;
-import java.util.stream.Collectors;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * pro场景表 服务实现类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Slf4j
-@Service
-public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro> implements ISceneProService {
-
-    @Autowired
-    @Qualifier("uploadToOssUtil")
-    UploadToOssUtil uploadToOssUtil;
-    @Autowired
-    private ISceneProExtService sceneProExtService;
-
-    @Autowired
-    private ICameraDetailService cameraDetailService;
-
-    @Override
-    public ScenePro findBySceneNum(String sceneNum) {
-        return this.getOne(new LambdaQueryWrapper<ScenePro>()
-                .eq(ScenePro::getNum, sceneNum));
-    }
-
-
-    @Override
-    public void updateStatus(String sceneNum, int sceneStatus) {
-        this.update(new LambdaUpdateWrapper<ScenePro>()
-                .eq(ScenePro::getNum, sceneNum)
-                .set(ScenePro::getSceneStatus, sceneStatus));
-    }
-
-
-    @Override
-    public void updateTime(String sceneNum, Long space, int payStatus, String videos, long computeTime) {
-
-        List<ScenePro> list = this.list(new LambdaQueryWrapper<ScenePro>().eq(ScenePro::getNum, sceneNum));
-        if(CollUtil.isEmpty(list))
-            return;
-
-        //修改场景状态 空间 支付状态 计算时间
-        List<Long> sceneProIds = list.stream().map(scenePro -> {
-            return scenePro.getId();
-        }).collect(Collectors.toList());
-
-        this.update(new LambdaUpdateWrapper<ScenePro>()
-                .in(ScenePro::getId, sceneProIds)
-                .set(ScenePro::getSceneStatus, SceneStatus.NO_DISPLAY.code())
-                .set(ScenePro::getCreateTime, Calendar.getInstance().getTime())
-                .set(ScenePro::getUpdateTime, Calendar.getInstance().getTime())
-                .set(ScenePro::getPayStatus, payStatus)
-                .set(ScenePro::getVideos, videos));
-
-        sceneProExtService.update(new LambdaUpdateWrapper<SceneProExt>()
-                .in(SceneProExt::getSceneProId, sceneProIds)
-                .set(SceneProExt::getSpace, space)
-                .set(SceneProExt::getComputeTime, computeTime));
-    }
-
-    @Override
-    public SceneProPO getSceneStatusByUnicode(String unicode) {
-        return baseMapper.getSceneStatusByUnicode(unicode);
-    }
-
-    @Override
-    public ResultData rebuildReduceSpaceBySceneNum(String sceneNum) throws Exception{
-        ScenePro scenePro = this.findBySceneNum(sceneNum);
-        if(scenePro == null){
-            log.info("该场景不存在无法扣除容量，场景码为：" + sceneNum);
-            return ResultData.error(ErrorCode.FAILURE_CODE_5054);
-        }
-        if (scenePro.getSceneScheme() < 4){
-            log.info("该场景不属于八目相机无法扣除容量，场景码为：" + sceneNum);
-            return ResultData.error(ErrorCode.FAILURE_CODE_5055);
-        }
-        SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
-
-        cameraDetailService.updateCameraDetailByCameraIdAndSpace(scenePro.getCameraId(), -sceneProExt.getSpace());
-
-        sceneProExt.setSpace(Long.parseLong("0"));
-        sceneProExt.setUpdateTime(Calendar.getInstance().getTime());
-        sceneProExtService.updateById(sceneProExt);
-
-        return ResultData.ok();
-    }
-
-
-    @Override
-    public SceneProPO findByFileId(String fileId) {
-        return baseMapper.findByFileId(fileId);
-    }
-
-}

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

@@ -1,62 +0,0 @@
-package com.fdkankan.contro.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-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.SceneStatus;
-import com.fdkankan.contro.entity.Scene;
-import com.fdkankan.contro.entity.SceneExt;
-import com.fdkankan.contro.mapper.ISceneMapper;
-import com.fdkankan.contro.service.ISceneExtService;
-import com.fdkankan.contro.service.ISceneService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Calendar;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 场景表 服务实现类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Slf4j
-@Service
-public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implements ISceneService {
-
-    @Autowired
-    private ISceneExtService sceneExtService;
-
-    public void updateStatus(String sceneNum, int status) {
-        this.update(new LambdaUpdateWrapper<Scene>().eq(Scene::getNum, sceneNum).set(Scene::getSceneStatus, status));
-    }
-
-    @Override
-    public void updateTime(String sceneNum, Long space, int payStatus) {
-
-        List<Scene> sceneList = this.list(new LambdaQueryWrapper<Scene>()
-                .select(Scene::getId)
-                .eq(Scene::getNum, sceneNum));
-
-        if(CollUtil.isEmpty(sceneList))
-            return ;
-
-        List<Long> sceneIds = sceneList.stream().map(scene -> {
-            return scene.getId();
-        }).collect(Collectors.toList());
-
-        this.update(new LambdaUpdateWrapper<Scene>()
-                .in(Scene::getId, sceneIds)
-                .set(Scene::getCreateTime, Calendar.getInstance().getTime())
-                .set(Scene::getSceneStatus, SceneStatus.NO_DISPLAY.code()));
-
-        sceneExtService.update(new LambdaUpdateWrapper<SceneExt>().in(SceneExt::getSceneId, sceneIds).set(SceneExt::getSpace, space));
-    }
-
-}