去除无用代码

pom.xml

@@ -73,12 +73,6 @@
 
     <dependency>
       <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-utils-dingtalk</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fdkankan</groupId>
       <artifactId>4dkankan-common-web</artifactId>
       <version>3.0.0-SNAPSHOT</version>
     </dependency>
@@ -106,12 +100,6 @@
       <artifactId>lombok</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-utils-rubber-sheeting</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
-    </dependency>
-
     <!-- https://mvnrepository.com/artifact/com.alibaba.cloud/spring-cloud-starter-alibaba-nacos-discovery -->
     <dependency>
       <groupId>com.alibaba.cloud</groupId>
@@ -142,13 +130,7 @@
 
     <dependency>
       <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-utils-fyun-s3</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-utils-fyun-oss</artifactId>
+      <artifactId>4dkankan-utils-fyun-local</artifactId>
       <version>3.0.0-SNAPSHOT</version>
     </dependency>
 

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

@@ -1,93 +0,0 @@
-package com.fdkankan.contro.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 会员权益类型
- * </p>
- *
- * @author 
- * @since 2022-08-01
- */
-@Getter
-@Setter
-@TableName("t_increment_type")
-public class IncrementType implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 权益类型名称
-     */
-    @TableField("name")
-    private String name;
-
-    @TableField("type")
-    private String type;
-
-    /**
-     * 下载次数，-1代表无限次
-     */
-    @TableField("download_num")
-    private Integer downloadNum;
-    /**
-     * 下载次数，-1代表无限次
-     */
-    @TableField("download_price")
-    private BigDecimal downloadPrice;
-
-    /**
-     * 相机容量 单位 G
-     */
-    @TableField("camera_capacity")
-    private Integer cameraCapacity;
-
-    /**
-     * 购买之后，有效期天数，-1代表无限制
-     */
-    @TableField("valid_time")
-    private Integer validTime;
-
-    /**
-     * 0:年;1:月：2：日
-     */
-    @TableField("valid_time_type")
-    private Integer validTimeType;
-
-    /**
-     * 权益价格
-     */
-    @TableField("price")
-    private BigDecimal price;
-
-    /**
-     * 价格符号
-     */
-    @TableField("symbol")
-    private String symbol;
-
-    @TableField("create_time")
-    private String createTime;
-
-    @TableField("update_time")
-    private String updateTime;
-
-    @TableField("rec_status")
-    @TableLogic(value = "A",delval = "I")
-    private String recStatus;
-
-
-}

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

@@ -1,223 +0,0 @@
-package com.fdkankan.contro.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ScenePO {
-
-    private Long id;
-
-    /**
-     * 场景名称
-     */
-    private String sceneName;
-
-    /**
-     * 场景描述
-     */
-    private String sceneDec;
-
-    /**
-     * 场景的链接地址
-     */
-    private String webSite;
-
-    /**
-     * 场景缩略图
-     */
-    private String thumb;
-
-    /**
-     * 0表示未建好，1表示建好，-1表示出错，-2表示不要在官网上显示
-     */
-    private Integer sceneStatus;
-
-    /**
-     * 原始的大场景数据（七牛）
-     */
-    private String dataSource;
-
-    /**
-     * 用户表t_user的id
-     */
-    private Long userId;
-
-    /**
-     * 0表示未付款，1表示付款了，-1表示欠费
-     */
-    private Integer payStatus;
-
-    /**
-     * 相机主表t_camera的id
-     */
-    private Long cameraId;
-
-    /**
-     * 手机id
-     */
-    private String phoneId;
-
-    /**
-     * 大场景序号
-     */
-    private String num;
-
-    /**
-     * 大场景的密钥
-     */
-    private String sceneKey;
-
-    /**
-     * 0表示其他，1表示文博，2表示地产，3表示电商，4表示餐饮，5表示家居
-     */
-    private Integer sceneType;
-
-    /**
-     * 1表示推荐，0表示正常
-     */
-    private Integer recommend;
-
-    /**
-     * 浏览次数
-     */
-    private Integer viewCount;
-
-    /**
-     * 版本
-     */
-    private Integer version;
-
-    /**
-     * 表示缩略图是否存在
-     */
-    private Integer thumbStatus;
-
-    /**
-     * 0表示默认，1表示自己上传
-     */
-    private String floorLogo;
-
-    /**
-     * 标记大小
-     */
-    private Integer floorLogoSize;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 0-有效，1-删除
-     */
-    private Integer tbStatus;
-
-    private String hotsIds;
-
-    /**
-     * 表示初始点信息
-     */
-    private String entry;
-
-    /**
-     * 拍摄数量
-     */
-    private Integer shootCount;
-
-    /**
-     * 风格
-     */
-    private Integer style;
-
-    /**
-     * 要gps定位
-     */
-    private String gps;
-
-    /**
-     * 方案：1是双目，2是转台，3是六目,4是八目
-     */
-    private Integer sceneScheme;
-
-    /**
-     * 背景音乐名称
-     */
-    private String bgMusic;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    private String recStatus;
-
-    /**
-     * 普通录屏文件地址
-     */
-    private String screencapVoiceSrc;
-
-    /**
-     * 旧版录屏数据地址
-     */
-    private String screencapMusic;
-
-    /**
-     * 录屏文件个数
-     */
-    private Integer screencapLen;
-
-    /**
-     * 录音文件地址
-     */
-    private String screencapVoiceSound;
-
-    /**
-     * 选择的类型，sound为screencapVoiceSound，file为screencapVoiceSrc
-     */
-    private String screencapVoiceType;
-
-    /**
-     * 录屏文件地址
-     */
-    private String playData;
-
-    /**
-     * 算法类型
-     */
-    private String algorithm;
-
-    /**
-     * oss服务商
-     */
-    private String oss;
-
-    /**
-     * 重新建模的版本
-     */
-    private Integer floorEditVer;
-
-    /**
-     * 正式发布重新建模的版本
-     */
-    private Integer floorPublishVer;
-
-    /**
-     * 使用容量
-     */
-    private Long space;
-
-    /**
-     * 录屏图片存放文件
-     */
-    private String screencapThumb;
-
-}

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

@@ -1,235 +0,0 @@
-package com.fdkankan.contro.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * pro场景表
- * </p>
- *
- * @author 
- * @since 2022-07-04
- */
-@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;
-
-    /**
-     * 创建时间
-     */
-    @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;
-
-    /**
-     * 拍摄数量 ps:点位数量
-     */
-    @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: 禁用
-     */
-    @TableLogic(value = "A", delval = "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;
-
-    /**
-     * 是否已升级v4（0-否，1-是）
-     */
-    @TableField("is_upgrade")
-    private Integer isUpgrade;
-
-    /**
-     * 是否生成过OBJ
-     */
-    @TableField("is_obj")
-    private Integer isObj;
-}

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

@@ -1,285 +0,0 @@
-package com.fdkankan.contro.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * pro场景编辑数据表
- * </p>
- *
- * @author 
- * @since 2022-07-12
- */
-@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("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")
-    @TableLogic(value = "A",delval = "I")
-    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;
-
-
-}

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

@@ -1,185 +0,0 @@
-package com.fdkankan.contro.entity;
-
-import lombok.Data;
-import org.springframework.data.annotation.Transient;
-
-import java.util.Date;
-
-@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;
-
-}

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

@@ -1,80 +0,0 @@
-package com.fdkankan.contro.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 用户增值权益表
- * </p>
- *
- * @author 
- * @since 2021-12-24
- */
-@Getter
-@Setter
-@ToString
-@TableName("t_user_increment")
-public class UserIncrement implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-
-    /**
-     * 相机主表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;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 生效时间
-     */
-    @TableField("increment_start_time")
-    private Date incrementStartTime;
-
-
-    /**
-     * 0正常，1删除
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-}

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

@@ -1,27 +0,0 @@
-package com.fdkankan.contro.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.contro.entity.CameraSpace;
-import com.fdkankan.contro.vo.ResponseCameraSpace;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * <p>
- * 相机容量表 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2021-12-24
- */
-@Mapper
-public interface ICameraSpaceMapper extends BaseMapper<CameraSpace> {
-
-    @Select(" select s.id, s.space_end_time, c.child_name, s.space from t_camera_space s " +
-            "LEFT JOIN t_camera c on s.camera_id = c.id where s.rec_status = 'A' and " +
-            "s.space_type = 2 and s.camera_id = #{cameraId} and TIMESTAMPDIFF(MINUTE, NOW(), s.space_end_time) > -1 ORDER BY s.space_end_time ")
-    List<ResponseCameraSpace> getVoListByCameraId(@Param("cameraId")Long cameraId);
-}

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

@@ -1,18 +0,0 @@
-package com.fdkankan.contro.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.contro.entity.IncrementType;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 会员权益类型 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2022-08-01
- */
-@Mapper
-public interface IIncrementTypeMapper extends BaseMapper<IncrementType> {
-
-}

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

@@ -1,18 +0,0 @@
-package com.fdkankan.contro.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.contro.entity.Manager;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 管理员表 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2021-12-24
- */
-@Mapper
-public interface IManagerMapper extends BaseMapper<Manager> {
-
-}

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 
- * @since 2022-07-12
- */
-@Mapper
-public interface ISceneProEditMapper extends BaseMapper<SceneProEdit> {
-
-}

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

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

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

@@ -1,24 +0,0 @@
-package com.fdkankan.contro.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.contro.entity.UserIncrement;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-/**
- * <p>
- * 用户增值权益表 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2021-12-24
- */
-@Mapper
-public interface IUserIncrementMapper extends BaseMapper<UserIncrement> {
-
-    @Select("SELECT * FROM t_user_increment x LEFT JOIN t_camera c ON x.camera_id = c.id and c.rec_status = 'A' WHERE c.child_name = #{childName} AND x.rec_status = 'A' ")
-    List<UserIncrement> getByChildName(@Param("childName")String childName);
-}

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

@@ -18,7 +18,4 @@ import org.apache.ibatis.annotations.Param;
  */
 @Mapper
 public interface IUserMapper extends BaseMapper<User> {
-
-
-    Page<ResponseUser> getListByParam(Page<ResponseUser> page, @Param("param") RequestUser param);
 }

src/main/java/com/fdkankan/contro/mq/listener/BuildObjListener.java

@@ -1,66 +0,0 @@
-package com.fdkankan.contro.mq.listener;
-
-import com.fdkankan.contro.mq.service.impl.BuildObjServiceImpl;
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/4/19
- **/
-@Slf4j
-@Component
-public class BuildObjListener extends AbstrackBuildSceneListener {
-
-
-    @Value("${queue.modeling.obj.modeling-pre}")
-    private String queueObjModelingPre;
-    @Value("${queue.modeling.obj.modeling-post}")
-    private String queueObjModelingPost;
-
-    @Autowired
-    private BuildObjServiceImpl buildObjService;
-
-
-    /**
-     * 场景计算前置资源准备处理
-     *
-     * @param channel
-     * @param message
-     * @throws Exception
-     */
-    @RabbitListener(
-            queuesToDeclare = @Queue("${queue.modeling.obj.modeling-pre}"),
-            concurrency = "${maxThread.modeling.modeling-pre}"
-    )
-    public void buildObjScenePreHandler(Channel channel, Message message) throws Exception {
-        preHandle(channel, queueObjModelingPre, message, buildObjService);
-    }
-
-
-    /**
-     * 场景计算后置结果处理
-     *
-     * @param channel
-     * @param message
-     * @throws Exception
-     */
-    @RabbitListener(
-            queuesToDeclare = @Queue("${queue.modeling.obj.modeling-post}"),
-            concurrency = "${maxThread.modeling.modeling-post}"
-    )
-    public void buildObjScenePostHandler(Channel channel, Message message) throws Exception {
-        postHandle(channel, queueObjModelingPost, message, buildObjService);
-
-    }
-}

src/main/java/com/fdkankan/contro/mq/listener/BuildV3SceneListener.java

@@ -1,53 +0,0 @@
-package com.fdkankan.contro.mq.listener;
-
-import com.fdkankan.contro.mq.service.impl.BuildV3SceneServiceImpl;
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@Component
-public class BuildV3SceneListener extends AbstrackBuildSceneListener {
-
-    @Value("${queue.modeling.v3.modeling-pre}")
-    private String queueModelingPre;
-    @Value("${queue.modeling.v3.modeling-post}")
-    private String queueModelingPost;
-
-    @Autowired
-    private BuildV3SceneServiceImpl buildSceneService;
-
-    /**
-     * 场景计算前置资源准备处理
-     * @param channel
-     * @param message
-     * @throws Exception
-     */
-    @RabbitListener(
-            queuesToDeclare = @Queue("${queue.modeling.v3.modeling-pre}"),
-            concurrency = "${maxThread.modeling.modeling-pre}"
-    )
-    public void buildScenePreHandler(Channel channel, Message message) throws Exception {
-        preHandle(channel,queueModelingPre,message,buildSceneService);
-    }
-
-    /**
-     * 场景计算后置结果处理
-     * @param channel
-     * @param message
-     * @throws Exception
-     */
-    @RabbitListener(
-            queuesToDeclare = @Queue("${queue.modeling.v3.modeling-post}"),
-            concurrency = "${maxThread.modeling.modeling-post}"
-    )
-    public void buildScenePostHandler(Channel channel, Message message) throws Exception {
-        postHandle(channel,queueModelingPost,message,buildSceneService);
-
-    }
-}

src/main/java/com/fdkankan/contro/mq/listener/DingTalkMessageListener.java

@@ -1,47 +0,0 @@
-package com.fdkankan.contro.mq.listener;
-
-import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.contro.constant.DingTalkConst;
-import com.fdkankan.contro.service.IBuildSceneDTService;
-import com.fdkankan.rabbitmq.bean.BuildSceneFailDTMqMessage;
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.nio.charset.StandardCharsets;
-
-@Slf4j
-@Component
-public class DingTalkMessageListener {
-
-    @Value("${queue.modeling.modeling-dt}")
-    private String queueModelingDt;
-
-    @Autowired
-    private IBuildSceneDTService buildSceneDTService;
-
-    /**
-     * 场景计算发送钉钉消息
-     * @param channel
-     * @param message
-     * @throws Exception
-     */
-    @RabbitListener(
-            queuesToDeclare = @Queue("${queue.modeling.modeling-dt}"),
-            concurrency = "${maxThread.modeling.modeling-dt}"
-    )
-    public void buildSceneDTHandler(Channel channel, Message message) throws Exception {
-        String messageId = message.getMessageProperties().getMessageId();
-        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
-        log.info("发送钉钉消息处理，队列名：{}，id：{},消息体:{}", queueModelingDt, messageId, msg);
-        BuildSceneFailDTMqMessage dtMessage = JSONObject.parseObject(msg, BuildSceneFailDTMqMessage.class);
-        buildSceneDTService.handModelFail(dtMessage.getReason(), dtMessage.getServerPath(),
-                dtMessage.getNum(), dtMessage.getHostName());
-        channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-    }
-}

