ソースを参照

Modeling 移除db

by su 3 年 前
コミット
fc0a7be843
38 ファイル変更6 行追加2535 行削除
  1. 0 11
      4dkankan-center-modeling/pom.xml
  2. 2 2
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/ModelingApplication.java
  3. 0 70
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/config/MQProducerConfig.java
  4. 0 61
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/config/MQReceiverConfig.java
  5. 0 9
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/constants/RedisKey.java
  6. 0 170
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/entity/Scene.java
  7. 0 170
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/entity/SceneExt.java
  8. 0 95
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/entity/SceneFileBuild.java
  9. 0 146
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/entity/ScenePro.java
  10. 0 176
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/entity/SceneProEdit.java
  11. 0 164
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/entity/SceneProEditExt.java
  12. 0 137
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/entity/SceneProExt.java
  13. 0 66
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/feign/UserFeign.java
  14. 0 18
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/mapper/ISceneExtMapper.java
  15. 0 18
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/mapper/ISceneFileBuildMapper.java
  16. 0 18
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/mapper/ISceneMapper.java
  17. 0 18
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/mapper/ISceneProEditExtMapper.java
  18. 0 18
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/mapper/ISceneProEditMapper.java
  19. 0 18
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/mapper/ISceneProExtMapper.java
  20. 0 18
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/mapper/ISceneProMapper.java
  21. 4 12
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/receiver/BuildSceneMQListener.java
  22. 0 680
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/receiver/BuildSceneReceiver.java
  23. 0 18
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/ISceneExtService.java
  24. 0 18
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/ISceneFileBuildService.java
  25. 0 16
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/ISceneProEditExtService.java
  26. 0 16
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/ISceneProEditService.java
  27. 0 17
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/ISceneProExtService.java
  28. 0 23
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/ISceneProService.java
  29. 0 21
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/ISceneService.java
  30. 0 25
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneExtServiceImpl.java
  31. 0 37
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneFileBuildServiceImpl.java
  32. 0 20
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneProEditExtServiceImpl.java
  33. 0 20
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneProEditServiceImpl.java
  34. 0 33
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneProExtServiceImpl.java
  35. 0 92
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneProServiceImpl.java
  36. 0 61
      4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneServiceImpl.java
  37. 0 4
      4dkankan-center-modeling/src/main/resources/bootstrap.yml
  38. 0 19
      4dkankan-common/pom.xml

+ 0 - 11
4dkankan-center-modeling/pom.xml

@@ -40,12 +40,6 @@
 
 		<dependency>
 			<groupId>com.fdkankan</groupId>
-			<artifactId>4dkankan-utils-db</artifactId>
-			<version>2.0.0</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.fdkankan</groupId>
 			<artifactId>4dkankan-utils-redis</artifactId>
 			<version>2.0.0</version>
 		</dependency>
@@ -75,11 +69,6 @@
 			<groupId>com.alibaba.cloud</groupId>
 			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<scope>runtime</scope>
-		</dependency>
 
 		<dependency>
 			<groupId>org.projectlombok</groupId>

+ 2 - 2
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/ModelingApplication.java

@@ -14,8 +14,8 @@ import org.springframework.context.annotation.ComponentScan;
 		"com.fdkankan.modeling",
 		"com.fdkankan.fyun",
 		"com.fdkankan.redis",
-		"com.fdkankan.mq",
-		"com.fdkankan.db"})
+		"com.fdkankan.mq"
+})
 public class ModelingApplication {
 
 	public static void main(String[] args) {

+ 0 - 70
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/config/MQProducerConfig.java

@@ -1,70 +0,0 @@
-//package com.fdkankan.modeling.config;
-//
-//import org.apache.rocketmq.client.exception.MQClientException;
-//import org.apache.rocketmq.client.producer.DefaultMQProducer;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//
-//@Configuration
-//public class MQProducerConfig {
-//
-//    private static Logger log = LoggerFactory.getLogger(MQProducerConfig.class);
-//
-//    @Value("${rocketmq.name-srv-addr}")
-//    private String nameSrvAddr;
-//    @Value("${rocketmq.producer.group.testGrop}")
-//    private String producerGroupName;
-//    /**
-//     * 消息最大大小,默认4M
-//     */
-//    @Value("${rocketmq.producer.maxMessageSize}")
-//    private Integer maxMessageSize;
-//    /**
-//     * 消息发送超时时间,默认3秒
-//     */
-//    @Value("${rocketmq.producer.sendMsgTimeout}")
-//    private Integer sendMsgTimeout;
-//    /**
-//     * 消息发送失败重试次数,默认2次
-//     */
-//    @Value("${rocketmq.producer.retryTimesWhenSendFailed}")
-//    private Integer retryTimesWhenSendFailed;
-//
-//    /**
-//     * 初始化向rocketmq发送普通消息的生产者
-//     */
-//    @Bean("ModelingProducer")
-//    public DefaultMQProducer testProducer() throws MQClientException {
-//        /*
-//         * 一个应用创建一个Producer,由应用来维护此对象,可以设置为全局对象或者单例<br>
-//         * 注意:ProducerGroupName需要由应用来保证唯一<br>
-//         * ProducerGroup这个概念发送普通的消息时,作用不大,但是发送分布式事务消息时,比较关键,
-//         * 因为服务器会回查这个Group下的任意一个Producer
-//         */
-//        DefaultMQProducer producer = new DefaultMQProducer(producerGroupName);
-//        producer.setInstanceName(producerGroupName);
-//        producer.setNamesrvAddr(nameSrvAddr);
-//        //设置 lnstanceName,当一个 Jvm 需要启动多个 Producer 的时候,通过设置不同的 InstanceName来区分,不设置的话系统使用默认名称“DEFAULT”
-////        producer.setInstanceName(properties.getProducerInstanceName());
-//        producer.setVipChannelEnabled(false);
-//        //发送消息超时时间,默认3000
-//        producer.setSendMsgTimeout(sendMsgTimeout);
-//        //发送消息失败重试次数,默认2
-//        producer.setRetryTimesWhenSendAsyncFailed(retryTimesWhenSendFailed);
-//        //消息最大长度 默认1024*1024*4(4M)
-//        producer.setMaxMessageSize(maxMessageSize);
-//        /*
-//         * Producer对象在使用之前必须要调用start初始化,初始化一次即可<br>
-//         * 注意:切记不可以在每次发送消息时,都调用start方法
-//         */
-//        producer.start();
-//        log.info("RocketMq " + this + " Started.");
-//        return producer;
-//    }
-//
-//
-//
-//}

+ 0 - 61
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/config/MQReceiverConfig.java

@@ -1,61 +0,0 @@
-//package com.fdkankan.modeling.config;
-//
-//import com.fdkankan.modeling.receiver.BuildSceneReceiver;
-//import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
-//import org.apache.rocketmq.client.exception.MQClientException;
-//import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
-//import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
-//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.stereotype.Component;
-//
-//import javax.annotation.PostConstruct;
-//
-//@Component
-//public class MQReceiverConfig {
-//    private static Logger logger = LoggerFactory.getLogger("programLog");
-//
-//    @Value("${rocketmq.name-srv-addr}")
-//    private String nameSrvAddr;
-//
-//    @Value("${rocketmq.consumer.testGrop}")
-//    private String consumerGroupName;
-//
-//    @Value("${rocketmq.topic.testGrop}")
-//    private String topicName;
-//
-//    @Value("${rocketmq.tag.testGrop}")
-//    private String tagName;
-//
-//    @Autowired
-//    private BuildSceneReceiver buildSceneReceiver;
-//
-//    @PostConstruct
-//    public void CalUserTradeAmountConsumer() throws MQClientException {
-//        // Instantiate with specified consumer group name.
-//        DefaultMQPushConsumer consumer = new DefaultMQPushConsumer(consumerGroupName);
-//
-//        // Specify name server addresses.
-//        consumer.setNamesrvAddr(nameSrvAddr);
-//        consumer.setInstanceName(consumerGroupName);
-//        //广播
-//        consumer.setMessageModel(MessageModel.BROADCASTING);
-//        //一次最大消费多少数量消息,与List<MessageExt>数组数量有关,默认为1
-//        //  consumer.setConsumeThreadMax(batchMaxSize);
-//        //设置Consumer第一次启动是从队列头部开始消费还是队列尾部开始消费
-//        //如果非第一次启动,那么按照上次消费的位置继续消费
-//        consumer.setConsumeFromWhere(ConsumeFromWhere.CONSUME_FROM_FIRST_OFFSET);
-//
-//        // Subscribe one or more topics to consume.
-//        consumer.subscribe(topicName, tagName);
-//
-//        // Register callback to execute on arrival of messages fetched from brokers.
-//        consumer.registerMessageListener(buildSceneReceiver);
-//
-//        //Launch the consumer instance.
-//        consumer.start();
-//    }
-//
-//}

+ 0 - 9
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/constants/RedisKey.java

@@ -1,9 +0,0 @@
-package com.fdkankan.modeling.constants;
-
-public class RedisKey {
-
-    public static final String SYSTEM_PREFIX = "4dkankan";
-
-    public static final String SCENE_BUILDING = SYSTEM_PREFIX+":scene:building:";
-
-}

+ 0 - 170
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/entity/Scene.java

@@ -1,170 +0,0 @@
-package com.fdkankan.modeling.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 场景表
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-30
- */
-@Getter
-@Setter
-@TableName("t_scene")
-public class Scene implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 场景名称
-     */
-    @TableField("scene_name")
-    private String sceneName;
-
-    /**
-     * 场景描述
-     */
-    @TableField("scene_dec")
-    private String sceneDec;
-
-    /**
-     * 场景的链接地址
-     */
-    @TableField("web_site")
-    private String webSite;
-
-    /**
-     * 场景缩略图
-     */
-    @TableField("thumb")
-    private String thumb;
-
-    /**
-     * 0表示未建好,1表示建好,-1表示出错,-2表示不要在官网上显示
-     */
-    @TableField("scene_status")
-    private Integer sceneStatus;
-
-    /**
-     * 原始的大场景数据(七牛)
-     */
-    @TableField("data_source")
-    private String dataSource;
-
-    /**
-     * 用户表t_user的id
-     */
-    @TableField("user_id")
-    private Long userId;
-
-    /**
-     * 0表示未付款,1表示付款了,-1表示欠费
-     */
-    @TableField("pay_status")
-    private Integer payStatus;
-
-    /**
-     * 相机主表t_camera的id
-     */
-    @TableField("camera_id")
-    private Long cameraId;
-
-    /**
-     * 手机id
-     */
-    @TableField("phone_id")
-    private String phoneId;
-
-    /**
-     * 大场景序号
-     */
-    @TableField("scene_code")
-    private String sceneCode;
-
-    /**
-     * 大场景的密钥
-     */
-    @TableField("scene_key")
-    private String sceneKey;
-
-    /**
-     * 0表示其他,1表示文博,2表示地产,3表示电商,4表示餐饮,5表示家居
-     */
-    @TableField("scene_type")
-    private Integer sceneType;
-
-    /**
-     * 1表示推荐,0表示正常
-     */
-    @TableField("recommend")
-    private Integer recommend;
-
-    /**
-     * 浏览次数
-     */
-    @TableField("view_count")
-    private Integer viewCount;
-
-    /**
-     * 版本
-     */
-    @TableField("version")
-    private Integer version;
-
-    /**
-     * 表示缩略图是否存在
-     */
-    @TableField("thumb_status")
-    private Integer thumbStatus;
-
-    /**
-     * 0表示默认,1表示自己上传
-     */
-    @TableField("floor_logo")
-    private String floorLogo;
-
-    /**
-     * 标记大小
-     */
-    @TableField("floor_logo_size")
-    private Integer floorLogoSize;
-
-    /**
-     * 记录的状态,A: 生效,I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 0-有效,1-删除
-     */
-    @TableField("tb_status")
-    private Integer tbStatus;
-
-
-}

+ 0 - 170
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/entity/SceneExt.java

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

+ 0 - 95
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/entity/SceneFileBuild.java

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

+ 0 - 146
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/entity/ScenePro.java

@@ -1,146 +0,0 @@
-package com.fdkankan.modeling.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * pro场景表
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Getter
-@Setter
-@TableName("t_scene_pro")
-public class ScenePro implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 场景名称
-     */
-    @TableField("scene_name")
-    private String sceneName;
-
-    /**
-     * 场景描述
-     */
-    @TableField("scene_dec")
-    private String sceneDec;
-
-    /**
-     * 场景的链接地址
-     */
-    @TableField("web_site")
-    private String webSite;
-
-    /**
-     * 场景缩略图
-     */
-    @TableField("thumb")
-    private String thumb;
-
-    /**
-     * 用户表t_user的id
-     */
-    @TableField("user_id")
-    private Long userId;
-
-    /**
-     * 相机主表t_camera的id
-     */
-    @TableField("camera_id")
-    private Long cameraId;
-
-    /**
-     * 场景logo
-     */
-    @TableField("scene_logo")
-    private String sceneLogo;
-
-    /**
-     * 大场景序号
-     */
-    @TableField("scene_code")
-    private String sceneCode;
-
-    /**
-     * 0-其他,1-文博,2-地产,3-电商,4-餐饮,5-家居,99-一件换装虚拟房源
-     */
-    @TableField("scene_type")
-    private Integer sceneType;
-
-    /**
-     * 浏览次数
-     */
-    @TableField("view_count")
-    private Integer viewCount;
-
-    /**
-     * 拍摄数量
-     */
-    @TableField("shoot_count")
-    private Integer shootCount;
-
-    /**
-     * 点位视频
-     */
-    @TableField("videos")
-    private String videos;
-
-    /**
-     * 要gps定位
-     */
-    @TableField("gps")
-    private String gps;
-
-    /**
-     * 方案:1-双目,2-转台,3-六目,4-八目,10-获取4k图,11-获取2k,12-获取1k
-     */
-    @TableField("scene_scheme")
-    private Integer sceneScheme;
-
-    /**
-     * 记录的状态,A: 生效,I: 禁用
-     */
-    @TableField("rec_status")
-    private String recStatus;
-
-    /**
-     * 算法类型(V2,V3)
-     */
-    @TableField("build_type")
-    private String buildType;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 0-有效,1-删除
-     */
-    @TableField("tb_status")
-    private Integer tbStatus;
-
-
-}

+ 0 - 176
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/entity/SceneProEdit.java

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

+ 0 - 164
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/entity/SceneProEditExt.java

@@ -1,164 +0,0 @@
-package com.fdkankan.modeling.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * pro场景编辑数据表
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Getter
-@Setter
-@TableName("t_scene_pro_edit_ext")
-public class SceneProEditExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * pro场景编辑数据表id
-     */
-    @TableField("pro_edit_id")
-    private Long proEditId;
-
-    /**
-     * 小地图浏览
-     */
-    @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("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 0-有效,1-删除
-     */
-    @TableField("tb_status")
-    private Integer tbStatus;
-
-
-}

+ 0 - 137
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/entity/SceneProExt.java