src/main/java/com/fdkankan/contro/mq/service/impl/BuildObjServiceImpl.java

@@ -1,205 +0,0 @@
-package com.fdkankan.contro.mq.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.contro.entity.ScenePlus;
-import com.fdkankan.contro.entity.ScenePro;
-import com.fdkankan.contro.mq.service.IBuildSceneService;
-import com.fdkankan.contro.service.IBuildSceneDTService;
-import com.fdkankan.contro.service.IFdkkLaserService;
-import com.fdkankan.contro.service.IScenePlusService;
-import com.fdkankan.contro.service.ISceneProService;
-import com.fdkankan.contro.service.impl.FdkkV4Service;
-import com.fdkankan.fyun.face.FYunFileServiceInterface;
-import com.fdkankan.model.constants.ConstantFileName;
-import com.fdkankan.model.constants.ConstantFilePath;
-import com.fdkankan.model.constants.UploadFilePath;
-import com.fdkankan.model.utils.CreateObjUtil;
-import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
-import com.fdkankan.rabbitmq.bean.BuildSceneResultMqMessage;
-import com.fdkankan.rabbitmq.util.RabbitMqProducer;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
-import java.io.File;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/3/1
- **/
-@Slf4j
-@Service
-public class BuildObjServiceImpl implements IBuildSceneService {
-
-    @Value("${queue.modeling.modeling-call}")
-    private String queueModelingCall;
-
-    @Value("${queue.modeling.obj.modeling-post}")
-    private String queueObjModelingPost;
-
-    @Autowired
-    private RabbitMqProducer mqProducer;
-
-    @Autowired
-    private FYunFileServiceInterface fYunFileService;
-
-    @Autowired
-    private ISceneProService sceneProService;
-
-    @Autowired
-    private IFdkkLaserService fdkkLaserService;
-
-    @Autowired
-    private FdkkV4Service fdkkV4Service;
-
-    @Autowired
-    private IBuildSceneDTService buildSceneDTService;
-
-    @Autowired
-    private IScenePlusService scenePlusService;
-
-    @Override
-    public void buildScenePre(BuildSceneCallMessage message) {
-        boolean success = false;
-        try {
-            String path = message.getPath();
-            //根据相机类型，组装资源路径
-            String laserObjFilePath = path + "_laser_obj";
-            log.info("开始准备生成OBJ场景资源,路径：{}", laserObjFilePath);
-
-            FileUtils.delAllFile(laserObjFilePath);
-
-            //获取解压后的资源的data.fdage中的数据
-            File folderPath = new File(path);
-            fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, "") + "/data.fdage", path + "/capture/");
-            JSONObject jsonObject = FileUtils.readJson(folderPath.getAbsolutePath() + File.separator + "capture" + File.separator + "data.fdage");
-            if(ObjectUtils.isEmpty(jsonObject)){
-                log.error("data.fdage文件不存在");
-                return ;
-            }
-            if (!jsonObject.containsKey("exportMeshObj") || jsonObject.getIntValue("exportMeshObj") != 1) {
-                // 写入data.fdage 防止重算
-                jsonObject.put("exportMeshObj", 1);
-                FileUtils.writeFile(folderPath.getAbsolutePath() + File.separator + "capture" + File.separator + "data.fdage", jsonObject.toJSONString());
-                fYunFileService.uploadFile(folderPath.getAbsolutePath() + File.separator + "capture" + File.separator + "data.fdage",
-                        ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, "") + "/data.fdage");
-            }
-            // 重新构造datafdage文件,添加生成obt文件选项
-            jsonObject.put("OnlyExportMeshObj",true);
-            FileUtils.writeFile(laserObjFilePath + File.separator + "capture" + File.separator + "data.fdage", jsonObject.toJSONString());
-
-            message.getBuildContext().put("previousPath",path);
-            message.setCameraType("14");
-            message.setResolution(jsonObject.getString("resolution"));
-            message.setPath(laserObjFilePath);
-            message.setResultReceiverMqName(queueObjModelingPost);
-
-            //下载资源到本地
-            this.downLoadSource(message, laserObjFilePath);
-
-            //发送mq，就进行计算
-            mqProducer.sendByWorkQueue(queueModelingCall, message);
-
-            success = true;
-
-            log.info("场景计算资源准备结束，场景码：{}", message.getSceneNum());
-
-        }catch (Exception e){
-            log.error("场景计算前置处理出错", e);
-        }finally {
-            //如果前置处理失败，发送钉钉消息
-            if(!success){
-                buildSceneDTService.handBaseFail("生成OBJ场景资源准备异常", message.getPath(), message.getSceneNum(), "计算控制服务器");
-            }
-
-        }
-    }
-
-    @Override
-    public void downLoadSource(BuildSceneCallMessage message,String path) throws Exception{
-
-        String prevoisPath = message.getBuildContext().get("previousPath").toString();
-        FileUtils.copyFile(prevoisPath + "/caches/reconstruction/final.bin", path + "/caches/reconstruction/final.bin", true);
-        FileUtils.copyFile(prevoisPath + "/caches/reconstruction/chunk.json", path + "/caches/reconstruction/chunk.json", true);
-        FileUtils.copyDirectiory(prevoisPath + "/caches/images", path + "/caches/images");
-
-        FileUtils.copyDirectiory(prevoisPath + "/caches/depthmap_csc", path + "/caches/depthmap_csc");
-        FileUtils.copyDirectiory(prevoisPath + "/caches/depthmap_vis", path + "/caches/depthmap_vis");
-        FileUtils.copyDirectiory(prevoisPath + "/caches/depthmap", path + "/caches/depthmap");
-        FileUtils.copyFile(prevoisPath + "/caches/panorama.json", path + "/caches/panorama.json", true);
-        FileUtils.copyFile(prevoisPath + "/results/laserData/laser.ply", path + "/results/laserData/laser.ply", true);
-    }
-
-    @Override
-    public void buildScenePost(BuildSceneResultMqMessage message) throws Exception {
-
-        if (!message.getBuildSuccess()) {
-            log.error("生成OBJ场景计算失败！");
-            // 发送钉钉消息，计算失败
-            buildSceneDTService.handModelFail("生成OBJ场景计算失败！", message.getPath(), message.getBuildContext().get("sceneNum").toString(), message.getHostName());
-            return;
-        }
-
-        String path = message.getPath();
-        String projectNum = message.getBuildContext().get("sceneNum").toString();
-
-        String laserObjFilePath = path;
-        CreateObjUtil.convertTxtToDam(laserObjFilePath + File.separator + "results" + File.separator + "tex" + File.separator + "modeldata.txt", laserObjFilePath + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam");
-        CreateObjUtil.convertDamToLzma(laserObjFilePath + File.separator + "results/");
-        CreateObjUtil.convertTxtToDam(laserObjFilePath + File.separator + "results" + File.separator + "tex" + File.separator + "modeldata.txt", laserObjFilePath + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam");
-        File file = new File(laserObjFilePath + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam.lzma");
-        while (!file.exists()) {
-            Thread.sleep(60000);
-        }
-
-        fYunFileService.uploadFile(laserObjFilePath + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam.lzma", String.format(UploadFilePath.IMG_VIEW_PATH,  projectNum) + ConstantFileName.modelUUID + "_50k.dam.lzma");
-        fYunFileService.uploadFile(laserObjFilePath + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam", String.format(UploadFilePath.IMG_VIEW_PATH,  projectNum) + ConstantFileName.modelUUID + "_50k.dam");
-
-        String texPath = laserObjFilePath + File.separator + "results" + File.separator + "tex";
-
-        File texFile = new File(texPath);
-        if(texFile.exists()){
-            for (File textureFile : texFile.listFiles()) {
-                if(textureFile.getName().endsWith(".jpg")){
-                    fYunFileService.uploadFile(textureFile.getAbsolutePath(),
-                            String.format(UploadFilePath.IMG_VIEW_PATH,  projectNum) + ConstantFileName.modelUUID + "_50k_texture_jpg_high1/"+textureFile.getName());
-                }
-            }
-        }
-
-        fYunFileService.uploadFile(laserObjFilePath + File.separator + "results" + File.separator + "tex/texture1.jpg",
-                String.format(UploadFilePath.IMG_VIEW_PATH,  projectNum) + "/" + ConstantFileName.modelUUID + "_50k_texture_jpg_high1/texture1.jpg");
-
-        // 拷贝结果
-        log.info("开始拷贝obj文件");
-        FileUtils.copyFolderAllFiles(laserObjFilePath + "/results/mesh", laserObjFilePath + "/laserData/mesh/", true);
-
-        File meshFolder = new File(laserObjFilePath + "/results/mesh");
-
-        for (File meshFile : meshFolder.listFiles()) {
-            fYunFileService.uploadFile(meshFile.getAbsolutePath(), String.format(UploadFilePath.DATA_VIEW_PATH,  projectNum) + "mesh/" + meshFile.getName());
-        }
-
-        fdkkLaserService.pushBuildStatusToLaserSystem(projectNum, laserObjFilePath + "/laserData/mesh");
-
-        LambdaUpdateWrapper<ScenePro> updateWrapper = new LambdaUpdateWrapper<ScenePro>()
-                .set(ScenePro::getStatus, -2).eq(ScenePro::getNum, projectNum);
-        sceneProService.update(updateWrapper);
-
-        LambdaUpdateWrapper<ScenePlus> plusUpdateWrapper = new LambdaUpdateWrapper<ScenePlus>()
-                .set(ScenePlus::getSceneStatus, -2).eq(ScenePlus::getNum, projectNum);
-        scenePlusService.update(plusUpdateWrapper);
-
-        // 如果未升级V4,则升级V4
-        fdkkV4Service.upgradeToV4(projectNum);
-    }
-
-}

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -97,20 +97,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     private ISceneEditInfoExtService sceneEditInfoExtService;
 
     @Autowired
-    private IUserIncrementService userIncrementService;
-
-    @Autowired
-    private IFdkkLaserService fdkkLaserService;
-
-
-    @Autowired
-    private IBuildSceneDTService buildSceneDTService;
-
-
-    @Autowired
-    private IIncrementTypeService incrementTypeService;
-
-    @Autowired
     private ICompanyService companyService;
 
     @Override
@@ -148,7 +134,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         }finally {
             //如果前置处理失败，发送钉钉消息
             if(!success){
-                buildSceneDTService.handBaseFail("场景计算资源准备异常！", message.getPath(), message.getSceneNum(), "计算控制服务器");
+
             }
 
         }
@@ -183,9 +169,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 scenePlusService.update(new LambdaUpdateWrapper<ScenePlus>()
                         .set(ScenePlus::getSceneStatus, SceneStatus.FAILD.code())
                         .eq(ScenePlus::getNum, sceneCode));
-
-                // 发送钉钉消息，计算失败
-                buildSceneDTService.handModelFail("计算失败", message.getPath(), sceneCode, message.getHostName());
                 return;
             }
             JSONObject fdageData = getFdageData(path + File.separator + "capture" +File.separator+"data.fdage");
@@ -272,8 +255,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 uploadFiles.entrySet().stream().filter(entry -> entry.getValue().contains(imagePath)).forEach(entry -> {
                     fYunFileService.uploadFile(entry.getKey(), entry.getValue().replace(imagePath, V3ImagePath));
                 });
-                //计算成功  激光转台相机 同步 请求
-                fdkkLaserService.syncBuildResult(scenePlus.getNum(), scenePlusExt.getDataSource(),scenePlus.getCreateTime());
             }
 
             CreateObjUtil.deleteFile(path.replace(ConstantFilePath.BUILD_MODEL_PATH, "/") + "/capture");
@@ -282,7 +263,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
         }catch (Exception e){
             e.printStackTrace();
-            buildSceneDTService.handBaseFail("场景计算结果处理出错！", message.getPath(), sceneCode, "计算控制服务器");
         }
     }
 
@@ -738,21 +718,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     }
 
     private int getPayStatus(Long cameraId, Long space){
-        //更新相机使用用量
-        CameraDetail cameraDetail = cameraDetailService.updateCameraDetailByCameraIdAndSpace(cameraId, space);
-        Long totalSpace = cameraDetail.getTotalSpace();
-
-        UserIncrement userIncrement = userIncrementService.getByCameraId(cameraId);
-        if(!ObjectUtils.isEmpty(userIncrement) && userIncrement.getIsExpired().equals(ExpiredStatus.NOT_EXPIRED.code())){
-            IncrementType type = incrementTypeService.getById(userIncrement.getIncrementTypeId());
-            if (ObjectUtils.isEmpty(type) || type.getType().equals("cn")) {
-                return PayStatus.PAY.code();
-            } else if (type.getType().equals("eur")) {
-                totalSpace = type.getCameraCapacity() * 1024 * 1024L;
-            }
-        }
-
-        return totalSpace.compareTo(cameraDetail.getUsedSpace()) == -1 ? PayStatus.NO_CAPACITY.code() : PayStatus.PAY.code();
+        return PayStatus.PAY.code();
     }
 
     private Object[] updateEditInfo(ScenePlus scenePlus){

src/main/java/com/fdkankan/contro/mq/service/impl/BuildV3SceneServiceImpl.java

@@ -1,635 +0,0 @@
-package com.fdkankan.contro.mq.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.file.FileNameUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.ZipUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.fdkankan.common.constant.ExpiredStatus;
-import com.fdkankan.common.constant.PayStatus;
-import com.fdkankan.common.constant.SceneStatus;
-import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.contro.entity.CameraDetail;
-import com.fdkankan.contro.entity.IncrementType;
-import com.fdkankan.contro.entity.ScenePro;
-import com.fdkankan.contro.entity.UserIncrement;
-import com.fdkankan.contro.mq.service.IBuildSceneService;
-import com.fdkankan.contro.service.*;
-import com.fdkankan.contro.service.impl.FdkkV4Service;
-import com.fdkankan.fyun.config.FYunFileConfig;
-import com.fdkankan.fyun.constant.FYunTypeEnum;
-import com.fdkankan.fyun.face.FYunFileServiceInterface;
-import com.fdkankan.model.constants.ConstantFileName;
-import com.fdkankan.model.constants.ConstantFilePath;
-import com.fdkankan.model.constants.UploadFilePath;
-import com.fdkankan.model.utils.CreateHouseJsonUtil;
-import com.fdkankan.model.utils.CreateObjUtil;
-import com.fdkankan.push.config.PushMessageConfig;
-import com.fdkankan.push.utils.PushMsgUtil;
-import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
-import com.fdkankan.rabbitmq.bean.BuildSceneResultMqMessage;
-import com.fdkankan.rabbitmq.util.RabbitMqProducer;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
-
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/4/20
- **/
-@Slf4j
-@Service
-public class BuildV3SceneServiceImpl implements IBuildSceneService {
-
-    @Value("${queue.modeling.modeling-call}")
-    private String queueModelingCall;
-
-    @Value("${queue.modeling.v3.modeling-post}")
-    private String queueV3ModelingPost;
-
-    @Value("${model.type:#{null}}")
-    private String modelSceneKind;
-
-    @Autowired
-    private RabbitMqProducer mqProducer;
-
-    @Autowired
-    private FYunFileServiceInterface fYunFileService;
-    @Autowired
-    private ICameraDetailService cameraDetailService;
-
-    @Autowired
-    private FYunFileConfig fYunFileConfig;
-
-    @Autowired
-    private ISceneProService sceneProService;
-
-    @Autowired
-    private IUserIncrementService userIncrementService;
-
-    @Autowired
-    private IFdkkLaserService fdkkLaserService;
-
-    @Autowired
-    private FdkkV4Service fdkkV4Service;
-
-    @Autowired
-    private IIncrementTypeService incrementTypeService;
-
-    @Autowired
-    private IBuildSceneDTService buildSceneDTService;
-
-    @Override
-    public void buildScenePre(BuildSceneCallMessage message) {
-        boolean success = false;
-        try {
-            //根据相机类型，组装资源路径
-            //下载资源到本地
-            this.downLoadSource(message, message.getPath());
-
-            if (!ObjectUtils.isEmpty(modelSceneKind)) {
-                // 修改dataFdage文件
-                JSONObject fdageJson = JSONObject.parseObject(FileUtils.readFile(message.getPath().concat("/capture/data.fdage")));
-                fdageJson.put("modelType", modelSceneKind);
-                FileUtils.writeFile(message.getPath().concat("/capture/data.fdage"), fdageJson.toJSONString());
-            }
-
-            message.getBuildContext().put("cameraType",message.getCameraType());
-
-            message.setResultReceiverMqName(queueV3ModelingPost);
-
-            //发送mq，就进行计算
-            mqProducer.sendByWorkQueue(queueModelingCall, message);
-
-            success = true;
-
-            log.info("场景计算资源准备结束，场景码：{}", message.getSceneNum());
-
-        }catch (Exception e){
-            log.error("场景计算前置处理出错", e);
-        }finally {
-            //如果前置处理失败，发送钉钉消息
-            if(!success){
-                buildSceneDTService.handBaseFail("场景计算资源准备异常！", message.getPath(), message.getSceneNum(), "计算控制服务器");
-            }
-
-        }
-    }
-
-    @Override
-    public void downLoadSource(BuildSceneCallMessage buildSceneMqMessage,String path){
-        String ossPath = ConstantFilePath.OSS_PREFIX
-                + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "")
-                .replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, "");
-        if (!ossPath.endsWith("/")) {
-            ossPath = ossPath.concat("/");
-        }
-        fYunFileService.downloadFileByCommand(path + File.separator + "capture", ossPath);
-    }
-
-
-    @Override
-    public void buildScenePost(BuildSceneResultMqMessage message) throws Exception {
-        Integer cameraType = Integer.parseInt(message.getBuildContext().get("cameraType").toString());
-        String sceneCode = message.getBuildContext().get("sceneNum").toString();
-        Long computeTime = message.getComputeTime();
-
-        String path = message.getPath();
-
-        Boolean buildSuccess = message.getBuildSuccess();
-        JSONObject fdageData = getFdageData(path + File.separator + "capture" +File.separator+"data.fdage");
-        Integer videoVersion = fdageData.getInteger("videoVersion");
-        try {
-            // 上传计算日志
-            //如果是重复计算，没有走到计算逻辑，不需要上传日志文件
-            log.info("开始上传计算日志");
-            String buildLogPath = String.format(UploadFilePath.BUILD_LOG_PATH, sceneCode);
-            fYunFileService.uploadFile(path + File.separator + "console.log", buildLogPath + "console.log");
-            log.info("计算日志上传完成");
-
-            if (!buildSuccess) {
-                log.error("建模失败，修改状态为失败状态");
-                sceneProService.update(new LambdaUpdateWrapper<ScenePro>()
-                        .set(ScenePro::getStatus, SceneStatus.FAILD.code())
-                        .eq(ScenePro::getNum, sceneCode));
-                // 发送钉钉消息，计算失败
-                buildSceneDTService.handModelFail("计算失败", message.getPath(), sceneCode, message.getHostName());
-                return;
-            }
-
-            Map<String, String> uploadFiles = getUploadFiles(path,cameraType,fdageData);
-
-            //建模成功走以下逻辑
-            log.info("cameraType:{}",cameraType);
-
-            //计算场景消耗磁盘空间
-            long space = this.calUseSpace(uploadFiles);
-
-            if(cameraType < 3){
-                this.updateDb4Sm(sceneCode, space);
-                fYunFileService.uploadMulFiles(uploadFiles);
-                return;
-            }
-
-            //读取计算结果文件生成videosJson
-            JSONObject videosJson = this.getVideosJson(path, videoVersion, sceneCode, cameraType);
-
-            //写入数据库
-            ScenePro scenePro = this.updateDbPlus(sceneCode, space, videosJson.toJSONString(), computeTime,fdageData.containsKey("exportMeshObj") && fdageData.getIntValue("exportMeshObj") == 1);
-
-            //变更容量，arrearCap为true时，代表容量不足
-            boolean arrearCap = this.updateSpace(scenePro.getCameraId(), space);
-
-            //如果相机容量不足，需要把场景的paystatus改为容量不足状态
-            if (arrearCap && cameraType != 14) {
-                scenePro.setPayStatus(PayStatus.NO_CAPACITY.code());
-                this.sealScene(arrearCap, scenePro.getId(), scenePro.getId());
-            }
-
-            //上传文件
-            log.info("开始上传场景计算结果数据，num:{}", sceneCode);
-            fYunFileService.uploadMulFiles(uploadFiles);
-
-            Map<String,String> damFileHeaders = new HashMap<>();
-            damFileHeaders.put("Content-Encoding","gzip");
-
-            if (!fYunFileService.getFyunType().equals(FYunTypeEnum.LOCAL.code())) {
-                // dam 文件设置请求头
-                uploadFiles.entrySet().stream().filter(entry -> FileNameUtil.extName(entry.getKey()).equals("dam"))
-                        .filter(entry -> new File(entry.getKey()).exists())
-                        .forEach(entry -> {
-                            // gzip压缩
-                            FileUtil.writeBytes(ZipUtil.gzip(new File(entry.getKey())), entry.getKey() + ".gzip");
-                            // 重命名
-                            FileUtil.rename(new File(entry.getKey() + ".gzip"), entry.getKey(), true);
-                            fYunFileService.uploadFile(entry.getKey(), entry.getValue(), damFileHeaders);
-                        });
-            }
-
-            //生成houseTypejson并上传
-            uploadFiles.entrySet().stream().filter(entry-> FileNameUtil.getName(entry.getKey()).equals("floorplan_cad.json"))
-                    .forEach(entry-> uploadHouseTypeJson(sceneCode,entry.getKey()));
-
-            //写scene.json
-            log.info("生成scene.json上传oss并设置缓存，num:{}", sceneCode);
-            this.writeSceneJson(sceneCode, videosJson,scenePro, arrearCap);
-
-            //计算成功，通知APP
-            Integer pushChannel = fdageData.getInteger("pushChannel");
-            String pushToken = fdageData.getString("pushToken");
-            this.pushMsgToApp(pushChannel,pushToken, cameraType, scenePro.getSceneName(), scenePro.getWebSite());
-
-            if (cameraType == 14) {
-                //计算成功  激光转台相机 同步 请求
-                fdkkLaserService.syncBuildResult(scenePro.getNum(), scenePro.getDataSource(),scenePro.getCreateTime());
-            }
-
-            CreateObjUtil.deleteFile(path.replace(ConstantFilePath.BUILD_MODEL_PATH, "/") + "/capture");
-
-            log.info("场景计算结果处理结束，场景码：{}", sceneCode);
-
-            // 判断是否升级V4
-            if(fdageData.containsKey("updateV4") && fdageData.getIntValue("updateV4") == 1){
-                fdkkV4Service.upgradeToV4(sceneCode);
-            }
-
-        }catch (Exception e){
-            e.printStackTrace();
-            buildSceneDTService.handBaseFail("场景计算结果处理出错！", message.getPath(), sceneCode, "计算控制服务器");
-        }
-    }
-
-    private Map<String, String> getUploadFiles(String path,Integer cameraType,JSONObject fdageData) throws Exception {
-        ScenePro scenePro = sceneProService.getOne(
-                new LambdaQueryWrapper<ScenePro>().like(ScenePro::getDataSource, path));
-        if (ObjectUtils.isEmpty(scenePro)) {
-            throw new Exception("未找到场景信息：" + path);
-        }
-
-        String projectNum = scenePro.getNum();
-
-
-        String dataViewPath = String.format(ConstantFilePath.DATA_PATH_FORMAT, projectNum);
-        String imagesPath = String.format(ConstantFilePath.IMAGE_PATH_FORMAT, projectNum);
-        String videoPath = String.format(ConstantFilePath.VIDEO_PATH_FORMAT, projectNum);
-        String resultsPath = path + File.separator + "results" + File.separator;
-
-        String uploadJsonPath = resultsPath + "upload.json";
-        String uploadData = FileUtils.readFile(uploadJsonPath);
-        log.info("upload.json 文件路径：{}, 内容：{}", uploadJsonPath, uploadData);
-        JSONArray array = JSONObject.parseObject(uploadData).getJSONArray("upload");
-
-
-        JSONObject fileJson = null;
-        String fileName = "";
-
-        Map<String, String> map = new HashMap();
-
-        for (int i = 0; i < array.size(); ++i) {
-            fileJson = array.getJSONObject(i);
-            fileName = fileJson.getString("file");
-            String filePath = resultsPath + fileName;
-
-            if (!(new File(filePath)).exists()) {
-                throw new Exception(filePath + "文件不存在");
-            }
-
-            if ("vision2.txt".equals(fileName)) {
-                CreateObjUtil.convertTxtToVisionmodeldata(resultsPath + "vision2.txt", resultsPath + "vision2.modeldata");
-                map.put(resultsPath + "vision2.modeldata", imagesPath + "vision2.modeldata");
-                map.put(resultsPath + "vision2.txt", imagesPath + "vision2.txt");
-            }
-
-            if (fileJson.getIntValue("clazz") == 2) {
-                map.put(filePath, imagesPath + ConstantFileName.modelUUID + "_50k_texture_jpg_high1/" + fileName.replace("tex/", ""));
-            } else if (fileJson.getIntValue("clazz") == 3) {
-                map.put(filePath, imagesPath + "pan/high/" + fileName.replace("high/", ""));
-            } else if (fileJson.getIntValue("clazz") == 4) {
-                map.put(filePath, imagesPath + "pan/low/" + fileName.replace("low/", ""));
-            } else if (fileJson.getIntValue("clazz") == 5) {
-                map.put(filePath, imagesPath + fileName);
-            } else if (fileJson.getIntValue("clazz") == 7) {
-                map.put(filePath, imagesPath + fileName);
-            } else if (fileJson.getIntValue("clazz") == 10) {
-                String updown = FileUtils.readFile(filePath);
-                JSONObject updownJson = JSONObject.parseObject(updown);
-                String mappingOssPath = String.format("scene_edit_data/%s/data/", projectNum) + fileName.replace("updown", "mapping");
-                map.put(filePath, mappingOssPath);
-            } else {
-                if (fileJson.getIntValue("clazz") == 11 || fileJson.getIntValue("clazz") == 12) {
-                    map.put(filePath, videoPath + fileName.replace("videos/", ""));
-                    if (fileName.contains(".mp4")) {
-                        map.put(resultsPath + fileName.replace("mp4", "flv"), videoPath + fileName.replace("videos/", "").replace("mp4", "flv"));
-                    }
-                }
-
-                if (fileJson.getIntValue("clazz") == 16) {
-                    map.put(filePath, dataViewPath + fileName);
-                }
-
-                if (fileJson.getIntValue("clazz") == 18) {
-                    map.put(filePath, imagesPath + fileName);
-                }
-            }
-        }
-
-
-        if ((fdageData.containsKey("exportMeshObj") && fdageData.getIntValue("exportMeshObj") == 1)
-                || (!ObjectUtils.isEmpty(cameraType) && (!cameraType.equals(14)))) {
-            CreateObjUtil.convertTxtToDam(path + File.separator + "results" + File.separator + "tex" + File.separator + "modeldata.txt", path + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam");
-            CreateObjUtil.convertDamToLzma(path + File.separator + "results/");
-            CreateObjUtil.convertTxtToDam(path + File.separator + "results" + File.separator + "tex" + File.separator + "modeldata.txt", path + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam");
-            map.put(path + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam.lzma", imagesPath + ConstantFileName.modelUUID + "_50k.dam.lzma");
-            map.put(path + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam", imagesPath + ConstantFileName.modelUUID + "_50k.dam");
-        }
-
-        CreateObjUtil.convertTxtToVisionmodeldata(resultsPath + "vision.txt", resultsPath + "vision.modeldata");
-        map.put(resultsPath + "vision.txt", imagesPath + "vision.txt");
-        map.put(resultsPath + "vision.modeldata", imagesPath + "vision.modeldata");
-
-        log.info("数据转换完成：" + projectNum);
-
-        FileUtil.touch("/mnt/4Dkankan/scene/data" + File.separator + "data" + projectNum);
-        map.put(resultsPath + "floorplan.json", dataViewPath + "floor.json");
-        map.put(resultsPath + "floorplan_cad.json", dataViewPath + "floorplan_cad.json");
-        map.put(path + File.separator + "capture/stitch_params.txt", dataViewPath + "stitch_params.txt");
-        map.put(path + File.separator + "capture/Up.xml", dataViewPath + "Up.xml");
-        map.put(path + File.separator + "capture/Up2.xml", dataViewPath + "Up2.xml");
-        map.put(path + File.separator + "capture/Up.txt", dataViewPath + "Up.txt");
-        map.put(path + File.separator + "capture/Up2.txt", dataViewPath + "Up2.txt");
-        return map;
-
-    }
-
-    private JSONObject getFdageData(String dataFdagePath) {
-        log.info("dataFdagePath 文件路径 ：{}", dataFdagePath);
-        String data = FileUtils.readFile(dataFdagePath);
-        //获取data.fdage的内容
-        JSONObject dataJson = new JSONObject();
-        if(data!=null){
-            dataJson = JSONObject.parseObject(data);
-        }
-        return dataJson;
-    }
-
-    private void writeSceneJson(String num, JSONObject videosJson, ScenePro scenePro,boolean arrearCap)  throws Exception{
-        String dataViewPath = String.format(ConstantFilePath.DATA_PATH_FORMAT, num);
-
-        String sceneJsonKey = dataViewPath + "scene.json";
-        boolean exist = fYunFileService.fileExist(sceneJsonKey);
-        //如果云端没有scene.json文件，生成一份
-        if(!exist){
-            JSONObject sceneJson = JSONObject.parseObject(JSONObject.toJSONString(scenePro));
-            sceneJson.put("videos",videosJson);
-            if(arrearCap) {
-                sceneJson.put("payStatus",PayStatus.NO_CAPACITY.code());
-            }
-            String sceneJsonStr = JSON.toJSONString(sceneJson);
-            //上传sceneJson文件
-            fYunFileService.uploadFile(sceneJsonStr.getBytes(), sceneJsonKey);
-        }
-        // 上传status JSON.
-
-        JSONObject statusJson = new JSONObject();
-        //临时将-2改成1，app还没完全更新
-        statusJson.put("status", 1);
-        statusJson.put("webSite", scenePro.getWebSite());
-        statusJson.put("sceneNum", num);
-        statusJson.put("thumb", scenePro.getThumb());
-        statusJson.put("payStatus", scenePro.getPayStatus());
-        FileUtils.writeFile(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json", statusJson.toString());
-
-        fYunFileService.uploadFile(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json",
-                dataViewPath + "status.json");
-    }
-
-    private void pushMsgToApp(Integer pushChannel, String pushToken, int cameraType, String sceneName, String webSite){
-        log.info("推送消息，渠道是 {}, 手机token是 {}", pushChannel, pushToken);
-        if(Objects.isNull(pushChannel) && StrUtil.isBlank(pushToken)){
-            return;
-        }
-
-        String title = sceneName + "计算完成";
-        String body = "您上传的" + sceneName + "计算完成，点击查看";
-
-        try{
-            if(FYunTypeEnum.AWS.code().equals(fYunFileService.getFyunType())){
-                PushMsgUtil.googlePushMsg(ConstantFilePath.BASE_PATH + "/refreshToken.json", pushToken,
-                        title, body , webSite);
-                return;
-            }
-
-            PushMessageConfig pushConfig = null;
-            if(pushChannel == 0){
-                if(cameraType == 10 || cameraType == 13){
-                    //ios
-                    pushConfig = new PushMessageConfig(PushMessageConfig.IOS_KEY_Z, PushMessageConfig.IOS_SECRET_Z);
-                    pushConfig.sendIOSUnicast(pushToken,  "四维看看Minion",title, body, webSite);
-                }else {
-                    //ios
-                    pushConfig = new PushMessageConfig(PushMessageConfig.IOS_KEY, PushMessageConfig.IOS_SECRET);
-                    pushConfig.sendIOSUnicast(pushToken, "四维看看Pro",title, body, webSite);
-                }
-            }else {
-                if(cameraType == 10 || cameraType == 13){
-                    //ios
-                    //安卓
-                    pushConfig = new PushMessageConfig(PushMessageConfig.ANDROID_KEY_Z, PushMessageConfig.ANDROID_SECRET_Z);
-                    pushConfig.sendAndroidUnicast2(pushToken, "四维看看Minion",title, body, webSite);
-                }else {
-                    //安卓
-                    pushConfig = new PushMessageConfig(PushMessageConfig.ANDROID_KEY, PushMessageConfig.ANDROID_SECRET);
-                    pushConfig.sendAndroidUnicast(pushToken, "四维看看Pro",title, body, webSite);
-                }
-            }
-            log.info("消息推送结束！");
-        }catch (Exception e){
-            log.error("推送消息失败：", e);
-        }
-    }
-
-    private void copyToEditDir(String num) throws IOException {
-
-        String editImagesPath = String.format(UploadFilePath.IMG_EDIT_PATH, num);
-        String viewImagesPath = String.format(UploadFilePath.IMG_VIEW_PATH, num);
-
-        String editDataPath = String.format(UploadFilePath.DATA_EDIT_PATH, num);
-        String viewDataPath = String.format(UploadFilePath.DATA_VIEW_PATH, num);
-
-        Map<String, String> map = new HashMap<>();
-        map.put(editImagesPath + "vision.modeldata", viewImagesPath + "vision.modeldata");
-        map.put(editImagesPath + "vision2.modeldata", viewImagesPath + "vision2.modeldata");
-        map.put(editDataPath + "floorplan_cad.json", viewDataPath + "floorplan_cad.json");
-
-        for (Entry<String, String> entry : map.entrySet()) {
-                fYunFileService.copyFileInBucket(entry.getValue(), entry.getKey());
-        }
-    }
-
-    private JSONObject getVideosJson(String path, Integer videoVersion, String projectNum, int cameraType) throws Exception {
-        //读取videos_hdr_param.json, 保存点位视频的value
-        Map<String, Object> videoMap = new HashMap<>();
-        String videosHdr = FileUtils.readFile(path + File.separator + "results/videos/videos_hdr_param.json");
-        JSONArray videoArray = null;
-        if(StringUtils.isNotEmpty(videosHdr)){
-            videoArray = JSONObject.parseObject(videosHdr).getJSONArray("hdr_param");
-        }
-        if(videoArray != null){
-            for(int i = 0, len = videoArray.size(); i < len; i++) {
-                videoMap.put(videoArray.getJSONObject(i).getString("name"), videoArray.getJSONObject(i).getString("value"));
-                if(videoArray.getJSONObject(i).containsKey("fov")){
-                    videoMap.put(videoArray.getJSONObject(i).getString("name") + "_fov", videoArray.getJSONObject(i).getString("fov"));
-                }
-            }
-        }
-
-        //获取upload中的video视频名称
-        String uploadData = FileUtils.readFile(path + File.separator + "results" +File.separator+"upload.json");
-        JSONObject uploadJson = null;
-        JSONArray array = null;
-        if(uploadData!=null) {
-            uploadJson = JSONObject.parseObject(uploadData);
-            array = uploadJson.getJSONArray("upload");
-        }
-        JSONObject fileJson = null;
-        String fileName = "";
-
-        //计算ts文件的大小，并拼接成json格式
-        JSONArray jsonArray = new JSONArray();
-        JSONObject videoJson = null;
-        JSONObject videosJson = new JSONObject();
-        long videoSize = 0L;
-        for(int i = 0, len = array.size(); i < len; i++) {
-            fileJson = array.getJSONObject(i);
-            fileName = fileJson.getString("file");
-            if(fileJson.getIntValue("clazz") == 11 && fileName.contains(".mp4") && !fileName.contains("-ios.mp4")){
-                videoJson = new JSONObject();
-                videoJson.put("id", fileName.substring(
-                    0, fileName.lastIndexOf(".")).replace("videos/", ""));
-
-                //如果ts文件存在，就计算ts大小
-                if(new File(path + File.separator + "results" +File.separator+ fileName.replace(".mp4", ".ts")).exists()){
-                    videoSize = new File(path + File.separator + "results" +File.separator+ fileName.replace(".mp4", ".ts")).length();
-                    videoJson.put("tsSize", videoSize);
-                }
-                if(videoMap.containsKey(videoJson.get("id"))){
-                    videoJson.put("value", videoMap.get(videoJson.get("id")));
-                }
-                if(videoMap.containsKey(videoJson.get("id") + "_fov")){
-                    videoJson.put("blend_fov", videoMap.get(videoJson.get("id") + "_fov"));
-                }else {
-                    videoJson.put("blend_fov", 7);
-                }
-                jsonArray.add(videoJson);
-            }
-        }
-
-        videosJson.put("data", jsonArray);
-        if(Objects.nonNull(videoVersion) && videoVersion >= 4){
-            videosJson.put("version", 3);
-            videosJson.put("upPath", fYunFileConfig.getHost() + String.format(ConstantFilePath.DATA_PATH_FORMAT, projectNum) + "Up.xml");
-            if(cameraType == 13){
-                //转台相机
-                videosJson.put("upPath", videosJson.getString("upPath").replace(".xml", ".txt"));
-            }
-        }else {
-            videosJson.put("version", 1);
-            videosJson.put("upPath", fYunFileConfig.getHost() + String.format(ConstantFilePath.DATA_PATH_FORMAT, projectNum) + "Up2.xml");
-            if(cameraType == 13){
-                //转台相机
-                videosJson.put("upPath", videosJson.getString("upPath").replace(".xml", ".txt"));
-            }
-        }
-
-        if(cameraType == 5 || cameraType == 6){
-            videosJson.put("version", 1);
-            videosJson.put("upPath", fYunFileConfig.getHost() + String.format(ConstantFilePath.DATA_PATH_FORMAT, projectNum) + "stitch_params.txt");
-        }
-
-        return videosJson;
-    }
-
-    private Long calUseSpace(Map<String, String> uploadFile) {
-        return uploadFile.keySet().stream().map(File::new).filter(File::exists).mapToLong(File::length).sum();
-    }
-
-    private void sealScene(boolean arrearCap, Long scenePlusId, Long sceneProId){
-        sceneProService.update(
-            new LambdaUpdateWrapper<ScenePro>()
-                .set(ScenePro::getPayStatus, PayStatus.NO_CAPACITY.code())
-                .eq(ScenePro::getId, scenePlusId));
-    }
-
-    /**
-     * <p>
-     双目场景更新数据库
-     * </p>
-     * @author dengsixing
-     * @date 2022/3/21
-     * @param num
-     * @param space
-     **/
-    private void updateDb4Sm(String num, long space){
-        List<ScenePro> ScenePlusList = sceneProService.list(
-            new LambdaQueryWrapper<ScenePro>().select(ScenePro::getId).eq(ScenePro::getNum, num));
-
-        if(CollUtil.isEmpty(ScenePlusList)){
-            return ;
-        }
-
-        List<Long> sceneIds = ScenePlusList.stream().map(ScenePro::getId).collect(Collectors.toList());
-
-        //更新场景创建时间
-        sceneProService.update(new LambdaUpdateWrapper<ScenePro>().in(ScenePro::getId, sceneIds)
-            .set(ScenePro::getStatus, SceneStatus.NO_DISPLAY.code())
-                .set(ScenePro::getSpace,space)
-                .set(ScenePro::getCreateTime,new Date())
-        );
-    }
-
-    private ScenePro updateDbPlus(String num, Long space, String videosJson, Long computeTime,boolean isObj){
-        ScenePro scenePro = sceneProService.getByNum(num);
-        if (ObjectUtils.isEmpty(scenePro)) {
-            return null;
-        }
-
-        sceneProService.update(new LambdaUpdateWrapper<ScenePro>()
-                .in(ScenePro::getId, scenePro.getId())
-                .set(ScenePro::getStatus, SceneStatus.NO_DISPLAY.code())
-                .set(ScenePro::getUpdateTime, new Date())
-                .set(ScenePro::getCreateTime, new Date())
-                .set(ScenePro::getSpace, space)
-                .set(ScenePro::getComputeTime, computeTime)
-                .set(ScenePro::getVideos, videosJson)
-                .set(ScenePro::getIsObj, isObj ? 1 : 0)
-                .set(ScenePro::getPayStatus, PayStatus.PAY.code()));
-
-        return scenePro;
-    }
-
-    private boolean updateSpace(Long cameraId, Long space) throws Exception{
-        //更新相机使用用量
-        CameraDetail cameraDetail = cameraDetailService.updateCameraDetailByCameraIdAndSpace(cameraId, space);
-        UserIncrement userIncrement = userIncrementService.getByCameraId(cameraId);
-
-        if(!ObjectUtils.isEmpty(userIncrement)){
-            IncrementType type = incrementTypeService.getById(userIncrement.getIncrementTypeId());
-            if(type.getType().equals("cn") && userIncrement.getIsExpired().equals(ExpiredStatus.NOT_EXPIRED.code())){
-                return false;
-            }
-        }
-
-        return cameraDetail.getTotalSpace().compareTo(cameraDetail.getUsedSpace()) == -1;
-    }
-
-    public void uploadHouseTypeJson(String num, String floorPlanCardFilePath) {
-        if (!new File(floorPlanCardFilePath).exists()) {
-            log.error("floorplan_cad.json 文件不存在，文件路径：{}", floorPlanCardFilePath);
-            return;
-        }
-        JSONObject json = CreateHouseJsonUtil.createHouseTypeJsonByCad(floorPlanCardFilePath);
-        String hourseTypeJsonPath = String.format(ConstantFilePath.DATA_PATH_FORMAT, num) + "houseType.json";
-        fYunFileService.uploadFile(json.toJSONString().getBytes(), hourseTypeJsonPath);
-        hourseTypeJsonPath = String.format(UploadFilePath.DATA_EDIT_PATH, num) + "houseType.json";
-        fYunFileService.uploadFile(json.toJSONString().getBytes(), hourseTypeJsonPath);
-    }
-}

src/main/java/com/fdkankan/contro/schedule/ScheduleJob.java

@@ -1,43 +0,0 @@
-package com.fdkankan.contro.schedule;
-
-import com.fdkankan.rabbitmq.util.RabbitMqProducer;
-import com.fdkankan.rubbersheeting.ScalingService;
-import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-@Log4j2
-@Component
-public class ScheduleJob {
-
-    @Value("${rocketmq.autoScaling.num.normal}")
-    private String baseNum;
-
-    @Autowired
-    private RabbitMqProducer rabbitMqProducer;
-
-    @Autowired
-    private ScalingService scalingService;
-
-    @Value("${queue.modeling.modeling-call}")
-    private String queueModelingCall;
-
-
-    @Scheduled(cron = "0 0/5 8-21 * * ? ")
-    public void job8() {
-        try {
-            //当mq排队数大于指定数量时使用弹性升缩
-            int mqNum = rabbitMqProducer.getMessageCount(queueModelingCall);
-            log.info("每5分钟查询一次排队队列,mqNum:" + mqNum);
-            if(mqNum - Integer.parseInt(baseNum) > 0){
-                log.info("使用弹性升缩开启一台ECS");
-                log.info(scalingService.createEcs());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error(e.getMessage());
-        }
-    }
-}

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

@@ -1,17 +0,0 @@
-package com.fdkankan.contro.service;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/3/1
- **/
-public interface IBuildSceneDTService {
-
-    void handModelFail(String reason, String serverPath, String num, String hostName);
-
-    void handBaseFail(String reason, String serverPath, String num, String hostName);
-
-}

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

@@ -2,8 +2,6 @@ package com.fdkankan.contro.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.contro.entity.CameraDetail;
-import com.fdkankan.contro.vo.RequestCamera;
-import com.fdkankan.contro.vo.ResponseCamera;
 
 /**
  * <p>

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

@@ -1,26 +0,0 @@
-package com.fdkankan.contro.service;
-
-import com.fdkankan.contro.entity.Camera;
-import com.fdkankan.contro.entity.ScenePlus;
-import com.fdkankan.contro.entity.ScenePlusExt;
-import com.fdkankan.contro.entity.ScenePro;
-
-import java.util.Date;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/1/14
- **/
-public interface IFdkkLaserService {
-    void syncBuildResult(String sceneNum, String dataSource, Date createTime);
-
-    void pushBuildStatusToLaserSystem(String projectNum, String laserObjFilePath);
-
-    void saveScene(ScenePlus scenePlus, String scenePassword, Camera cameraEntity, String userName, boolean b);
-
-    void saveScene(ScenePro scenePro, String scenePassword, Camera cameraEntity, String phone, boolean rebuild);
-}

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

@@ -1,18 +0,0 @@
-package com.fdkankan.contro.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.contro.entity.IncrementType;
-
-import java.util.List;
-
-/**
- * <p>
- * 会员权益类型 服务类
- * </p>
- *
- * @author 
- * @since 2022-08-01
- */
-public interface IIncrementTypeService extends IService<IncrementType> {
-
-}

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

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

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

@@ -1,18 +0,0 @@
-package com.fdkankan.contro.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.contro.entity.ScenePro;
-
-/**
- * <p>
- * pro场景表 服务类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-public interface ISceneProService extends IService<ScenePro> {
-
-    ScenePro getByNum(String num);
-
-}

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

@@ -1,21 +0,0 @@
-package com.fdkankan.contro.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.contro.entity.UserIncrement;
-
-import java.util.List;
-
-/**
- * <p>
- * 用户增值权益表 服务类
- * </p>
- *
- * @author 
- * @since 2021-12-24
- */
-public interface IUserIncrementService extends IService<UserIncrement> {
-
-    UserIncrement getByCameraId(Long cameraId);
-
-    List<UserIncrement> getByChildName(String childName);
-}

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

@@ -1,68 +0,0 @@
-package com.fdkankan.contro.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.fdkankan.contro.service.IBuildSceneDTService;
-import com.fdkankan.dingtalk.DingTalkSendUtils;
-import com.taobao.api.ApiException;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.io.UnsupportedEncodingException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.util.concurrent.CompletableFuture;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/4/20
- **/
-@Slf4j
-@Service
-public class BuildSceneDTServiceImpl implements IBuildSceneDTService {
-
-    public static final String DINGTALK_MSG_PATTERN = "**环境**: %s\n\n" +
-        "**服务器名称**: %s\n\n" +
-        "**失败原因**: %s\n\n" +
-        "**num**: %s\n\n" +
-        "**server-path**: %s\n\n";
-
-    public static final String contentExt = "**algorithm-log**: [https://4dkk.4dage.com/build_log/%s/console.log](https://4dkk.4dage.com/build_log/%s/console.log)";
-
-    @Autowired
-    private DingTalkSendUtils dingTalkSendUtils;
-
-    @Value("${main.url}")
-    private String mainUrl;
-
-    @Override
-    public void handModelFail(String reason, String serverPath, String num, String hostName) {
-        CompletableFuture.runAsync(() -> {
-            try {
-                String content = String.format(this.DINGTALK_MSG_PATTERN +  contentExt, this.mainUrl, hostName, reason, num, serverPath, num, num);
-                log.info("发送钉钉消息，content:{}", content);
-                dingTalkSendUtils.sendActioncardMsgToDingRobot(content,"场景计算失败");
-            } catch (ApiException | UnsupportedEncodingException | NoSuchAlgorithmException | InvalidKeyException apiException) {
-                log.error("发送钉钉消息失败", apiException);
-            }
-        });
-    }
-
-    @Override
-    public void handBaseFail(String reason, String serverPath, String num, String hostName) {
-        CompletableFuture.runAsync(() -> {
-            try {
-                String content = String.format(this.DINGTALK_MSG_PATTERN, this.mainUrl, hostName, reason, num, serverPath);
-                log.info("发送钉钉消息，content:{}", content);
-                dingTalkSendUtils.sendActioncardMsgToDingRobot(content,"场景计算失败");
-            } catch (ApiException | UnsupportedEncodingException | NoSuchAlgorithmException | InvalidKeyException apiException) {
-                log.error("发送钉钉消息失败", apiException);
-            }
-        });
-    }
-}

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

@@ -1,71 +0,0 @@
-package com.fdkankan.contro.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.fdkankan.contro.common.Result;
-import com.fdkankan.contro.entity.ScenePro;
-import com.fdkankan.contro.service.ISceneProService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.client.RestTemplate;
-
-@Service
-public class FdkkV4Service {
-    private static final Logger log = LoggerFactory.getLogger(FdkkV4Service.class);
-
-    private final String UPGRADE_TO_V4="/api/user/scene/upgradeToV4?num=%s";
-
-    @Value("${main.url}")
-    private String mainUrl;
-
-    private RestTemplate restTemplate = new RestTemplate();
-
-    @Autowired
-    private ISceneProService sceneProService;
-
-    /**
-     * 场景升级
-     * @param num  场景码
-     * @return
-     * @throws Exception
-     */
-    public void upgradeToV4(String num){
-        // 如果场景在旧表中存在，则需要升级，否则不需要升级
-        ScenePro scenePro = sceneProService.getByNum(num);
-        if(ObjectUtils.isEmpty(scenePro)){
-            log.error("scene_pro 表中不存在该记录，退出升级!");
-            return;
-        }
-
-        String url = mainUrl + String.format(UPGRADE_TO_V4,num);
-        log.info("v3场景升级v4，url:{}",url);
-        ResponseEntity<Result> responseEntity = restTemplate.getForEntity(url, Result.class);
-        log.info("v3场景升级v4，url:{},结果,{}",url, JSONObject.toJSONString(responseEntity.getBody()));
-        if(responseEntity.getStatusCode() != HttpStatus.OK){
-            log.error("场景升级失败，请稍后再试！");
-        }
-        Integer code = responseEntity.getBody().getCode();
-        if(code != 0){
-            String msg = "场景升级失败，请稍后再试！";
-            if(code == 7019){
-                msg = "场景升级中，请勿重复升级";
-            }else if(code == 7020){
-                msg = "场景已升级，不能重复升级";
-            }
-            log.error(msg);
-            return;
-        }
-
-        //修改场景状态为升级中
-        LambdaUpdateWrapper<ScenePro> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.set(ScenePro::getStatus,0).set(ScenePro::getIsUpgrade,2).eq(ScenePro::getNum,num);
-        sceneProService.update(wrapper);
-    }
-
-}

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

@@ -1,175 +0,0 @@
-package com.fdkankan.contro.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.util.DateUtil;
-import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.contro.entity.Camera;
-import com.fdkankan.contro.entity.ScenePlus;
-import com.fdkankan.contro.entity.ScenePro;
-import com.fdkankan.contro.service.IFdkkLaserService;
-import com.fdkankan.contro.service.IScenePlusService;
-import com.fdkankan.contro.service.ISceneProService;
-import com.fdkankan.web.response.Result;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.client.RestTemplate;
-
-import java.io.File;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-@Service
-@Slf4j
-public class IFdkkLaserServiceImpl implements IFdkkLaserService {
-
-    private final String SAVE_SCENE_URL_TEMPLATE = "/laser/init/%s/saveOrEdit";
-    private final String EDIT_LASER_BUILD_STATUS_URL = "/laser/4dage/scene/editBuildStatus";
-    private final String ENABLE_COOPERATION_CAMERA_URL = "/laser/4dage/scene/cooperation/cameraSave";
-
-    @Value("${4dkk.laserService.host}")
-    private String laserHost;
-
-    private RestTemplate restTemplate = new RestTemplate();
-
-    @Autowired
-    private ISceneProService sceneProService;
-
-    @Autowired
-    private IScenePlusService scenePlusService;
-
-    public void updateSceneStatus(String sceneCode, int sceneStatus, String path, Date createTime) {
-        String url = laserHost + String.format(SAVE_SCENE_URL_TEMPLATE, sceneCode);
-        Map<String, Object> params = new HashMap<>();
-        params.put("sceneCode", sceneCode);
-        params.put("status", sceneStatus);
-        params.put("version",getSceneVersion(sceneCode));
-        params.put("createTime", DateUtil.date2String(createTime, null));
-        if (!ObjectUtils.isEmpty(path)) {
-            params.put("path", path);
-        }
-        log.info("自研激光转台相机同步，url:{},params:{}", url, JSONObject.toJSONString(params));
-        ResponseEntity<Result> responseEntity = restTemplate.postForEntity(url, params, Result.class);
-        log.info("自研激光转台相机同步，url:{},params:{},结果:{}", url, JSONObject.toJSONString(params), JSONObject.toJSONString(responseEntity.getBody()));
-        if (responseEntity.getStatusCode() != HttpStatus.OK || responseEntity.getBody().getCode() != HttpStatus.OK.value()) {
-            log.error("激光场景状态同步失败!");
-        }
-    }
-
-    public void syncBuildResult(String sceneNum, String dataSource,Date createTime) {
-        log.info("激光转台相机构建结果 同步 请求 ");
-        try {
-            String jgPath = dataSource;
-            //创建目录
-            if (dataSource.lastIndexOf("/") != -1) {
-                jgPath = jgPath + "_laserData";
-            } else {
-                jgPath = jgPath.substring(0, jgPath.length() - 1) + "_laserData";
-            }
-
-            FileUtils.createDir(jgPath + "/extras");
-
-            log.info("生成 激光相机目录 " + jgPath);
-            //生成data.json
-            JSONObject jgDataJson = new JSONObject();
-            jgDataJson.put("split_type", "SPLIT_V15");
-            jgDataJson.put("skybox_type", "SKYBOX_V5");
-            jgDataJson.put("extras", null);
-            FileUtils.writeFile(jgPath + File.separator + "data.json", jgDataJson.toString());
-
-            // result/mesh/mesh.obj  --> jgPath/laserData/laser.obj
-            log.info("开始拷贝obj文件");
-            FileUtils.copyDirectiory(dataSource + "/results/mesh", jgPath + "/laserData/mesh");
-
-            FileUtils.copyDirectiory(dataSource + "/results/laserData/cover", jgPath + "/extras");
-            FileUtils.copyFile(dataSource + "/results/laserData", jgPath, true);
-
-            updateSceneStatus(sceneNum, 2, jgPath + File.separator + "laserData",createTime);
-        } catch (Exception e) {
-            log.error("激光转台相机同步失败", e);
-        }
-    }
-
-    @Override
-    public void pushBuildStatusToLaserSystem(String projectNum, String laserObjFilePath) {
-        String url = laserHost + EDIT_LASER_BUILD_STATUS_URL;
-        Map<String, String> params = new HashMap<>();
-        params.put("sceneCode", projectNum);
-        params.put("objPath", laserObjFilePath);
-        log.info("激光系统同步BuildStatus，url:{},params:{}", ENABLE_COOPERATION_CAMERA_URL, JSONObject.toJSONString(params));
-        ResponseEntity<com.fdkankan.contro.common.Result> responseEntity = restTemplate.postForEntity(url, params, com.fdkankan.contro.common.Result.class);
-        log.info("激光系统同步BuildStatus，url:{},params:{},结果:{}", url, JSONObject.toJSONString(params), JSONObject.toJSONString(responseEntity.getBody()));
-        if (responseEntity.getStatusCode() != HttpStatus.OK || responseEntity.getBody().getCode() != HttpStatus.OK.value()) {
-            log.error("激光系统同步BuildStatus");
-        }
-    }
-
-
-    public void saveScene(ScenePlus scenePlus, String scenePassword, Camera cameraEntity, String phone, boolean rebuild) {
-        String url = laserHost + String.format(SAVE_SCENE_URL_TEMPLATE, scenePlus.getNum());
-        Map<String, Object> params = new HashMap<>();
-        params.put("childName", cameraEntity.getChildName());
-        params.put("createTime", DateUtil.date2String(scenePlus.getCreateTime(), null));
-        params.put("phone", phone);
-        params.put("sceneCode", scenePlus.getNum());
-        params.put("snCode", cameraEntity.getSnCode());
-        params.put("status", scenePlus.getSceneStatus());
-        if (!rebuild) {
-            params.put("password", scenePassword);
-        } else {
-            params.put("status", 4);
-        }
-        params.put("version",getSceneVersion(scenePlus.getNum()));
-        params.put("title", scenePlus.getTitle());
-        params.put("userId", scenePlus.getUserId());
-        log.info("自研激光转台相机同步，url:{},params:{}", url, JSONObject.toJSONString(params));
-        ResponseEntity<Result> responseEntity = restTemplate.postForEntity(url, params, Result.class);
-        log.info("自研激光转台相机同步，url:{},params:{},结果,{}", url, JSONObject.toJSONString(params), JSONObject.toJSONString(responseEntity.getBody()));
-        if (responseEntity.getStatusCode() != HttpStatus.OK || responseEntity.getBody().getCode() != HttpStatus.OK.value()) {
-            log.error("激光场景状态同步失败!");
-        }
-    }
-
-    public void saveScene(ScenePro scenePro, String scenePassword, Camera cameraEntity, String phone, boolean rebuild) {
-        String url = laserHost + String.format(SAVE_SCENE_URL_TEMPLATE, scenePro.getNum());
-        Map<String, Object> params = new HashMap<>();
-        params.put("childName", cameraEntity.getChildName());
-        params.put("createTime", DateUtil.date2String(scenePro.getCreateTime(), null));
-        params.put("phone", phone);
-        params.put("sceneCode", scenePro.getNum());
-        params.put("snCode", cameraEntity.getSnCode());
-        params.put("status", scenePro.getStatus());
-        if (!rebuild) {
-            params.put("password", scenePassword);
-        } else {
-            params.put("status", 4);
-        }
-        params.put("version",getSceneVersion(scenePro.getNum()));
-        params.put("title", scenePro.getSceneName());
-        params.put("userId", scenePro.getUserId());
-        log.info("自研激光转台相机同步，url:{},params:{}", url, JSONObject.toJSONString(params));
-        ResponseEntity<Result> responseEntity = restTemplate.postForEntity(url, params, Result.class);
-        log.info("自研激光转台相机同步，url:{},params:{},结果,{}", url, JSONObject.toJSONString(params), JSONObject.toJSONString(responseEntity.getBody()));
-        if (responseEntity.getStatusCode() != HttpStatus.OK || responseEntity.getBody().getCode() != HttpStatus.OK.value()) {
-            log.error("激光场景状态同步失败!");
-        }
-    }
-
-    private String getSceneVersion(String num) {
-        String version = "V3";
-        ScenePro scenepro = sceneProService.getByNum(num);
-        if (scenepro == null || scenepro.getIsUpgrade() == 1) {
-            ScenePlus plus = scenePlusService.getScenePlusByNum(num);
-            if (plus != null) {
-                version = "V4";
-            }
-        }
-        return version;
-    }
-
-}

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

@@ -1,20 +0,0 @@
-package com.fdkankan.contro.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.contro.entity.IncrementType;
-import com.fdkankan.contro.mapper.IIncrementTypeMapper;
-import com.fdkankan.contro.service.IIncrementTypeService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 会员权益类型 服务实现类
- * </p>
- *
- * @author 
- * @since 2022-08-01
- */
-@Service
-public class IncrementTypeServiceImpl extends ServiceImpl<IIncrementTypeMapper, IncrementType> implements IIncrementTypeService {
-
-}

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

@@ -3,11 +3,7 @@ package com.fdkankan.contro.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.qrcode.QrCodeUtil;
-import cn.hutool.extra.qrcode.QrConfig;
-import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -26,7 +22,6 @@ import com.fdkankan.contro.vo.ResponseSceneFile;
 import com.fdkankan.contro.vo.ScenePlusVO;
 import com.fdkankan.fyun.config.FYunFileConfig;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
-import com.fdkankan.image.MatrixToImageWriterUtil;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
@@ -37,7 +32,6 @@ import com.fdkankan.web.util.RSAEncrypt;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -47,7 +41,6 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -74,9 +67,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     @Value("${queue.modeling.modeling-pre}")
     private String queueModelingPre;
 
-    @Value("${queue.modeling.v3.modeling-pre}")
-    private String queueV3ModelingPre;
-
     @Autowired
     private RedisUtil redisUtil;
 
@@ -94,9 +84,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     private RabbitMqProducer rabbitMqProducer;
 
     @Autowired
-    private ISceneProEditService sceneProEditService;
-
-    @Autowired
     private ISceneEditInfoService sceneEditInfoService;
     @Autowired
     private ISceneEditControlsService sceneEditControlsService;
@@ -128,11 +115,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     @Autowired
     private FYunFileConfig fYunFileConfig;
 
-    @Autowired
-    private ISceneProService sceneProService;
-    @Autowired
-    private IFdkkLaserService fdkkLaserService;
-
     @Override
     public SceneFileBuild findByFileId(String fileId) {
 
@@ -346,137 +328,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         return scenePlusVO;
     }
 
-    public ScenePlusVO buildV3Scene(ScenePro scenePro,String fileId, String prefix,JSONObject jsonObject,String buildType,long cameraType) throws Exception{
-        //调用createScene方法生成scene数据和加入算法队列
-
-        String cameraName = jsonObject.getJSONObject("cam").getString("uuid");
-        String unicode = jsonObject.getString("creator") + "_" + jsonObject.getString("uuidtime");
-
-        Camera camera = cameraService.getByChildName(cameraName);
-
-        if (camera == null) {
-            throw new BusinessException(CameraConstant.FAILURE_6003);
-        }
-
-        CameraDetail cameraDetail = cameraDetailService.getByCameraId(camera.getId());
-        if (cameraDetail == null) {
-            log.error("该相机详情不存在：" + cameraName);
-            throw new BusinessException(CameraConstant.FAILURE_6003);
-        }
-
-        String sceneNum = scenePro.getNum();
-        if (scenePro.getStatus().equals(SceneStatus.wait.code())) {
-            log.info(scenePro.getNum() + ":场景处于计算中，不能再计算");
-            return null;
-        }
-
-        String localDataPath = String.format(ConstantFilePath.DATABUFFER_FORMAT, sceneNum);
-        String imgViewPath = String.format(ConstantFilePath.IMAGE_PATH_FORMAT, sceneNum);
-        String dataViewPath = String.format(ConstantFilePath.DATA_PATH_FORMAT, sceneNum);
-
-        String userName = null;
-        if (!ObjectUtils.isEmpty(cameraDetail.getUserId())) {
-            SSOUser user = userService.getSSOUserByUserId(cameraDetail.getUserId());
-            userName = ObjectUtils.isEmpty(user) ? null : user.getUserName();
-        }
-
-        String icon = null;
-        if (!ObjectUtils.isEmpty(jsonObject.getString("icon"))) {
-            fYunFileService.copyFileInBucket(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"),imgViewPath + jsonObject.getString("icon"));
-            icon = fYunFileConfig.getHost() + imgViewPath + jsonObject.getString("icon");
-            log.info("上传icon成功....");
-        }
-
-        JSONObject firmwareVersion = new JSONObject();
-        if (!ObjectUtils.isEmpty(jsonObject.getString("camSoftwareVersion"))) {
-            firmwareVersion.put("camSoftwareVersion", jsonObject.getString("camSoftwareVersion"));
-        }
-
-        if (!ObjectUtils.isEmpty(jsonObject.getString("version"))) {
-            firmwareVersion.put("version", jsonObject.getString("version"));
-        }
-
-        //删除oss的houst_floor.json(国际版可能会卡住)
-        fYunFileService.deleteFile(dataViewPath + "houst_floor.json");
-
-        String algorithm = jsonObject.getString("location") != null && "1".equals(jsonObject.getString("location")) ? "sfm" : "slam";
-
-        ScenePlusVO scenePlusVO = this.createScenePro(sceneNum, camera.getId(), camera.getChildName(), jsonObject.getString("creator"),
-                jsonObject.getString("pwd"), unicode,cameraType, fileId, icon,  cameraDetail.getUserId(), userName,algorithm,
-                jsonObject.getJSONArray("points").size(), jsonObject.getString("name"), jsonObject.getString("info"),
-                jsonObject.getInteger("scenetype"), jsonObject.getString("gps"),
-                jsonObject.getInteger("resolution"), firmwareVersion.toString(), buildType);
-
-        if (Objects.nonNull(scenePlusVO)) {
-            JSONObject statusJson = new JSONObject();
-            //临时将-2改成1，app还没完全更新
-            statusJson.put("status", scenePlusVO.getSceneStatus() == -2 ? 1 : scenePlusVO.getSceneStatus());
-            statusJson.put("webSite", scenePlusVO.getWebSite());
-            statusJson.put("sceneNum", scenePlusVO.getNum());
-            statusJson.put("thumb", scenePlusVO.getThumb());
-            statusJson.put("payStatus", 0);
-            statusJson.put("recStatus", 'A');
-            FileUtils.writeFile(localDataPath + "status.json", statusJson.toString());
-            fYunFileService.uploadFile(localDataPath + "status.json", dataViewPath + "status.json");
-        }
-        BuildSceneCallMessage mqMessage = getBuildSceneMqMessage(sceneNum, cameraType, algorithm, jsonObject.getInteger("resolution"), buildType,
-                scenePlusVO.getDataSource());
-        if (cameraDetail.getCompanyId() != null) {
-            Company company = companyService.getById(cameraDetail.getCompanyId());
-            if (company != null) {
-                log.info("复制企业logo");
-                SceneProEdit sceneEditInfo = sceneProEditService.getByProId(scenePlusVO.getId());
-                if (StrUtil.isNotEmpty(company.getTopLogo())) {
-                    fYunFileService.copyFileInBucket(company.getTopLogo(),imgViewPath + "logo-main.png");
-                }
-                if (StrUtil.isNotEmpty(company.getFloorLogo())) {
-                    fYunFileService.copyFileInBucket(company.getFloorLogo(),imgViewPath + "floorLogoImg.png");
-                    sceneEditInfo.setFloorLogo("user");
-                }
-
-                if (StrUtil.isNotEmpty(company.getQrLogo())) {
-                    createQrCode(sceneNum,scenePlusVO.getWebSite(),company.getQrLogo());
-                }
-                sceneProEditService.updateById(sceneEditInfo);
-                if (!ObjectUtils.isEmpty(company.getCalculateFlexibility()) && !company.getCalculateFlexibility()) {
-                    mqMessage.setFlexibility(-1);
-                }
-            }
-        }
-        rabbitMqProducer.sendByWorkQueue(queueV3ModelingPre, mqMessage);
-
-        return scenePlusVO;
-    }
-
-    private void createQrCode(String num, String url, String qrLogo) {
-        String localLogoPath = null;
-        if (!org.apache.commons.lang3.ObjectUtils.isEmpty(qrLogo)) {
-            try {
-                localLogoPath = ConstantFilePath.AGENT_PATH + qrLogo.substring(qrLogo.lastIndexOf("//") + 1);
-                HttpUtil.downloadFile(qrLogo, localLogoPath);
-            } catch (Exception e) {
-                log.error("公司logo下载失败：{}", qrLogo);
-                localLogoPath = null;
-            }
-        }
-        //生成二维码
-        String outPathZh = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+ num +".png";
-        String outPathEn = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+ num +"_en.png";
-        QrConfig qrConfig = QrConfig.create();
-        if(!org.apache.commons.lang3.ObjectUtils.isEmpty(localLogoPath)){
-            qrConfig.setImg(localLogoPath);
-        }
-        QrCodeUtil.generate(url, qrConfig, FileUtil.file(outPathZh));
-        QrCodeUtil.generate(url + "&lang=en", qrConfig, FileUtil.file(outPathEn));
-        //上传二维码
-        fYunFileService.uploadFile(outPathZh, String.format(UploadFilePath.DOWNLOADS_QRCODE, num) + num + ".png");
-        fYunFileService.uploadFile(outPathEn, String.format(UploadFilePath.DOWNLOADS_QRCODE, num) + num + "_en.png");
-
-        if(!org.apache.commons.lang3.ObjectUtils.isEmpty(localLogoPath)){
-            FileUtils.deleteFile(localLogoPath);
-        }
-    }
-
     @Override
     public ResultData uploadSuccessBuild(String params) throws Exception {
         log.info("uploadSuccessBuild-params: " + params);
@@ -524,14 +375,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 cameraType = 11L;
             }
         }
-        // 判断是否是V3的场景
-        ScenePro scenePro = sceneProService.getOne(
-                new LambdaQueryWrapper<ScenePro>().like(ScenePro::getDataSource, fileId));
-        if (ObjectUtils.isEmpty(scenePro) || (!ObjectUtils.isEmpty(scenePro.getIsUpgrade()) && scenePro.getIsUpgrade() == 1)) {
-            buildScene(fileId, prefixBuffer.toString(),fdageJson,buildType,cameraType);
-        }else{
-            buildV3Scene(scenePro,fileId, prefixBuffer.toString(),fdageJson,buildType,cameraType);
-        }
+        buildScene(fileId, prefixBuffer.toString(),fdageJson,buildType,cameraType);
         return ResultData.ok();
     }
 
@@ -585,17 +429,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             cameraType = 14L;
         }
 
-        ScenePlusVO scenePlusVO = null;
-
-        // 判断是否是V3的场景
-        ScenePro scenePro = sceneProService.getOne(
-                new LambdaQueryWrapper<ScenePro>().like(ScenePro::getDataSource, fileId));
-        if (ObjectUtils.isEmpty(scenePro) || (!ObjectUtils.isEmpty(scenePro.getIsUpgrade()) && scenePro.getIsUpgrade() == 1)) {
-            scenePlusVO = buildScene(fileId, prefixBuffer.toString(), fdageJson, buildType, cameraType);
-        } else {
-            scenePlusVO = buildV3Scene(scenePro,fileId, prefixBuffer.toString(), fdageJson, buildType, cameraType);
-        }
-
+        ScenePlusVO scenePlusVO = buildScene(fileId, prefixBuffer.toString(), fdageJson, buildType, cameraType);
 
         if(ObjectUtils.isEmpty(scenePlusVO)){
             return ResultData.ok();
@@ -610,11 +444,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             }
             //判断 是否为激光相机
             Camera camera = cameraService.getByChildName(mac);
-            if(!ObjectUtils.isEmpty(scenePlus)){
-                fdkkLaserService.saveScene(scenePlus,fdageJson.getString("pwd"),camera,userName,false);
-            }else{
-                fdkkLaserService.saveScene(scenePro,fdageJson.getString("pwd"),camera,userName,false);
-            }
         }
         return ResultData.ok();
     }
@@ -796,150 +625,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         return scenePlusVO;
     }
 