@@ -1,137 +0,0 @@
-package com.fdkankan.modeling.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * pro场景表
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Getter
-@Setter
-@TableName("t_scene_pro_ext")
-public class SceneProExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 外键id,t_scene_pro_id
-     */
-    @TableField("scene_pro_id")
-    private Long sceneProId;
-
-    /**
-     * 0表示未建好,1表示建好,-1表示出错,-2表示不要在官网上显示
-     */
-    @TableField("scene_status")
-    private Integer sceneStatus;
-
-    /**
-     * 原始的大场景数据(七牛)
-     */
-    @TableField("data_source")
-    private String dataSource;
-
-    /**
-     * 0表示未付款,1表示付款了,-1表示欠费,-2表示容量不足
-     */
-    @TableField("pay_status")
-    private Integer payStatus;
-
-    /**
-     * 手机id
-     */
-    @TableField("phone_id")
-    private String phoneId;
-
-    /**
-     * 1表示推荐,0表示正常
-     */
-    @TableField("recommend")
-    private Integer recommend;
-
-    /**
-     * 所有资源文件名
-     */
-    @TableField("files_name")
-    private String filesName;
-
-    /**
-     * 算法类型
-     */
-    @TableField("algorithm")
-    private String algorithm;
-
-    /**
-     * 服务器的服务商
-     */
-    @TableField("ecs")
-    private String ecs;
-
-    /**
-     * 使用容量
-     */
-    @TableField("space")
-    private Long space;
-
-    /**
-     * 固件版本
-     */
-    @TableField("firmware_version")
-    private String firmwareVersion;
-
-    /**
-     * 计算时间(秒为单位)
-     */
-    @TableField("compute_time")
-    private Long computeTime;
-
-    /**
-     * 场景来源,相机拍摄10以内表示,1表示八目,2双目,3转台,4 激光  其他来源10以上,11:一键换装,12:123看房,13文通虚拟场景
-     */
-    @TableField("scene_source")
-    private Integer sceneSource;
-
-    /**
-     * 大场景序号(随心装场景码)
-     */
-    @TableField("vrnum")
-    private String vrnum;
-
-    @TableField("unicode")
-    private String unicode;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 0-有效,1-删除
-     */
-    @TableField("tb_status")
-    private Integer tbStatus;
-
-
-}

+ 0 - 66
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/feign/UserFeign.java

@@ -1,66 +0,0 @@
-package com.fdkankan.modeling.feign;
-
-import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.modeling.entity.ScenePro;
-import com.fdkankan.modeling.entity.SceneProExt;
-import com.fdkankan.modeling.service.ISceneProExtService;
-import com.fdkankan.modeling.service.ISceneProService;
-import com.fdkankan.platform.api.feign.PlatformClient;
-import com.fdkankan.platform.api.vo.CameraDetail;
-import com.fdkankan.platform.api.vo.User;
-import com.fdkankan.platform.api.vo.UserIncrement;
-import com.fdkankan.common.response.ResultData;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-@Slf4j
-public class UserFeign {
-
-    @Resource
-    private PlatformClient platformClient;
-    @Autowired
-    private ISceneProService sceneProService;
-    @Autowired
-    private ISceneProExtService sceneProExtService;
-
-    public User findByUserName(String userName) {
-        ResultData resultData  = platformClient.getUserByName(userName);
-        if(resultData.getCode() != 200 && resultData.getData()==null){
-            return null;
-        }
-        Object userData = resultData.getData();
-        return JSONObject.parseObject(JSONObject.toJSONString(userData), User.class);
-    }
-
-    public int updateUserUsedSpaceBySceneNum(String projectNum) {
-        ScenePro sceneProEntity = sceneProService.findBySceneNum(projectNum);
-        if(sceneProEntity == null) {
-            log.info("该场景不存在无法扣除容量,场景码为:" + projectNum);
-            return -1;
-        }
-        SceneProExt sceneProExt = sceneProExtService.getBySceneProId(sceneProEntity.getId());
-        ResultData resultData = platformClient.updateCameraDetailByCameraIdAndSpace(sceneProEntity.getCameraId(), sceneProExt.getSpace());
-        if(resultData.getCode() != 200){
-            log.info("调用platform服务updateCameraDetailByCameraIdAndSpace失败,参数{},{}" ,sceneProEntity.getCameraId(), sceneProExt.getSpace());
-            return -1;
-        }
-        CameraDetail detailEntity = JSONObject.parseObject(JSONObject.toJSONString(resultData.getData()), CameraDetail.class);
-
-        ResultData<UserIncrement> byCameraId = platformClient.getUserIncrementByCameraId(sceneProEntity.getCameraId());
-        if(byCameraId == null || byCameraId.getData() == null || byCameraId.getData().getIsExpired() == 1){
-            // 新上传的场景,如果总容量小于使用容量,则该大场景保留在临时存储空间30天
-            if (detailEntity.getTotalSpace().compareTo(detailEntity.getUsedSpace()) == -1){
-                List<Long> ids = new ArrayList<>();
-                ids.add(sceneProEntity.getId());
-                sceneProService.tempScenes(ids);
-            }
-        }
-        return 0;
-    }
-}

+ 0 - 18
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/mapper/ISceneExtMapper.java

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

+ 0 - 18
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/mapper/ISceneFileBuildMapper.java

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

+ 0 - 18
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/mapper/ISceneMapper.java

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

+ 0 - 18
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/mapper/ISceneProEditExtMapper.java

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

+ 0 - 18
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/mapper/ISceneProEditMapper.java

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

+ 0 - 18
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/mapper/ISceneProExtMapper.java

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

+ 0 - 18
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/mapper/ISceneProMapper.java

@@ -1,18 +0,0 @@
-package com.fdkankan.modeling.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.modeling.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> {
-
-}

+ 4 - 12
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/receiver/BuildSceneMQListener.java

@@ -4,23 +4,20 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.common.constant.ConstantFilePath;
+import com.fdkankan.common.constant.ConstantUrl;
+import com.fdkankan.common.util.*;
 import com.fdkankan.common.util.ComputerUtil;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
-import com.fdkankan.modeling.constants.RedisKey;
 import com.fdkankan.modeling.constants.SysConstants;
-import com.fdkankan.modeling.entity.SceneFileBuild;
 import com.fdkankan.modeling.push.PushMessageConfig;
 import com.fdkankan.modeling.utils.DingDingUtils;
 import com.fdkankan.modeling.utils.PushMsgUtil;
 import com.fdkankan.mq.message.BuildSceneMqMessage;
 import com.fdkankan.mq.message.BuildSceneResultMqMessage;
 import com.fdkankan.mq.util.RocketMQProducer;