-    public ScenePlusVO createScenePro(String projectNum, Long cameraId, String cameraName, String phoneId, String sceneKey,
-                                       String unicode, Long cameraType, String fileId, String pic, Long userId, String userName,
-                                       String algorithm, Integer sceneShootCount, String sceneName,String sceneDec,
-                                      Integer sceneType, String gps,Integer resolution, String firmwareVersion, String buildType
-                                       )throws Exception{
-
-
-        ScenePro scene = sceneProService.getByNum(projectNum);
-        SceneProEdit sceneEdit = sceneProEditService.getByProId(scene.getId());
-
-        scene.setCameraId(cameraId);
-        scene.setPhoneId(phoneId);
-        scene.setNum(projectNum);
-        scene.setSpace(0L);
-
-        if (pic != null && pic.length() > 5) {
-            scene.setThumb(pic);
-        } else {
-            scene.setThumb(ConstantUrl.DEFAULT_SCENE_PIC);
-        }
-        scene.setThumb(scene.getThumb().concat("?t=") + System.currentTimeMillis());
-
-        if (!ObjectUtils.isEmpty(userName)) {
-            scene.setUserId(userId);
-        }
-
-        if (sceneShootCount == null) {
-            scene.setShootCount(0);
-        } else {
-            scene.setShootCount(sceneShootCount);
-        }
-        if (sceneName != null) {
-            scene.setSceneName(sceneName);
-        }
-        if (sceneDec != null) {
-            scene.setSceneDec("<p>" + new String(sceneDec.getBytes("UTF-8")) + "</p>");
-        }
-
-        if (sceneType != null) {
-            scene.setSceneType(sceneType);
-        }
-
-        if (gps != null && !gps.trim().equals("")) {
-            scene.setGps(gps);
-        }
-
-        scene.setAlgorithm(algorithm);
-        if(!org.springframework.util.StringUtils.isEmpty(firmwareVersion)){
-            scene.setFirmwareVersion(firmwareVersion);
-        }
-        scene.setBuildType(buildType);
-        log.info("场景记录添加到数据库："+projectNum);
-
-        scene.setStatus(0);
-        scene.setPayStatus(0);
-        scene.setRecStatus("A");
-        scene.setCreateTime(new Date());
-        if (sceneName != null) {
-            scene.setSceneName(sceneName);
-        }
-        if (sceneType != null) {
-            scene.setSceneType(sceneType);
-        }
-        sceneProService.updateById(scene);
-
-        sceneEdit.setNeedKey(0);
-        if (cameraType.longValue() != 14 && !ObjectUtils.isEmpty(sceneKey)) {
-            sceneEdit.setNeedKey(1);
-            sceneEdit.setSceneKey(sceneKey);
-        }
-        sceneEdit.setProId(scene.getId());
-        sceneEdit.setMapVisi(1);
-        sceneEdit.setTourVisi(1);
-        sceneEdit.setVrVisi(1);
-        sceneEdit.setCadImgVisi(1);
-        sceneEdit.setPanoVisi(1);
-        sceneEdit.setOverlay(null);
-        sceneEdit.setM2dVisi(1);
-        sceneEdit.setPlayData(null);
-        sceneEdit.setFloorLogo("0");
-        sceneEdit.setM3dVisi(1);
-        sceneEdit.setJumpScene(false);
-        sceneEdit.setMeasureVisi(0);
-        sceneEdit.setFloorLogoSize(100);
-        sceneEdit.setUpdateTime(new Date());
-        sceneEdit.setRecStatus("A");
-        sceneEdit.setFloorPublishVer(sceneEdit.getFloorEditVer() + 1);
-        sceneEdit.setFloorEditVer(sceneEdit.getFloorEditVer() + 1);
-        sceneEdit.setVersion(sceneEdit.getVersion() + 1);
-        sceneEdit.setImagesVersion(sceneEdit.getImagesVersion() + 1);
-
-        sceneProEditService.updateById(sceneEdit);
-
-
-        JSONObject scenejson = JSONObject.parseObject(JSONObject.toJSONString(scene));
-        scenejson.put("thumbImg", 0);
-        scenejson.put("version", sceneEdit.getVersion());
-        scenejson.put("floorLogo", 0);
-        if(!ObjectUtils.isEmpty(sceneKey)){
-            scenejson.put("sceneKey", sceneKey);
-            scenejson.put("public", 1);
-        }else{
-            scenejson.put("sceneKey", "");
-            scenejson.put("public", 0);
-        }
-        if(cameraType.longValue() < 4 || cameraType.longValue() == 5 || cameraType.longValue() == 6){
-            scenejson.put("visions", 1);
-        }else {
-            scenejson.put("visions", 2);
-        }
-        scenejson.put("createTime", new DateTime(new Date()).toString("yyyy-MM-dd HH:mm"));
-
-        scenejson.put("floorPublishVer", sceneEdit.getFloorPublishVer());
-        scenejson.put("floorEditVer", sceneEdit.getFloorEditVer());
-        scenejson.put("rulerVisi", sceneEdit.getRulerVisi());
-        scenejson.put("entry", null);
-
-        if(!org.springframework.util.StringUtils.isEmpty(sceneEdit.getHotsIds())){
-            scenejson.put("hots", 1);
-        }
-
-        File file = new File(ConstantFilePath.SCENE_PATH+"data/data"+projectNum);
-        if(!file.exists()||!file.isDirectory())
-        {
-            file.mkdirs();
-        }
-        FileUtils.writeFile(ConstantFilePath.SCENE_PATH+"data/data"+projectNum+File.separator+"scene.json", scenejson.toString());
-
-        //生成二维码
-        MatrixToImageWriterUtil.createQRCode(scene.getWebSite(), ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+projectNum+".png",false, null);
-        MatrixToImageWriterUtil.createQRCode(scene.getWebSite() + "&lang=en", ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+projectNum+"_en.png",false, null);
-        log.info("二维码生成完成");
-
-        ScenePlusVO scenePlusVO = new ScenePlusVO();
-        scenePlusVO.setSceneStatus(scene.getStatus());
-        scenePlusVO.setThumb(scene.getThumb());
-        scenePlusVO.setPayStatus(scene.getPayStatus());
-        scenePlusVO.setId(scene.getId());
-        scenePlusVO.setNum(scene.getNum());
-        scenePlusVO.setWebSite(scene.getWebSite());
-        scenePlusVO.setDataSource(scene.getDataSource());
-        return scenePlusVO;
-    }
-
     public BuildSceneCallMessage getBuildSceneMqMessage(String projectNum,
                                                         Long cameraType, String algorithm, Integer resolution,
                                                         String buildType, String dataSource) {
@@ -957,13 +642,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     @Override
     public ResultData rebuildScene(String num,Boolean force) throws IOException {
 
-        ScenePro scenePro = sceneProService.getByNum(num);
-        //如果是v3场景，不允许重算，需要升级v4后再调此接口进行重算
-        if(Objects.nonNull(scenePro) && (Objects.isNull(scenePro.getIsUpgrade())
-            || scenePro.getIsUpgrade() != CommonStatus.YES.code().intValue())){
-            return rebuildV3Scene(scenePro,num,force);
-        }
-
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
         if(Objects.isNull(scenePlus)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
@@ -1014,7 +692,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 userName = user.getUserName();
             }
             Camera cameraEntity = cameraService.getById(scenePlus.getCameraId());
-            fdkkLaserService.saveScene(scenePlus,null,cameraEntity,userName,true);
             BuildSceneCallMessage buildSceneMqMessage = this.getBuildSceneMqMessage(
                     num, cameraType,
                     fdageData.getString("location") != null && "1".equals(fdageData.getString("location")) ? "sfm" : "slam",
@@ -1035,73 +712,4 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
         return ResultData.ok();
     }
-
-    public ResultData rebuildV3Scene(ScenePro scenePro,String num,Boolean force) throws IOException {
-
-
-        if (scenePro.getStatus() == 0 && (ObjectUtils.isEmpty(force) || !force)) {
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5033);
-        }
-        String path = scenePro.getDataSource();
-        Integer sceneSource = scenePro.getSceneSource();
-        String buildType = scenePro.getBuildType();
-        Integer sceneScheme = scenePro.getSceneScheme();
-
-        //重新计算时需要删除文件夹，否知使用缓存
-        FileUtils.delAllFile(path + File.separator + "results");
-
-        String dataFdageOssPath = ConstantFilePath.OSS_PREFIX+ path.replace(ConstantFilePath.BUILD_MODEL_PATH, "")
-                .replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, "") + "/data.fdage";
-
-        JSONObject fdageData = JSONObject.parseObject(fYunFileService.getFileContent(dataFdageOssPath));
-        if(ObjectUtils.isEmpty(fdageData)){
-            log.error("data.fdage文件不存在");
-            return ResultData.error(CameraConstant.FAILURE_6009.code(), CameraConstant.FAILURE_6009.message());
-        }
-
-        String statusJsonOssPath = String.format(ConstantFilePath.DATA_PATH_FORMAT, num) + "status.json";
-        JSONObject statusJson = JSONObject.parseObject(fYunFileService.getFileContent(statusJsonOssPath));
-        //临时将-2改成1，app还没完全更新
-        statusJson.put("status", SceneStatus.wait.code());
-        fYunFileService.uploadFile(statusJson.toJSONString().getBytes(StandardCharsets.UTF_8),statusJsonOssPath);
-
-        Long cameraType = (long)sceneScheme == 3 ? 12 : (long)sceneScheme;
-        //判断是否转台相机
-        if(sceneSource == 3){
-            cameraType = 13L;
-        }
-        if(sceneSource == 4){
-            cameraType = 14L;
-        }
-
-        if (sceneSource == 4) {
-            String userName = null;
-            Long sceneUserId = scenePro.getUserId();
-            if (!ObjectUtils.isEmpty(sceneUserId)) {
-                SSOUser user = userService.getSSOUserByUserId(sceneUserId);
-                userName = user.getUserName();
-            }
-            Camera cameraEntity = cameraService.getById(scenePro.getCameraId());
-            fdkkLaserService.saveScene(scenePro, null, cameraEntity, userName, true);
-            BuildSceneCallMessage buildSceneMqMessage = this.getBuildSceneMqMessage(
-                    num, cameraType,
-                    fdageData.getString("location") != null && "1".equals(fdageData.getString("location")) ? "sfm" : "slam",
-                    fdageData.getInteger("resolution"), buildType, path);
-            rabbitMqProducer.sendByWorkQueue(queueV3ModelingPre, buildSceneMqMessage);
-        } else {
-            BuildSceneCallMessage buildSceneMqMessage = this.getBuildSceneMqMessage(
-                    num, cameraType, fdageData.getString("location") != null && "1".equals(fdageData.getString("location")) ? "sfm" : "slam",
-                    fdageData.getInteger("resolution"), buildType,
-                    path);
-            rabbitMqProducer.sendByWorkQueue(queueV3ModelingPre, buildSceneMqMessage);
-        }
-
-        //重算的场景，先移除该场景对应的容量
-        sceneProService.update(new LambdaUpdateWrapper<ScenePro>()
-                .set(ScenePro::getStatus, SceneStatus.wait.code())
-                .set(ScenePro::getSpace,0)
-                .eq(ScenePro::getNum, num));
-
-        return ResultData.ok();
-    }
 }

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

@@ -1,47 +1,21 @@
 package com.fdkankan.contro.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
-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.CameraConstant;
-import com.fdkankan.common.constant.CommonStatus;
-import com.fdkankan.common.constant.ConstantUrl;
 import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.constant.SceneStatus;
-import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.contro.entity.Camera;
-import com.fdkankan.contro.entity.CameraDetail;
-import com.fdkankan.contro.entity.SSOUser;
 import com.fdkankan.contro.entity.ScenePlus;
 import com.fdkankan.contro.entity.ScenePlusExt;
-import com.fdkankan.contro.entity.ScenePro;
 import com.fdkankan.contro.mapper.IScenePlusMapper;
 import com.fdkankan.contro.service.ICameraDetailService;
-import com.fdkankan.contro.service.ICameraService;
 import com.fdkankan.contro.service.IScenePlusExtService;
 import com.fdkankan.contro.service.IScenePlusService;
-import com.fdkankan.contro.service.ISceneProService;
-import com.fdkankan.contro.service.IUserService;
-import com.fdkankan.contro.vo.ScenePlusVO;
-import com.fdkankan.fyun.constant.FYunTypeEnum;
-import com.fdkankan.fyun.face.FYunFileServiceInterface;
-import com.fdkankan.model.constants.ConstantFilePath;
-import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 import com.fdkankan.web.response.ResultData;
-import java.io.File;
-import java.util.Date;
 import lombok.extern.slf4j.Slf4j;