+import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.common.constant.ConstantFilePath;
-import com.fdkankan.common.constant.ConstantUrl;
-import com.fdkankan.common.util.CreateObjUtil;
-import com.fdkankan.common.util.FileUtil;
-import com.fdkankan.common.util.FileUtils;
 import com.taobao.api.ApiException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -173,7 +170,6 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
     private void buildScene(BuildSceneMqMessage message){
         boolean buildSuccess = Boolean.FALSE;
         String projectNum = null;
-        SceneFileBuild sceneFileBuildEntity = null;
         Long computeTime = null;//计算耗时
         com.alibaba.fastjson.JSONObject videosJson = null;
         buildSceneResultTopic = StrUtil.isNotBlank(message.getResultReceiverMqName()) ?
@@ -482,10 +478,6 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
                 scenejson.put("videos", videosJson.toJSONString());
                 FileUtils.writeFile(dataBuffer.toString() + "scene.json", scenejson.toString());
 
-                if (sceneFileBuildEntity != null){
-                    sceneFileBuildEntity.setBuildStatus(3);
-                }
-
                 //根据data.fdage推送计算完成的消息
                 log.info("推送消息,渠道是 {}, 手机token是 {}", dataJson.get("pushChannel"), dataJson.get("pushToken"));
                 if(dataJson.containsKey("pushChannel") && dataJson.containsKey("pushToken")){

+ 0 - 680
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/receiver/BuildSceneReceiver.java

@@ -1,680 +0,0 @@
-//package com.fdkankan.modeling.receiver;
-//
-//import cn.hutool.core.date.DateUtil;
-//import com.alibaba.fastjson.JSONArray;
-//import com.alibaba.fastjson.JSONObject;
-//import com.fdkankan.common.util.ComputerUtil;
-//import com.fdkankan.modeling.constants.RedisKey;
-//import com.fdkankan.modeling.constants.SysConstants;
-//import com.fdkankan.modeling.entity.SceneFileBuild;
-//import com.fdkankan.modeling.entity.ScenePro;
-//import com.fdkankan.modeling.entity.SceneProExt;
-//import com.fdkankan.modeling.feign.UserFeign;
-//import com.fdkankan.modeling.push.PushMessageConfig;
-//import com.fdkankan.modeling.service.ISceneFileBuildService;
-//import com.fdkankan.modeling.service.ISceneProExtService;
-//import com.fdkankan.modeling.service.ISceneProService;
-//import com.fdkankan.modeling.service.ISceneService;
-//import com.fdkankan.modeling.utils.DingDingUtils;
-//import com.fdkankan.modeling.utils.PushMsgUtil;
-//import com.fdkankan.mq.message.BuildSceneMqMessage;
-//import com.fdkankan.common.util.UploadToOssUtil;
-//import com.fdkankan.platform.api.vo.User;
-//import com.fdkankan.redis.util.RedisUtil;
-//import com.fdkankan.common.constant.ConstantFilePath;
-//import com.fdkankan.common.constant.ConstantUrl;
-//import com.fdkankan.common.utils.CreateObjUtil;
-//import com.fdkankan.common.utils.FileUtil;
-//import com.fdkankan.common.utils.FileUtils;
-//import com.taobao.api.ApiException;
-//import lombok.extern.log4j.Log4j2;
-//import org.apache.commons.lang3.StringUtils;
-//import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
-//import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
-//import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently;
-//import org.apache.rocketmq.common.message.MessageExt;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-//import org.springframework.data.redis.core.RedisTemplate;
-//import org.springframework.stereotype.Component;
-//import org.springframework.util.CollectionUtils;
-//import org.springframework.util.ObjectUtils;
-//import org.springframework.web.client.RestTemplate;
-//
-//import javax.annotation.Resource;
-//import java.io.*;
-//import java.security.InvalidKeyException;
-//import java.security.NoSuchAlgorithmException;
-//import java.time.Duration;
-//import java.time.temporal.ChronoUnit;
-//import java.util.Date;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//import java.util.concurrent.*;
-//
-//import static com.fdkankan.modeling.push.PushMessageConfig.*;
-//
-//
-//@Log4j2
-//@Component
-//@ConditionalOnProperty(name = "rabbitmq.queue.enable",havingValue = "true")
-//public class BuildSceneReceiver implements MessageListenerConcurrently {
-//
-//    @Autowired
-//    private ISceneService sceneService;
-//    @Autowired
-//    private ISceneProService sceneProService;
-//    @Autowired
-//    private UserFeign userFeign;
-//    @Autowired
-//    private ISceneFileBuildService sceneFileBuildService;
-//
-//    @Autowired
-//    private ISceneProExtService sceneProExtService;
-//
-//    @Autowired
-//    RedisUtil redisUtil;
-//    @Autowired
-//    RedisTemplate redisTemplate;
-//
-//    private RestTemplate restTemplate = new RestTemplate();
-//
-//    @Value("${4dkk.laserService.host}")
-//    private String laserHost;
-//
-//    @Value("${oss.type}")
-//    private String ossType;
-//
-//    @Value("${oss.url.prefix}")
-//    private String prefixAli;
-//
-//
-//    @Resource
-//    private UploadToOssUtil uploadUtils;
-//
-//    @Override
-//    public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgExt,
-//                                                    ConsumeConcurrentlyContext consumeConcurrentlyContext) {
-//        if (CollectionUtils.isEmpty(msgExt)) {
-//            log.error("消息内容为空,退出构建,当前服务器id:{}", SysConstants.hostName);
-//            return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
-//        }
-//        MessageExt messageExt = msgExt.get(0);
-//        BuildSceneMqMessage message = JSONObject.parseObject(messageExt.getBody(), BuildSceneMqMessage.class);
-//        log.info("开始处理消息,消息队列:{},消息内容:{}", consumeConcurrentlyContext.getMessageQueue().getTopic(),
-//                JSONObject.toJSONString(message));
-//        process(message);
-//        return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
-//    }
-//
-//    public void process(BuildSceneMqMessage message) {
-//        final ExecutorService exec = Executors.newFixedThreadPool(1);
-//        Callable<String> call = (Callable<String>) () -> {
-//            //开始执行耗时操作
-//            try {
-//                String key = RedisKey.SCENE_BUILDING + message.getSceneNum();
-//                // 获取缓存锁,防止重复消费
-//                Long building = redisUtil.incr(key, 1);
-//                if (building.compareTo(1L) != 0) {
-//                    log.error("场景正在构建中,退出构建,当前服务器id:{},参数:{}", SysConstants.hostName, JSONObject.toJSONString(message));
-//                } else {
-//                    redisTemplate.expire(key, Duration.of(SysConstants.modelTimeOut, ChronoUnit.HOURS));
-//                }
-//                //休眠2秒等待数据入库
-//                Thread.sleep(2000L);
-//                try {
-//                    FileUtils.writeFile("/opt/hosts/running.txt", DateUtil.formatDateTime(new Date()));
-//                    String tomcatLog = "scenenum:" + message.getSceneNum() + "\ntime:" + DateUtil.formatDateTime(new Date()) +
-//                            " action:create hostname:" + SysConstants.hostName;
-//                    //打开一个写文件器,构造函数中的第二个参数true表示以追加形式写文件
-//                    FileWriter writer = new FileWriter("/mnt/elastic_log/tomcat" + "_" + message.getSceneNum() + ".log", true);
-//                    writer.write(tomcatLog);
-//                    writer.close();
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                }
-//
-//                buildScene(message);
-//                redisUtil.del(key);
-//                try {
-//                    FileUtils.deleteFile("/opt/hosts/running.txt");
-//                    String tomcatLog = "scenenum:" + message.getSceneNum() + "\ntime:" + DateUtil.formatDateTime(new Date()) +
-//                            " action:delete hostname:" + SysConstants.hostName;
-//                    //打开一个写文件器,构造函数中的第二个参数true表示以追加形式写文件
-//                    FileWriter writer = new FileWriter("/mnt/elastic_log/tomcat" + "_" + message.getSceneNum() + "log", true);
-//                    writer.write(tomcatLog);
-//                    writer.close();
-//                } catch (Exception e) {
-//                    e.printStackTrace();
-//                }
-//            } catch (Exception e) {
-//                e.printStackTrace();
-//                sceneService.updateStatus(message.getSceneNum(), -1);
-//                BuildSceneReceiver.this.handFail("计算失败", message);
-//            }
-//            log.info("场景生成好了***");
-//            return "success";
-//        };
-//        Future<String> future = exec.submit(call);
-//        try {
-//            future.get(SysConstants.modelTimeOut, TimeUnit.HOURS); //任务处理超时时间设为 24个小时
-//        } catch (TimeoutException ex) {
-//            ex.printStackTrace();
-//            StringWriter trace=new StringWriter();
-//            ex.printStackTrace(new PrintWriter(trace));
-//            log.error("超时了");
-//            log.error(trace.toString());
-//            FileUtils.deleteFile("/opt/hosts/running.txt");
-//            future.cancel(true);
-//            handFail("计算超时",message);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            StringWriter trace=new StringWriter();
-//            e.printStackTrace(new PrintWriter(trace));
-//            log.error(trace.toString());
-//            FileUtils.deleteFile("/opt/hosts/running.txt");
-//            future.cancel(true);
-//            handFail("计算失败",message);
-//        }
-//
-//    }
-//
-//    private void buildScene(BuildSceneMqMessage message){
-//        String projectNum = null;
-//        SceneFileBuild sceneFileBuildEntity = null;
-//        ScenePro scene = null;
-//        SceneProExt sceneProExt = null;
-//        try{
-//            if(StringUtils.equals(message.getIsStandardization(),"1")){
-//                //表示标定算法
-//                ComputerUtil.computerCalibration(message.getPath());
-//                return;
-//            }
-//
-//            String unicode = message.getUnicode();
-//            String path = message.getPath();
-//            String prefix = message.getPrefix();
-//            String imgsName = message.getImgsName();
-//            projectNum = message.getSceneNum();
-//            String userName = message.getUserName();
-//            //不同的相机不同的方法
-//            String cameraType = message.getCameraType();
-//            String algorithm = message.getAlgorithm();
-//            String fileId = message.getFileId();
-//            String cameraName = message.getCameraName();
-//            //0表示有4k图,1表示没有
-//            String resolution = message.getResolution();
-//
-//            //判断调用V2还是V3版本的算法
-//            String buildType = ObjectUtils.isEmpty(message.getBuildType()) ? "V2" : message.getBuildType();
-//
-//
-//            log.info("执行数据库操作--前");
-//            // TODO: 2022/1/6 这里从消息体中取出
-//            sceneFileBuildEntity = sceneFileBuildService.findByFileId(fileId);
-//            log.info("执行数据库操作--后");
-//
-//            Map<String, String> dataMap = ComputerUtil.getTypeString(cameraType, algorithm,
-//                    resolution);
-//            String splitType = dataMap.get("splitType");
-//            String skyboxType = dataMap.get("skyboxType");
-//            String dataDescribe = dataMap.get("dataDescribe");
-//
-//            log.info("用的算法是:"+algorithm);
-//            log.info("用的相机是:"+ (Integer.parseInt(cameraType) < 4 ? "单球目" : "双球目(八目)"));
-//            Map<String,String> map = new HashMap<>();
-//
-//            //该场景使用的容量
-//            Long space = 0L;
-//            //支付状态
-//            int payStatus = 0;
-//            //4表示硬件部研发的双球目相机,其余为旧版本相机
-//            if(Integer.parseInt(cameraType) < 3){
-//
-//                for(int i = 0;i<5;++i){
-//                    try{
-//                        FileUtils.downLoadFromUrl(prefix+imgsName+"?m="+new Date().getTime(), imgsName,
-//                                path + File.separator + "capture");
-//                        FileUtils.decompress(path + File.separator + "capture" +File.separator+imgsName,
-//                                path + File.separator + "capture") ;
-//                        break;
-//                    }
-//                    catch(Exception e){
-//                        e.printStackTrace();
-//                        StringWriter trace=new StringWriter();
-//                        e.printStackTrace(new PrintWriter(trace));
-//                        log.error(trace.toString());
-//                        if(i<4)
-//                        {
-//                            FileUtils.deleteFile(path + File.separator + "capture" +File.separator+imgsName);
-//                            FileUtils.delFolder(path + File.separator + "capture" +File.separator+"images");
-//                        }
-//                        Thread.sleep(10000);
-//                    }
-//                }
-//
-//                FileUtils.deleteFile(path + File.separator + "capture" +File.separator+"zip.Zip");
-//
-//                String data = FileUtils.readFile(path + File.separator + "capture" +File.separator+"data.fdage");
-//                JSONObject dataJson = new JSONObject();
-//                if(data!=null){
-//                    dataJson = JSONObject.parseObject(data);
-//                    if(dataJson.containsKey("imgs")){
-//                        splitType = "SPLIT_V4";
-//                    }
-//                }
-//                //生成project.json和data.json供算法部使用
-//                ComputerUtil.createJson(path, splitType, skyboxType, dataDescribe, projectNum, path);
-//                //计算模型并返回需要上传oss的文件集合
-//                map = ComputerUtil.computer(projectNum, path, buildType);
-//
-//                uploadUtils.uploadMulFiles(map);
-//                log.info("双目上完oss结束修改数据:"+projectNum);
-//                sceneService.updateTime(projectNum, space, payStatus);
-//            } else {
-//
-//                //休眠1秒,否则可能获取不到场景资源
-//                Thread.sleep(1000);
-//                scene = sceneProService.findBySceneNum(projectNum);
-//                sceneProExt = sceneProExtService.getBySceneProId(scene.getId());
-//                if(scene == null){
-//                    log.info(projectNum + ":场景不存在");
-//                    handFail("场景不存在",message);
-//                    return;
-//                }
-//
-//                long start = System.currentTimeMillis();
-//
-//                //cameraType=5为新版本双目, cameraType=6为小红屋新版本双目
-//                if(Integer.parseInt(cameraType) == 5 || Integer.parseInt(cameraType) == 6){
-//                    path = ConstantFilePath.BUILD_MODEL_PATH + unicode;
-//
-//                    //下载zip包,并解压
-//                    FileUtils.downLoadFromUrl(prefix + "/" + imgsName + "?m=" + System.currentTimeMillis(), imgsName, path + File.separator + "capture");
-//                    FileUtils.decompress(path + File.separator + "capture" + File.separator + imgsName,
-//                            path + File.separator + "capture") ;
-//                    FileUtil.delFile(path + File.separator + "capture" + File.separator + imgsName);
-//                }else if(Integer.parseInt(cameraType) == 14 ) {
-//                    CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + cameraName.replace("4DKKPRO_", "")
-//                                    .replace("-fdage", "").toLowerCase() + File.separator + fileId + File.separator
-//                                    + unicode + File.separator,
-//                            ConstantFilePath.BUILD_MODEL_LASER_PATH + cameraName.replace("4DKKPRO_", "")
-//                                    .replace("-fdage", "").toLowerCase() + File.separator + fileId + File.separator
-//                                    + unicode + File.separator + "capture");
-//                    path = ConstantFilePath.BUILD_MODEL_LASER_PATH + cameraName.replace("4DKKPRO_", "").replace("-fdage", "").toLowerCase() + File.separator + fileId + File.separator + unicode;
-//                } else if(Integer.parseInt(cameraType) >= 4 ) {
-//                    CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + cameraName.replace("4DKKPRO_", "")
-//                            .replace("-fdage", "").toLowerCase() + File.separator + fileId + File.separator
-//                            + unicode + File.separator,
-//                            ConstantFilePath.BUILD_MODEL_PATH + cameraName.replace("4DKKPRO_", "")
-//                                    .replace("-fdage", "").toLowerCase() + File.separator + fileId + File.separator
-//                                    + unicode + File.separator + "capture");
-//                    path = ConstantFilePath.BUILD_MODEL_PATH + cameraName.replace("4DKKPRO_", "").replace("-fdage", "").toLowerCase() + File.separator + fileId + File.separator + unicode;
-//                }
-//                String data = FileUtils.readFile(path + File.separator + "capture" +File.separator+"data.fdage");
-//                //获取data.fdage的内容
-//                JSONObject dataJson = new JSONObject();
-//                if(data!=null){
-//                    dataJson = JSONObject.parseObject(data);
-//                }
-//                //判断是否计算过资源,若计算过删除缓存
-//                File caches = new File(path + File.separator + "caches");
-//                if(caches.exists()){
-//                    for(File deleteFile : caches.listFiles()){
-//                        if(new File(path + "_images").exists()){
-//                            if(deleteFile.isDirectory()){
-//                                FileUtils.delAllFile(deleteFile.getAbsolutePath());
-//                            }else {
-//                                FileUtils.deleteFile(deleteFile.getAbsolutePath());
-//                            }
-//                        }
-//                        else if(!deleteFile.getAbsolutePath().contains("images")){
-//                            if(deleteFile.isDirectory()){
-//                                FileUtils.delAllFile(deleteFile.getAbsolutePath());
-//                            }else {
-//                                FileUtils.deleteFile(deleteFile.getAbsolutePath());
-//                            }
-//                        }
-//                    }
-//                }
-//                if(new File(path + File.separator + "results").exists()){
-//                    FileUtils.delAllFile(path + File.separator + "results");
-//                }
-//
-//                //生成project.json和data.json供算法部使用
-//                log.info("path:" + path);
-//
-//                if(dataJson.containsKey("videoVersion") && StringUtils.isNotEmpty(dataJson.getString("videoVersion")) && Integer.parseInt(dataJson.getString("videoVersion")) < 4){
-//                    //v2版本使用4k算法
-//                    skyboxType = "SKYBOX_V6";
-//                }
-//
-//                ComputerUtil.createJson(path, splitType, skyboxType, dataDescribe, projectNum, path);
-//                //计算模型并返回需要上传oss的文件集合
-//                map = ComputerUtil.computer(projectNum, path, buildType);
-//
-//                if(Integer.parseInt(cameraType) == 5 || Integer.parseInt(cameraType) == 6){
-//                    map.put(path + File.separator + "capture/stitch_params.txt", "data/data" + projectNum + "/stitch_params.txt");
-//                }
-//                map.put(path + File.separator + "capture/Up.xml", "data/data" + projectNum + "/Up.xml");
-//                map.put(path + File.separator + "capture/Up2.xml", "data/data" + projectNum + "/Up2.xml");
-//
-//                if(Integer.parseInt(cameraType) == 13){
-//                    //转台相机
-//                    map.put(path + File.separator + "capture/Up.txt", "data/data" + projectNum + "/Up.txt");
-//                    map.put(path + File.separator + "capture/Up2.txt", "data/data" + projectNum + "/Up2.txt");
-//                }
-//
-//                uploadUtils.uploadMulFiles(map);
-//                payStatus = 1;
-//
-//                File spaceFile = null;
-//                for (String key : map.keySet()) {
-//                    spaceFile = new File(key);
-//                    if(spaceFile.exists()){
-//                        space += spaceFile.length();
-//                    }
-//                }
-//
-//                log.info("八目上完oss结束修改数据:"+projectNum);
-//
-//                //获取upload中的video视频名称
-//                String uploadData = FileUtils.readFile(path + File.separator + "results" +File.separator+"upload.json");
-//                com.alibaba.fastjson.JSONObject uploadJson = null;
-//                JSONArray array = null;
-//                if(uploadData!=null) {
-//                    uploadJson = com.alibaba.fastjson.JSONObject.parseObject(uploadData);
-//                    array = uploadJson.getJSONArray("upload");
-//                }
-//                com.alibaba.fastjson.JSONObject fileJson = null;
-//                String fileName = "";
-//
-//                //读取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 = com.alibaba.fastjson.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"));
-//                        }
-//                    }
-//                }
-//
-//                //计算ts文件的大小,并拼接成json格式
-//                JSONArray jsonArray = new JSONArray();
-//                com.alibaba.fastjson.JSONObject videoJson = null;
-//                com.alibaba.fastjson.JSONObject videosJson = new com.alibaba.fastjson.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 com.alibaba.fastjson.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(dataJson.containsKey("videoVersion") && StringUtils.isNotEmpty(dataJson.getString("videoVersion")) && Integer.parseInt(dataJson.getString("videoVersion")) >= 4){
-//                    videosJson.put("version", 3);
-//                    if("oss".equals(ossType)){
-//                        videosJson.put("upPath", prefixAli + "data/data" + projectNum + "/Up.xml");
-//                    }
-//                    if("s3".equals(ossType)){
-//                        videosJson.put("upPath", ConstantUrl.PREFIX_AWS + "data/data" + projectNum + "/Up.xml");
-//                    }
-//                    if(Integer.parseInt(cameraType) == 13){
-//                        //转台相机
-//                        videosJson.put("upPath", videosJson.getString("upPath").replace(".xml", ".txt"));
-//                    }
-//                }else {
-//                    videosJson.put("version", 1);
-//                    if("oss".equals(ossType)){
-//                        videosJson.put("upPath", prefixAli + "data/data" + projectNum + "/Up2.xml");
-//                    }
-//                    if("s3".equals(ossType)){
-//                        videosJson.put("upPath", ConstantUrl.PREFIX_AWS + "data/data" + projectNum + "/Up2.xml");
-//                    }
-//
-//                    if(Integer.parseInt(cameraType) == 13){
-//                        //转台相机
-//                        videosJson.put("upPath", videosJson.getString("upPath").replace(".xml", ".txt"));
-//                    }
-//                }
-//
-//                if(Integer.parseInt(cameraType) == 5 || Integer.parseInt(cameraType) == 6){
-//                    videosJson.put("version", 1);
-//                    if("oss".equals(ossType)){
-//                        videosJson.put("upPath", prefixAli + "data/data" + projectNum + "/stitch_params.txt");
-//                    }
-//                    if("s3".equals(ossType)){
-//                        videosJson.put("upPath", ConstantUrl.PREFIX_AWS + "data/data" + projectNum + "/stitch_params.txt");
-//                    }
-//                }
-//
-//                long computeTime = (System.currentTimeMillis() - start) / 1000;
-//                sceneProService.updateTime(projectNum, space, payStatus, videosJson.toJSONString(), computeTime);
-//
-//                //更新scene.json里面的video数据
-//                StringBuffer dataBuf = new StringBuffer()
-//                        .append("data").append(File.separator)
-//                        .append("data").append(projectNum)
-//                        .append(File.separator);
-//                StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
-//                String strsceneInfos = FileUtils.readFile(dataBuffer.toString() + "scene.json");
-//                com.alibaba.fastjson.JSONObject scenejson = new com.alibaba.fastjson.JSONObject();
-//                if(strsceneInfos!=null){
-//                    scenejson = com.alibaba.fastjson.JSONObject.parseObject(strsceneInfos);
-//                }
-//                scenejson.put("videos", videosJson.toJSONString());
-//                FileUtils.writeFile(dataBuffer.toString() + "scene.json", scenejson.toString());
-//
-//                User userEntity = userFeign.findByUserName(userName);
-//                if(userEntity == null){
-//                    userFeign.updateUserUsedSpaceBySceneNum(null, projectNum);
-//                }else {
-//                    userFeign.updateUserUsedSpaceBySceneNum(userEntity.getId(), projectNum);
-//                }
-//                if (sceneFileBuildEntity != null){
-//                    sceneFileBuildEntity.setBuildStatus(3);
-//                    sceneFileBuildService.updateById(sceneFileBuildEntity);
-//                }
-//
-//                //根据data.fdage推送计算完成的消息
-//                log.info("推送消息,渠道是 {}, 手机token是 {}", dataJson.get("pushChannel"), dataJson.get("pushToken"));
-//                if(dataJson.containsKey("pushChannel") && dataJson.containsKey("pushToken")){
-//                    try{
-//                        if(!"s3".equals(ossType)){
-//                            PushMessageConfig demo = null;
-//                            if(dataJson.getIntValue("pushChannel") == 0){
-//
-//                                if(Integer.parseInt(cameraType) == 10 || Integer.parseInt(cameraType) == 13){
-//                                    //ios
-//                                    log.info("IOS_KEY:{}, IOS_SECRET:{}", IOS_KEY_Z, IOS_SECRET_Z);
-//                                    demo = new PushMessageConfig(IOS_KEY_Z, IOS_SECRET_Z);
-//                                    demo.sendIOSUnicast(dataJson.getString("pushToken"),
-//                                            "四维看看Minion", scene.getSceneName() + "计算完成", "您上传的" + scene.getSceneName() + "计算完成,点击查看",
-//                                            scene.getWebSite());
-//                                }else {
-//                                    //ios
-//                                    log.info("IOS_KEY:{}, IOS_SECRET:{}", IOS_KEY, IOS_SECRET);
-//                                    demo = new PushMessageConfig(IOS_KEY, IOS_SECRET);
-//                                    demo.sendIOSUnicast(dataJson.getString("pushToken"),
-//                                            "四维看看Pro", scene.getSceneName() + "计算完成", "您上传的" + scene.getSceneName() + "计算完成,点击查看",
-//                                            scene.getWebSite());
-//                                }
-//
-//                            }else {
-//                                if(Integer.parseInt(cameraType) == 10 || Integer.parseInt(cameraType) == 13){
-//                                    //ios
-//                                    //安卓
-//                                    log.info("ANDROID_KEY:{}, ANDROID_SECRET:{}", ANDROID_KEY_Z, ANDROID_SECRET_Z);
-//                                    demo = new PushMessageConfig(ANDROID_KEY_Z, ANDROID_SECRET_Z);
-//                                    demo.sendAndroidUnicast2(dataJson.getString("pushToken"),
-//                                            "四维看看Minion", scene.getSceneName() + "计算完成", "您上传的" + scene.getSceneName() + "计算完成,点击查看",
-//                                            scene.getWebSite());
-//                                }else {
-//                                    //安卓
-//                                    log.info("ANDROID_KEY:{}, ANDROID_SECRET:{}", ANDROID_KEY, ANDROID_SECRET);
-//                                    demo = new PushMessageConfig(ANDROID_KEY, ANDROID_SECRET);
-//                                    demo.sendAndroidUnicast(dataJson.getString("pushToken"),
-//                                            "四维看看Pro", scene.getSceneName() + "计算完成", "您上传的" + scene.getSceneName() + "计算完成,点击查看",
-//                                            scene.getWebSite());
-//                                }
-//                            }
-//
-//                        }else {
-//                            PushMsgUtil.googlePushMsg(dataJson.getString("pushToken"),
-//                                    scene.getSceneName() + "计算完成", "您上传的" + scene.getSceneName() + "计算完成,点击查看",
-//                                    scene.getWebSite());
-//                        }
-//                        log.info("消息推送结束!");
-//                    }catch (Exception e){
-//                        log.info("推送消息失败:");
-//                        e.printStackTrace();
-//                    }
-//                }
-//
-//                //计算成功  激光转台相机推送
-//                log.info("激光转台相机 同步 请求 ");
-//                if(Integer.parseInt(cameraType) == 14){
-//                    try {
-//                        String title = "";
-//                        if(StringUtils.isNotEmpty(scene.getSceneName())){
-//                            title = scene.getSceneName();
-//                        }
-//                        String dataSource = sceneProExt.getDataSource();
-//                        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());
-//
-//                        CreateObjUtil.cpfile(dataSource  + "/results/laserData/cover", jgPath+"/extras/");
-//                        CreateObjUtil.cplaserfile(dataSource  + "/results/laserData", jgPath+File.separator);
-//
-//                        //激光相机
-//                        String url = laserHost+"/indoor/{sceneCode}/api/init?path="
-//                                        + jgPath + File.separator + "laserData" + "&title="+ title
-//                                        + "&childName=" + cameraName + "&createTime=" + scene.getCreateTime()
-//                                        + "&snCode="+ cameraName;
-//
-//                        if(scene.getUserId()!=null){
-//                            url = url + "&userId=" + scene.getUserId();
-//                        }
-//
-//                        if(StringUtils.isNotEmpty(userName)){
-//                            url = url + "&phone=" + userName;
-//                        }
-//
-//                        url = url.replace("{sceneCode}",scene.getSceneCode());
-//                        log.info("激光转台相机 同步 :" + url);
-//                        com.alibaba.fastjson.JSONObject hotListJson =
-//                                com.alibaba.fastjson.JSONObject.parseObject(restTemplate.getForObject(url,String.class));
-//                        log.info("激光转台相机 同步结束 :" + hotListJson);
-//                    }catch (Exception e){
-//                        e.printStackTrace();
-//                        handFail("激光转台相机同步失败",message);
-//                    }
-//                }
-//            }
-//
-//            CreateObjUtil.deleteFile(path.replace(ConstantFilePath.BUILD_MODEL_PATH, "/") + "/capture");
-//        } catch(Exception e){
-//            log.error("计算大场景失败"+projectNum);
-//            sceneService.updateStatus(projectNum, -1);
-//            if (sceneFileBuildEntity != null){
-//                sceneFileBuildEntity.setBuildStatus(-1);
-//                sceneFileBuildService.updateById(sceneFileBuildEntity);
-//            }
-//            e.printStackTrace();
-//            StringWriter trace=new StringWriter();
-//            e.printStackTrace(new PrintWriter(trace));
-//            log.error(trace.toString());
-//            handFail("计算失败",message);
-//        }finally {
-//            try{
-//                scene = sceneProService.findBySceneNum(projectNum);
-//                if(scene != null){
-//                    com.alibaba.fastjson.JSONObject statusJson = new com.alibaba.fastjson.JSONObject();
-//                    //临时将-2改成1,app还没完全更新
-//                    int status = sceneProExt.getSceneStatus();
-//                    if(status == -2){
-//                        status = 1;
-//                    }else if(status == -1){
-//                        // 失败状态不予显示到客户端
-//                        status = 0;
-//                    }
-//                    statusJson.put("status", status);
-//                    statusJson.put("webSite", scene.getWebSite());
-//                    statusJson.put("sceneNum", scene.getSceneCode());
-//                    statusJson.put("thumb", scene.getThumb());
-//                    statusJson.put("payStatus", sceneProExt.getPayStatus());
-//                    FileUtils.writeFile(ConstantFilePath.SCENE_PATH+"data/data"+projectNum+File.separator+"status.json", statusJson.toString());
-//                    uploadUtils.upload(ConstantFilePath.SCENE_PATH+"data/data"+projectNum+File.separator+"status.json",
-//                            "data/data"+projectNum+File.separator+"status.json");
-//
-//                    //上送日志
-//                    uploadUtils.upload(sceneProExt.getDataSource()+File.separator+"console.log",
-//                            "build_log/"+scene.getSceneCode()+File.separator+"console.log");
-//
-//
-//                }
-//            }catch (Exception e){
-//                e.printStackTrace();
-//            }
-//        }
-//    }
-//
-//    private void handFail(String reason,BuildSceneMqMessage message){
-//        String serverPath = message.getPath().substring(0,message.getPath().lastIndexOf("/")+1).concat(message.getPrefix());
-//        handFail(reason,serverPath,message.getSceneNum());
-//    }
-//
-//    private void handFail(String reason,String serverPath,String num){
-//        // 释放缓存锁
-//        redisTemplate.delete(RedisKey.SCENE_BUILDING + num);
-//        CompletableFuture.runAsync(() -> {
-//            try {
-//                DingDingUtils.sendMsgToDingRobot(reason,serverPath,num);
-//            } catch (ApiException | UnsupportedEncodingException | NoSuchAlgorithmException | InvalidKeyException apiException) {
-//                apiException.printStackTrace();
-//            }
-//        });
-//    }
-//}

+ 0 - 18
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/ISceneExtService.java

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

+ 0 - 18
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/ISceneFileBuildService.java

@@ -1,18 +0,0 @@
-package com.fdkankan.modeling.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.modeling.entity.SceneFileBuild;
-
-/**
- * <p>
- * 场景文件建模表 服务类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-public interface ISceneFileBuildService extends IService<SceneFileBuild> {
-
-    SceneFileBuild findByFileId(String fileId);
-
-}

+ 0 - 16
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/ISceneProEditExtService.java

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

+ 0 - 16
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/ISceneProEditService.java

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

+ 0 - 17
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/ISceneProExtService.java

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

+ 0 - 23
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/ISceneProService.java

@@ -1,23 +0,0 @@
-package com.fdkankan.modeling.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.modeling.entity.ScenePro;
-
-import java.util.List;
-
-/**
- * <p>
- * pro场景表 服务类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-public interface ISceneProService extends IService<ScenePro> {
-
-    ScenePro findBySceneNum(String projectNum);
-
-    void updateTime(String projectNum, Long space, int payStatus, String toJSONString, long computeTime);
-
-    void tempScenes(List<Long> ids);
-}

+ 0 - 21
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/ISceneService.java

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

+ 0 - 25
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneExtServiceImpl.java

@@ -1,25 +0,0 @@
-package com.fdkankan.modeling.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.modeling.entity.SceneExt;
-import com.fdkankan.modeling.mapper.ISceneExtMapper;
-import com.fdkankan.modeling.service.ISceneExtService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 场景表 服务实现类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-30
- */
-@Service
-public class SceneExtServiceImpl extends ServiceImpl<ISceneExtMapper, SceneExt> implements ISceneExtService {
-
-    @Override
-    public SceneExt getBySceneId(long sceneId) {
-        return this.getOne(new LambdaQueryWrapper<SceneExt>().eq(SceneExt::getSceneId, sceneId));
-    }
-}

+ 0 - 37
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneFileBuildServiceImpl.java

@@ -1,37 +0,0 @@
-package com.fdkankan.modeling.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.modeling.entity.SceneFileBuild;
-import com.fdkankan.modeling.mapper.ISceneFileBuildMapper;
-import com.fdkankan.modeling.service.ISceneFileBuildService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 场景文件建模表 服务实现类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Service
-public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper, SceneFileBuild> implements ISceneFileBuildService {
-
-    @Override
-    public SceneFileBuild findByFileId(String fileId) {
-        QueryWrapper<SceneFileBuild> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SceneFileBuild::getFileId,fileId);
-        queryWrapper.lambda().eq(SceneFileBuild::getRecStatus,"A");
-        queryWrapper.lambda().orderByDesc(SceneFileBuild::getCreateTime);
-        queryWrapper.last("LIMIT 1");
-        List<SceneFileBuild> list = this.list(queryWrapper);
-        if(list == null || list.size() <=0){
-            return null;
-        }
-        return list.get(0);
-    }
-
-}

+ 0 - 20
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneProEditExtServiceImpl.java

@@ -1,20 +0,0 @@
-package com.fdkankan.modeling.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.modeling.entity.SceneProEditExt;
-import com.fdkankan.modeling.mapper.ISceneProEditExtMapper;
-import com.fdkankan.modeling.service.ISceneProEditExtService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * pro场景编辑数据表 服务实现类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Service
-public class SceneProEditExtServiceImpl extends ServiceImpl<ISceneProEditExtMapper, SceneProEditExt> implements ISceneProEditExtService {
-
-}

+ 0 - 20
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneProEditServiceImpl.java

@@ -1,20 +0,0 @@
-package com.fdkankan.modeling.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.modeling.entity.SceneProEdit;
-import com.fdkankan.modeling.mapper.ISceneProEditMapper;
-import com.fdkankan.modeling.service.ISceneProEditService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * pro场景编辑数据表 服务实现类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Service
-public class SceneProEditServiceImpl extends ServiceImpl<ISceneProEditMapper, SceneProEdit> implements ISceneProEditService {
-
-}

+ 0 - 33
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneProExtServiceImpl.java

@@ -1,33 +0,0 @@
-package com.fdkankan.modeling.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.modeling.entity.SceneProExt;
-import com.fdkankan.modeling.mapper.ISceneProExtMapper;
-import com.fdkankan.modeling.service.ISceneProExtService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * pro场景表 服务实现类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Service
-public class SceneProExtServiceImpl extends ServiceImpl<ISceneProExtMapper, SceneProExt> implements ISceneProExtService {
-
-    @Override
-    public SceneProExt getBySceneProId(Long id) {
-        QueryWrapper<SceneProExt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SceneProExt::getSceneProId,id);
-        List<SceneProExt> list = this.list(queryWrapper);
-        if(list == null || list.size()<=0){
-            return null;
-        }
-        return list.get(0);
-    }
-}