-import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import java.util.Objects;
-import org.springframework.util.ObjectUtils;
 
 /**
  * <p>

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

@@ -1,33 +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.SceneProEdit;
-import com.fdkankan.contro.mapper.ISceneProEditMapper;
-import com.fdkankan.contro.service.ISceneProEditService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * pro场景编辑数据表 服务实现类
- * </p>
- *
- * @author 
- * @since 2022-07-12
- */
-@Service
-public class SceneProEditServiceImpl extends ServiceImpl<ISceneProEditMapper, SceneProEdit> implements ISceneProEditService {
-
-    @Override
-    public SceneProEdit getByProId(Long proId) {
-        LambdaQueryWrapper<SceneProEdit> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(SceneProEdit::getProId,proId);
-        List<SceneProEdit> list = this.list(wrapper);
-        if(list != null && list.size() >0){
-            return list.get(0);
-        }
-        return null;
-    }
-}

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

@@ -1,27 +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.ScenePro;
-import com.fdkankan.contro.mapper.ISceneProMapper;
-import com.fdkankan.contro.service.ISceneProService;
-import lombok.extern.slf4j.Slf4j;
-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 {
-
-    @Override
-    public ScenePro getByNum(String num) {
-        return this.getOne(new LambdaQueryWrapper<ScenePro>().eq(ScenePro::getNum, num));
-    }
-}

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