+ 0 - 92
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneProServiceImpl.java

@@ -1,92 +0,0 @@
-package com.fdkankan.modeling.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.common.constant.ConstantFilePath;
-import com.fdkankan.common.constant.RecStatus;
-import com.fdkankan.common.constant.TbStatus;
-import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.modeling.entity.ScenePro;
-import com.fdkankan.modeling.entity.SceneProExt;
-import com.fdkankan.modeling.mapper.ISceneProMapper;
-import com.fdkankan.modeling.service.ISceneProExtService;
-import com.fdkankan.modeling.service.ISceneProService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * pro场景表 服务实现类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Service
-public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro> implements ISceneProService {
-
-    @Autowired
-    private ISceneProExtService sceneProExtService;
-
-    @Override
-    public ScenePro findBySceneNum(String projectNum) {
-        List<ScenePro> list = this.list(new QueryWrapper<ScenePro>()
-                .eq("tb_status", TbStatus.VALID.code())
-                .eq("rec_status", RecStatus.VALID.code())
-                .eq("scene_code", projectNum));
-        if(CollUtil.isEmpty(list)){
-            return null;
-        }
-        return list.get(0);
-    }
-
-    @Override
-    public void updateTime(String projectNum, Long space, int payStatus, String videos, long computeTime) {
-        ScenePro scenePro = this.findBySceneNum(projectNum);
-        if(scenePro == null){
-            return;
-        }
-        SceneProExt sceneProExt = sceneProExtService.getBySceneProId(scenePro.getId());
-        if( sceneProExt == null){
-            return;
-        }
-        scenePro.setVideos(videos);
-        this.updateById(scenePro);
-
-        sceneProExt.setSceneStatus(-2);
-        sceneProExt.setPayStatus(payStatus);
-        sceneProExt.setSpace(space);
-        sceneProExt.setComputeTime(computeTime);
-        sceneProExtService.updateById(sceneProExt);
-    }
-
-    @Override
-    public void tempScenes(List<Long> lockedIds) {
-        if (lockedIds == null || lockedIds.size() == 0){
-            return;
-        }
-        for (Long id : lockedIds){
-            SceneProExt sceneProExt = sceneProExtService.getBySceneProId(id);
-            sceneProExt.setPayStatus(-2);
-            sceneProExtService.updateById(sceneProExt);
-
-            ScenePro sceneProEntity = this.getById(id);
-//            sceneProEntity.setPayStatus(-2);
-//            this.updateById(sceneProEntity);
-
-            try{
-                Map<String, Object> map = new HashMap<>();
-                map.put("payStatus", -2);
-                FileUtils.writeJsonFile(ConstantFilePath.SCENE_PATH + "data/data" + sceneProEntity.getSceneCode() + "/scene.json", map);
-            }catch (Exception e){
-                e.printStackTrace();
-            }
-
-        }
-    }
-}

+ 0 - 61
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/service/impl/SceneServiceImpl.java

@@ -1,61 +0,0 @@
-package com.fdkankan.modeling.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.modeling.entity.Scene;
-import com.fdkankan.modeling.entity.SceneExt;
-import com.fdkankan.modeling.mapper.ISceneMapper;
-import com.fdkankan.modeling.service.ISceneExtService;
-import com.fdkankan.modeling.service.ISceneService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-@Slf4j
-@Service
-public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implements ISceneService {
-
-    @Autowired
-    private ISceneExtService sceneExtService;
-
-    @Override
-    public void updateTime(String projectNum, Long space, int payStatus) {
-        Scene scene = this.findBySceneNum(projectNum);
-        if(scene != null){
-            scene.setCreateTime(new Date());
-            scene.setSceneStatus(-2);
-            scene.setPayStatus(payStatus);
-            this.updateById(scene);
-            SceneExt sceneExt = sceneExtService.getBySceneId(scene.getId());
-            if(sceneExt != null){
-                sceneExt.setSpace(space);
-                sceneExtService.updateById(sceneExt);
-            }
-        }
-    }
-
-    @Override
-    public void updateStatus(String projectNum, int i) {
-        UpdateWrapper<Scene> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().set(Scene::getSceneStatus,i);
-        updateWrapper.lambda().eq(Scene::getSceneCode,projectNum);
-        this.update(updateWrapper);
-    }
-
-    @Override
-    public Scene findBySceneNum(String projectNum) {
-        QueryWrapper<Scene> sceneQueryWrapper = new QueryWrapper<>();
-        sceneQueryWrapper.lambda().eq(Scene::getSceneCode,projectNum);
-        sceneQueryWrapper.lambda().eq(Scene::getRecStatus,"A");
-        List<Scene> list = this.list(sceneQueryWrapper);
-        if(CollUtil.isEmpty(list)){
-            return null;
-        }
-        return list.get(0);
-    }
-}

+ 0 - 4
4dkankan-center-modeling/src/main/resources/bootstrap.yml

@@ -12,10 +12,6 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
         shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
           - data-id: common-redis-config.yaml
             group: DEFAULT_GROUP
             refresh: true

+ 0 - 19
4dkankan-common/pom.xml

@@ -102,25 +102,6 @@
         </dependency>
 
         <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.4.3.4</version>
-        </dependency>
-        <!--mybatis-plus代码生成器-->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-generator</artifactId>
-            <version>3.5.1</version>
-        </dependency>
-
-        <!--velocity模板-->
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-            <version>2.3</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
             <version>3.8</version>