@@ -1,45 +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.UserIncrement;
-import com.fdkankan.contro.mapper.IUserIncrementMapper;
-import com.fdkankan.contro.service.IUserIncrementService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * <p>
- * 用户增值权益表 服务实现类
- * </p>
- *
- * @author 
- * @since 2021-12-24
- */
-@Service
-public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper, UserIncrement> implements IUserIncrementService {
-
-    @Resource
-    private IUserIncrementMapper userIncrementMapper;
-
-    @Override
-    public UserIncrement getByCameraId(Long cameraId) {
-        QueryWrapper<UserIncrement> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(UserIncrement::getRecStatus,TbStatus.VALID.code());
-        queryWrapper.lambda().eq(UserIncrement::getCameraId,cameraId);
-        List<UserIncrement> list = this.list(queryWrapper);
-        if(list == null || list.size()<=0){
-            return null;
-        }
-        return list.get(0);
-    }
-
-    @Override
-    public List<UserIncrement> getByChildName(String childName) {
-        return userIncrementMapper.getByChildName(childName);
-    }
-
-}

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

@@ -1,87 +0,0 @@
-package com.fdkankan.contro.vo;
-
-
-import lombok.Data;
-
-/**
- * 场景建模需要的参数
- * Created by Hb_zzZ on 2019/6/25.
- */
-@Data
-public class BuildSceneParamVO {
-
-    /**
-     * unicode码
-     */
-    private String unicode;
-
-    /**
-     * 相机编码
-     */
-    private String cameraName;
-
-    /**
-     * phoneId
-     */
-    private String phoneId;
-
-    /**
-     * 大场景秘钥
-     */
-    private String sceneKey;
-
-    /**
-     * zip文件下载地址前缀
-     */
-    private String prefix;
-
-    /**
-     * 文件名zip.Zip
-     */
-    private String fileName;
-
-    /**
-     * 大场景名称
-     */
-    private String sceneName;
-
-    /**
-     * 大场景描述
-     */
-    private String sceneDec;
-
-    /**
-     * 大场景类型
-     */
-    private Integer sceneType;
-
-    /**
-     * 拍摄点位数
-     */
-    private Integer shootCount;
-
-    /**
-     * gps
-     */
-    private String gps;
-
-    /**
-     * 场景缩略图
-     */
-    private String thumb;
-
-    /**
-     * sfm或slam
-     */
-    private String algorithm;
-
-    /**
-     * 重算路径
-     */
-    private String path;
-
-    /**
-     * 场景编码
-     */
-    private String num;
-}

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

@@ -1,98 +0,0 @@
-package com.fdkankan.contro.vo;
-
-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;
-import lombok.ToString;
-
-/**
- * <p>
- * 客户企业logo信息
- * </p>
- *
- * @author 
- * @since 2021-12-24
- */
-@Getter
-@Setter
-public class CompanyVO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Long id;
-
-    /**
-     * 公司名称
-     */
-    private String companyName;
-
-    /**
-     * 顶部logo
-     */
-    private String topLogo;
-
-    /**
-     * 地面logo
-     */
-    private String floorLogo;
-
-    /**
-     * 地面点位logo
-     */
-    private String markerLogo;
-
-    /**
-     * 二维码logo
-     */
-    private String qrLogo;
-
-    /**
-     * 是否显示初始logo，0隐藏，1显示
-     */
-    private Integer showLogo;
-
-    /**
-     * t_manager表的id
-     */
-    private Long managerId;
-
-    /**
-     * 新增的相机是否注册，0否，1删
-     */
-    private Integer cameraDelete;
-
-    /**
-     * 数据同步类型
-     */
-    private String dataSync;
-
-    /**
-     * 数据同步方式
-     */
-    private Integer dataSyncAction;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 0正常，1删除
-     */
-    private Integer tbStatus;
-
-
-    private String managerName;
-
-}

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

@@ -1,28 +0,0 @@
-package com.fdkankan.contro.vo;
-
-import com.fdkankan.web.request.RequestBase;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-@Data
-public class RebuildVedioSceneParamVO extends RequestBase implements Serializable {
-
-    private String num;
-
-    private String panoId;
-
-    private String x;
-
-    private String y;
-
-    private String w;
-
-    private String h;
-
-
-    private List<Map<String,Object>> images;
-
-}

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

@@ -1,91 +0,0 @@
-package com.fdkankan.contro.vo;
-
-import com.fdkankan.web.request.RequestBase;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class RequestCamera extends RequestBase implements Serializable {
-
-    private static final long serialVersionUID = 5251625920621810844L;
-
-    private Long cameraId;
-
-    private String userName;
-
-    private String childName;
-
-    private String childPassword;
-
-    private String snCode;
-
-    private String wifiName;
-
-    private String balance;
-
-    private String own;
-
-    private String orderSn;
-
-    private String startDate;
-
-    private String endDate;
-    // 0-充值记录，1-消费记录
-    private Integer type;
-
-    private String searchKey;
-    //充值类型
-    private int body;
-
-    private int points;
-    // 支付类型，0表示微信，1表示支付宝，2表示paypal
-    private int payType;
-
-    private Integer cameraType;
-
-    private Long userId;
-    // 0表示国内订单，1表示国外订单
-    private Integer abroad;
-
-    private Integer dateType;
-
-    private String ids;
-
-    //月份
-    private Integer month;
-
-    //容量G位单位
-    private Integer space;
-
-    /**
-     * 企业表t_company的id
-     */
-    private Long companyId;
-
-    private String recStatus;
-
-    private String address;
-
-    private String resourceIds;
-
-    private Long agentFrameworkId;
-
-    private Long userIncrementId;
-
-    /**
-     * 权益类型Id
-     */
-    private Long incrementTypeId;
-
-    private String sceneType;
-
-    private String startTime;
-
-    private String endTime;
-
-    private String selecttype;
-
-    private Integer tbStatus;
-
-}

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

@@ -1,26 +0,0 @@
-package com.fdkankan.contro.vo;
-
-import com.fdkankan.web.request.RequestBase;
-import lombok.Data;
-
-@Data
-public class RequestCompany extends RequestBase {
-
-    private Long id;
-
-    private String companyName;
-
-    private String topLogo;
-
-    private String markerLogo;
-
-    private String floorLogo;
-
-    private String qrLogo;
-
-    private Integer showLogo;
-
-    private Long managerId;
-
-    private Integer cameraDelete;
-}

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

@@ -1,136 +0,0 @@
-package com.fdkankan.contro.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class ResponseCamera implements Serializable {
-
-    private static final long serialVersionUID = -8445289048065283322L;
-
-    private Long id;
-
-    private Long cameraId;
-
-    //(value = "用户名", name = "userName")
-    private String userName;
-
-    //(value = "激活时间", name = "activatedTime")
-    private Date activatedTime;
-
-    //(value = "相机的Mac地址", name = "childName")
-    private String childName;
-
-    //(value = "余额", name = "balance")
-    private String balance;
-
-    //(value = "商品名称", name = "goodsName")
-    private String goodsName;
-
-    //(value = "商品图片", name = "imageUrl")
-    private String imageUrl;
-
-    //(value = "商品图片2", name = "pic")
-    private String pic;
-
-    //(value = "0表示客户，1表示员工，2表示赠送，3表示其他", name = "own")
-    private int own;
-
-    //(value = "已使用的容量（字符串）", name = "usedSpaceStr")
-    private String usedSpaceStr;
-
-    //(value = "总的容量（字符串）", name = "totalSpaceStr")
-    private String totalSpaceStr;
-
-    //(value = "已使用的容量", name = "usedSpace")
-    private double usedSpace;
-
-    //(value = "总的容量", name = "totalSpace")
-    private double totalSpace;
-
-    //(value = "出货类型，0测试使用，1线上出库，2经销商出库", name = "type")
-    private Integer type;
-
-    //(value = "", name = "type")
-    private String wifiName;
-
-    //(value = "0：双目  1：八目  9：转台 10：激光", name = "cameratype")
-    private String cameraType;
-
-    //(value = "容量到期时间", name = "spaceEndTime")
-    private String spaceEndTime;
-
-    private String spaceContent;
-
-    //(value = "国际，0国内，1国际", name = "country")
-    private int country;
-
-    //(value = "sn码", name = "snCode")
-    private String snCode;
-
-    //(value = "商品id", name = "goodsId")
-    private Long goodsId;
-
-    //(value = "容量到期时间（字符串）", name = "spaceEndStr")
-    private String spaceEndStr;
-
-    //(value = "容量大小", name = "space")
-    private Long space;
-
-    //(value = "容量大小（字符串）", name = "spaceStr")
-    private String spaceStr;
-
-    //(value = "容量到期时间是否小于7天", name = "isExpire")
-    private Boolean isExpire;
-
-    //(value = "昵称", name = "nickName")
-    private String nickName;
-
-    //(value = "相机容量表id", name = "spaceId")
-    private Long spaceId;
-
-    //(value = "用户id", name = "userId")
-    private Long userId;
-
-    //(value = "订单编码", name = "orderSn")
-    private String orderSn;
-
-    //(value = "经销商名字", name = "agentName")
-    private String agentName;
-
-    //(value = "入库时间", name = "inTime")
-    private Date inTime;
-
-    //(value = "出库时间", name = "outTime")
-    private Date outTime;
-
-    private Long companyId;
-
-    private String companyName;
-
-    private String recStatus;
-
-    private String address;
-
-    private Date createTime;
-
-    private Long cooperationUser;
-
-    private String cooperationUserName;
-
-    private Integer sceneNum;
-
-    private Date lastTime;
-
-    private Long agentFrameworkId;
-
-    private String agentFrameworkName;
-
-    private Integer surplusDate;
-
-    private Long userIncrementId;
-
-    private  ResponseUserIncrement responseUserIncrement;
-}

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

@@ -1,48 +0,0 @@
-package com.fdkankan.contro.vo;
-
-import com.fdkankan.web.request.RequestBase;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class ResponseUserIncrement extends RequestBase {
-
-    private String key;
-
-    private Long id;
-
-    private Long userId;
-
-    private Long cameraId;
-
-    private String orderSn;
-
-    /**
-     * 生效时间
-     */
-    private Date incrementStartTime;
-    /**
-     * 结束时间
-     */
-    private Date incrementEndTime;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    private String snCode;
-
-    private String incrementStartStr;
-
-    private String incrementEndStr;
-
-    private String createStr;
-
-    private Boolean isExpire;
-
-    private String keyWord;
-
-    private Integer isExpired;
-}

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

@@ -1,179 +0,0 @@
-package com.fdkankan.contro.vo;
-
-import com.fdkankan.web.request.RequestBase;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class SceneParamVO extends RequestBase implements Serializable {
-
-    private static final long serialVersionUID = 3939730189762555357L;
-
-    private Long sceneId;
-
-    private String type;
-
-    private String item;
-
-    private String order;
-
-    private String searchKey;
-
-    private String keywordType;
-
-    private String guideSid;
-
-    private String guideName;
-
-    private String num;
-
-    private String childName;
-    //场景的二维设计图数据
-    private String geoData;
-    //	场景序号
-    private String index;
-    //模型的中心（可以忽略）
-    private String center;
-    //模型的缩放系数
-    private String zoom;
-    //模型测量线的缩放系数
-    private String realScale;
-    //场景二维设计图
-    private String imgData;
-    //场景标题
-    private String sceneName;
-    //场景描述信息
-    private String sceneDec;
-    //场景所属行业
-    private String sceneType;
-    //场景密码
-    private String sceneKey;
-    //版本号，每编辑一次加1
-    private String version;
-    //场景封面图是否默认
-    private String thumbImg;
-    //场景封面图（大）
-    private String thumbBigImg;
-    //场景封面图（小）
-    private String thumbSmallImg;
-    //初始点的uuid
-    private String currentPanoId;
-    //	地面的logo是否默认
-    private String floorLogo;
-    // 地面logo图片
-    private String floorLogoImg;
-    // 地面logo图片的大小
-    private String floorLogoSize;
-    // 模型贴图的风格
-    private String sceneIndex;
-    // 模型的初始信息：坐标，朝向等
-    private String entry;
-    // 场景封面图（移动端，鱼眼）
-    private String thumbFishBigImg;
-    // 设计页面的元素信息
-    private String floorPlaneInfo;
-
-    private String visiblePanos;
-
-    private String hotData;
-
-    private String data;
-
-    private String solveType;
-
-    private Long feedBackId;
-    // 排序
-    private String sceneInterest;
-
-    private String phone;
-
-    private String message;
-    /**
-     * 普通录屏文件地址
-     */
-    private String screencapMusic;
-
-    private String originalFileName;
-
-    private Integer sceneScheme;
-
-    /**
-     * 源相机sn
-     */
-    private String sourceSn;
-
-    /**
-     * 目标相机sn
-     */
-    private String targetSn;
-
-    /**
-     * 源手机验证码
-     */
-    private String sourceCode;
-
-    /**
-     * 目标手机验证码
-     */
-    private String targetCode;
-
-    private String snCode;
-
-    private String objName;
-
-    private String mntName;
-
-    private Long userId;
-
-    private String userName;
-
-    private String userIds;
-
-    private String cameraIds;
-
-    private String nums;
-
-    private List<String> numList;
-
-    private Long folderId;
-
-    /**
-     * true，计算成功的，false：计算失败的，null:全部
-     */
-    private Boolean calculated;
-
-    private Integer folderType;
-
-    private String sceneSource;
-
-    private List<String> sceneSourceList;
-
-    private Date startTime;
-
-    private Date endTime;
-
-    /**
-     * 用户拥有的相机id列表
-     */
-    private String ownCameraIds;
-
-    private List<String> sceneNumList;
-
-    private Long cameraId;
-
-    private List<Long> cameraIdList;
-
-    private String likeNum;
-
-    private String path;
-
-    private String oldNum;
-
-    private Integer status;
-
-    private List<Long> sceneIdList;
-
-}

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

@@ -1,180 +0,0 @@
-package com.fdkankan.contro.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-@Builder
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class SceneProVO {
-
-    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 Long folderId;
-
-    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;
-
-
-}

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

@@ -1,233 +0,0 @@
-package com.fdkankan.contro.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@Data
-public class SceneVO implements Serializable{
-
-    private static final long serialVersionUID = 2454435822930272529L;
-
-    private Long id;
-
-    private String thumb;
-
-    private String sceneKey;
-
-    private String sceneName;
-
-    private String sceneDec;
-
-    private Integer sceneType;
-
-    private Integer thumbImg;
-
-    private Integer version;
-
-    private String markerLogo;
-
-    private String floorLogo;
-
-    private Integer floorLogoSize;
-
-    private String entry;
-
-    private String createTime;
-
-    private Integer shootCount;
-
-    private Integer status;
-
-    private Integer sceneIndex;
-
-    private String hasBGM;
-
-    private Integer cameraType;
-
-    private Integer isPublic;
-
-    private String gps;
-
-    private String childName;
-
-    private String userName;
-
-    private String nickName;
-
-    private Integer viewCount;
-
-    private String webSite;
-
-    private String dataSource;
-
-    private Integer payStatus;
-
-    private String phoneId;
-
-    private String num;
-
-    private Integer recommend;
-
-    private Integer thumbStatus;
-
-    private String hotsIds;
-
-    private String initialPointId;
-
-    private Integer style;
-
-    private Integer sceneScheme;
-
-    private String bgMusic;
-
-    private Long userId;
-
-    private Long cameraId;
-
-    private Long space;
-
-    private Long createDate;
-
-    private String shareLogo;
-
-    private Integer mapVisi;
-
-    private Integer tourVisi;
-
-    private Integer vrVisi;
-
-
-    /**
-     * 普通录屏文件地址
-     */
-    private String screencapVoiceSrc;
-
-    /**
-     * 录音文件地址
-     */
-    private String screencapVoiceSound;
-
-    /**
-     * 同步录音文件地址
-     */
-    private String screencapVoiceSoundsync;
-
-    /**
-     * 选择的类型，sound为screencapVoiceSound，file为screencapVoiceSrc
-     */
-    private String screencapVoiceType;
-
-    /**
-     * 录屏文件地址
-     */
-    private String playData;
-
-
-    /**
-     * 重新建模的版本
-     */
-    private Integer floorEditVer;
-
-    /**
-     * 正式发布重新建模的版本
-     */
-    private Integer floorPublishVer;
-
-    /**
-     * 录屏图片
-     */
-    private String screencapThumb;
-
-    /**
-     * cad平面图参数
-     */
-    private String cadInfo;
-
-    /**
-     * cad平面图参数
-     */
-    private String floorPlanPng;
-
-    /**
-     * 展示页面是否显示标尺
-     */
-    private Integer rulerVisi;
-
-    /**
-     * 展示页面cad图在平面图是否显示
-     */
-    private Integer cadImgVisi;
-
-    private Integer panoVisi;
-
-    private Integer m2dVisi;
-
-    private Integer m3dVisi;
-
-    private Integer measureVisi;
-
-    private String videos;
-
-    private String snCode;
-
-    private String overlay;
-
-    private Integer showLogoBottom;
-
-    private String recStatus;
-
-    private Integer needKey;
-
-    private String buildType;
-
-    private Integer imagesVersion;
-
-    private String bgMusicName;
-
-    /**
-     * 协作者用户id
-     */
-    private String cooperationUserId;
-
-    private String cooperationUserName;
-
-    private Integer sceneSource;
-
-    private boolean jumpScene;
-
-    /**
-     * 服务器的服务商
-     */
-    private String ecs;
-
-    /**
-     * 场景来源方式，为app提供，0相机，1用户，2协作者
-     */
-    private Integer sceneSourceType;
-
-    /**
-     * 随心装场景码
-     */
-    private String vrNum;
-
-    /**
-     * 旋转角度
-     */
-    private String floorPlanAngle;
-
-    private Integer isFolder;
-
-    private String videosUser;
-
-    private Integer pageNum;
-
-    private Integer pageSize;
-
-}