1111

pom.xml

@@ -10,34 +10,28 @@
         <relativePath/>
     </parent>
 
-<!--    <parent>-->
-<!--        <groupId>com.chinatower.cloud</groupId>-->
-<!--        <artifactId>spring-cloud-chinatower-platform</artifactId>-->
-<!--        <version>3.0.6.0</version>-->
-<!--    </parent>-->
-
     <groupId>com.fdkankan</groupId>
     <artifactId>4dkankan-center-scene</artifactId>
     <version>2.0.0-SNAPSHOT</version>
 
-    <repositories>
-        <repository>
-            <id>releases</id>
-            <url>http://192.168.0.115:8081/nexus-2.14.2-01/content/repositories/releases/</url>
-        </repository>
-        <repository>
-            <id>snapshots</id>
-            <url>http://192.168.0.115:8081/nexus-2.14.2-01/content/repositories/snapshots/</url>
-        </repository>
-        <repository>
-            <id>nexus-aliyun</id>
-            <url>http://maven.aliyun.com/nexus/content/groups/public</url>
-        </repository>
+<!--    <repositories>-->
+<!--        <repository>-->
+<!--            <id>releases</id>-->
+<!--            <url>http://192.168.0.115:8081/nexus-2.14.2-01/content/repositories/releases/</url>-->
+<!--        </repository>-->
+<!--        <repository>-->
+<!--            <id>snapshots</id>-->
+<!--            <url>http://192.168.0.115:8081/nexus-2.14.2-01/content/repositories/snapshots/</url>-->
+<!--        </repository>-->
 <!--        <repository>-->
-<!--            <id>chinatower</id>-->
-<!--            <url>http://10.38.77.5:8081/repository/maven-public/</url>-->
+<!--            <id>nexus-aliyun</id>-->
+<!--            <url>http://maven.aliyun.com/nexus/content/groups/public</url>-->
 <!--        </repository>-->
-    </repositories>
+<!--&lt;!&ndash;        <repository>&ndash;&gt;-->
+<!--&lt;!&ndash;            <id>chinatower</id>&ndash;&gt;-->
+<!--&lt;!&ndash;            <url>http://10.38.77.5:8081/repository/maven-public/</url>&ndash;&gt;-->
+<!--&lt;!&ndash;        </repository>&ndash;&gt;-->
+<!--    </repositories>-->
 
     <properties>
         <java.version>1.8</java.version>
@@ -59,57 +53,9 @@
     </properties>
 
     <dependencies>
-
         <dependency>
-            <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-common-web</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bytedeco</groupId>
-                    <artifactId>javacv</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.bytedeco</groupId>
-                    <artifactId>javacpp</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.bytedeco</groupId>
-                    <artifactId>javacv-platform</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>joinery</groupId>
-                    <artifactId>jave</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.aliyun</groupId>
-                    <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.aliyun</groupId>
-                    <artifactId>aliyun-java-sdk-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.poi</groupId>
-                    <artifactId>poi</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.poi</groupId>
-                    <artifactId>poi-ooxml</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-web</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.alibaba.cloud</groupId>
-                    <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.alibaba.cloud</groupId>
-                    <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
         <dependency>
@@ -119,64 +65,31 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-redis</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <version>2.3.12.RELEASE</version>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.fdkankan</groupId>-->
-<!--            <artifactId>4dkankan-utils-db</artifactId>-->
-<!--            <version>3.0.0-SNAPSHOT</version>-->
-<!--        </dependency>-->
-
         <dependency>
-            <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-fyun-local</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
-
-<!--        <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-model</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.fdkankan</groupId>-->
-<!--            <artifactId>4dkankan-utils-rabbitmq</artifactId>-->
-<!--            <version>3.0.0-SNAPSHOT</version>-->
-<!--        </dependency>-->
-
         <dependency>
-            <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-image</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-test</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--        </dependency>-->
 
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba.csp</groupId>-->
-<!--            <artifactId>sentinel-datasource-nacos</artifactId>-->
-<!--            <version>1.7.2</version>-->
-<!--        </dependency>-->
-
         <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>tlog-web-spring-boot-starter</artifactId>
@@ -227,34 +140,6 @@
             <artifactId>freemarker</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba</groupId>-->
-<!--            <artifactId>druid-spring-boot-starter</artifactId>-->
-<!--            <version>1.1.22</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.aliyun</groupId>-->
-<!--            <artifactId>imageseg20191230</artifactId>-->
-<!--            <version>1.0.5</version>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>com.chinatower.reszyzx.common</groupId>-->
-<!--            <artifactId>chinatower-main-res-common</artifactId>-->
-<!--            <version>1.0.0</version>-->
-<!--        </dependency>-->
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-<!--        <dependency>-->
-<!--            <groupId>com.chinatower.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-chinatower-nacos-discovery</artifactId>-->
-<!--            <version>3.0.6.0</version>-->
-<!--        </dependency>-->
-
     </dependencies>
 
     <dependencyManagement>

src/main/java/com/fdkankan/scene/SceneApplication.java

@@ -1,4 +1,4 @@
-package com.fdkankan.scene;
+package com.fdkankan;
 
 import com.dtflys.forest.springboot.annotation.ForestScan;
 import org.mybatis.spring.annotation.MapperScan;
@@ -8,12 +8,8 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
-//@EnableTransactionManagement//开启事务
-//@EnableDiscoveryClient
 @EnableScheduling
-@ComponentScan(basePackages = {"com.fdkankan.*"})//,
 @MapperScan("com.fdkankan.**.mapper")
-@ForestScan(basePackages = "com.fdkankan.scene.httpclient")
 public class SceneApplication {
 
     public static void main(String[] args) {

src/main/java/com/fdkankan/common/constant/SceneInfoReqType.java

@@ -0,0 +1,39 @@
+package com.fdkankan.common.constant;
+
+/**
+ * 场景详情请求来源
+ */
+public enum SceneInfoReqType {
+
+    EDIT((byte)1, "编辑页面"),
+    VIEW((byte)2, "查看页面");
+
+    private Byte code;
+    private String message;
+
+    private SceneInfoReqType(Byte code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public Byte code() {
+        return code;
+    }
+
+    public String message() {
+        return message;
+    }
+
+    public static SceneInfoReqType get(Byte code){
+        SceneInfoReqType[] values = SceneInfoReqType.values();
+        Byte enumValue = null;
+        for(SceneInfoReqType eachValue : values){
+            enumValue = eachValue.code();
+            if(enumValue.equals(code)){
+                return eachValue;
+            }
+        }
+        return null;
+    }
+
+}

src/main/java/com/fdkankan/redis/config/RedisConfig.java

@@ -0,0 +1,44 @@
+package com.fdkankan.redis.config;
+
+
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Configuration
+@AutoConfigureAfter(RedisAutoConfiguration.class)
+public class RedisConfig {
+
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
+        RedisTemplate template = new RedisTemplate();
+        template.setConnectionFactory(redisConnectionFactory);
+        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
+
+        template.setKeySerializer(stringRedisSerializer);
+        template.setValueSerializer(stringRedisSerializer);
+        template.setHashKeySerializer(stringRedisSerializer);
+        template.setHashValueSerializer(stringRedisSerializer);
+
+        template.afterPropertiesSet();
+        return template;
+    }
+
+    /**
+     * 由于v4场景中心要获取v3的登录用户信息，而v3的jedis使用的是默认的jdk序列化器，所以这里提供了一个特殊的redistemplate，v3废弃后需要删除
+     * @param redisConnectionFactory
+     * @return
+     */
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate2(RedisConnectionFactory redisConnectionFactory) {
+        RedisTemplate template = new RedisTemplate();
+        template.setConnectionFactory(redisConnectionFactory);
+        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
+        template.setKeySerializer(stringRedisSerializer);
+        return template;
+    }
+}

src/main/java/com/fdkankan/redis/constant/RedisKey.java

@@ -0,0 +1,225 @@
+package com.fdkankan.redis.constant;
+
+public class RedisKey {
+    /**
+     * 过期时间：1分钟
+     */
+    public static final int EXPIRE_TIME_1_MINUTE = 60;
+
+    /**
+     * 过期时间：5分钟
+     */
+    public static final int EXPIRE_TIME_5_MINUTE = 5*60;
+
+    /**
+     * 过期时间：10分钟
+     */
+    public static final int EXPIRE_TIME_10_MINUTE = 10*60;
+
+    /**
+     * 过期时间：30分钟
+     */
+    public static final int EXPIRE_TIME_30_MINUTE = 30*60;
+
+    /**
+     * 过期时间：2小时
+     */
+    public static final int EXPIRE_TIME_2_HOUR = 2*60*60;
+
+    /**
+     * 用户过期时间
+     */
+    public static final int USER_EXPIRE_TIME = 6*60*60;
+
+    /**
+     * 相机登陆7天有效期
+     */
+    public static final int CAMERA_EXPIRE_7_TIME = 7*24*60*60;
+
+    public static final String SYSTEM_PREFIX = "4dkankan";
+
+    /**
+     * 登录token
+     */
+    public static String TOKEN_USER = "token:type:%s:name:%s";
+
+    /**
+     * ssouser key
+     */
+    public static String SSO_USER = "sso_user:name:%s";
+    /**
+     * 开发者信息
+     */
+    public static String TM_DEVELOPER = "developer:appid:%s";
+
+    /**
+     * 场景浏览量
+     */
+    public static String SCENE_VISIT_CNT = "scene:visit:cnt";
+
+
+    /**
+     * 场景码池
+     */
+    public static String FDKANKAN_SCENE_NUMS = "4dkankan:scene:nums";
+
+
+    public static final String SCENE_BUILDING = SYSTEM_PREFIX+":scene:building:%s";
+
+    /**
+     * 场景下载进度
+     */
+    // TODO: 2022/3/29  这个是V3版本使用的key，V4版本稳定后，这个要删除
+    public static final String PREFIX_DOWNLOAD_PROGRESS="downloads:progress:%s";
+
+    /**
+     * 场景下载进度
+     */
+    public static final String PREFIX_DOWNLOAD_PROGRESS_V4="downloads:progress:v4:%s";
+
+    /**
+     * 即将要下载场景的场景码列表
+     */
+    public static final String DOWNLOAD_TASK="downloads:task";
+
+    /**
+     * 正在下载的场景码列表
+     */
+    public static final String SCENE_DOWNLOAD_ING="scene:downloads:ing";
+
+    /**
+     * 正在下载的场景码列表
+     */
+    public static final String SCENE_V3_DOWNLOAD_ING="scene:v3:downloads:ing";
+
+    /**
+     * scenejson缓存
+     */
+    public static final String SCENE_JSON = "scenejson:num:%s";
+
+    /**
+     * 场景热点hash列表
+     */
+    public static final String SCENE_HOT_DATA = "scene:hotdata:num:%s";
+
+    /**
+     * 热点icons数据列表
+     */
+    public static final String SCENE_HOT_ICONS = "scene:hoticons:num:%s";
+
+    /**
+     * 场景关联数据列表
+     */
+    public static final String SCENE_LINKPAN_DATA = "scene:LinkPan:num:%s";
+
+    /**
+     * 场景关联styles数据列表
+     */
+    public static final String SCENE_LINKPAN_STYLES = "scene:LinkPanStyles:num:%s";
+
+    /**
+     * 场景关联styles数据列表
+     */
+    public static final String SCENE_BILLBOARDS_STYLES = "scene:billboardsStyles:num:%s";
+
+    /**
+     * 场景指示牌数据列表
+     */
+    public static final String SCENE_BILLBOARDS = "scene:billboards:num:%s";
+
+    public static final String SCENE_CUT_MODEL = "scene:cutmodel:num:%s";
+
+    /**
+     * 场景下载任务列表
+     */
+    public static final String SCENE_DOWNLOADS_TASK_V4 = "scene:downloads:task:v4";
+
+    /**
+     * 场景升级进度
+     */
+    public static final String scene_upgrade_progress_num = "scene:upgrade:progress:num:%s";
+
+    /**
+     * v3版本user类型token
+     */
+    public static final String TOKEN_V3 = "token#%s";
+
+    /**
+     * user类型token
+     */
+    public static final String USER_TOKEN_KEY = "token#%s";
+
+    /**
+     * 场景协作管理
+     */
+    public static final String SCENE_COOPERATION_NUM_USERID = "scene:cooperation:num:userId";
+
+
+    /**
+     * 管理后台key
+     */
+    public static final String  MANAGE_MENU ="manage_menu";
+    public static final String  MANAGE_PERM_USER ="manage_perm_user:%s";
+    public static final String  MANAGE_ROLE_USER ="manage_role_user:%s";
+
+    /**
+     * 马赛克列表
+     */
+    public static final String SCENE_MOSAIC_DATA = "scene:mosaic:num:%s";
+
+    /**
+     * 滤镜列表
+     */
+    public static final String SCENE_filter_DATA = "scene:filter:num:%s";
+
+    /**
+     * 场景资源清理，查询场景limit下标
+     */
+    public static final String SCENE_CLEAN_INDEX = "scene:clean:index";
+
+    /**
+     * 上传matterprodata状态
+     */
+    public static final String SCENE_UPLOAD_MATTERPRO_NUM= "scene:upload:matterpro:num";
+
+    /**
+     * 人体抠图任务id
+     */
+    public static final String SCENE_BODY_SEGMENT= "scene:body:segment:uuid:%s";
+
+    /**
+     * 场景oss原始资源目录删除
+     */
+    public static final String SCENE_OSS_HOME_DIR_DELETE= "scene:oss:home:dir:delete:unicode:%s";
+
+    /**
+     * 场景oss原始资源目录上传
+     */
+    public static final String SCENE_OSS_HOME_DIR_UPLOAD= "scene:oss:home:dir:upload:unicode:%s";
+
+    /**
+     * 场景oss原始资源目录上传
+     */
+    public static final String SCENE_BUILD_EXPECT_TOTAL_TIME_NUM= "scene:build:expect:total:time:num:%s";
+
+    /**
+     * 场景oss原始资源目录上传
+     */
+    public static final String SCENE_BUILD_FINISH_NUM = "scene:build:finish:num:%s";
+
+    /**
+     * 场景oss原始资源目录上传
+     */
+    public static final String SINGLE_MODELING_SERVER_BUSY = "singleModelingServerBusy";
+
+    /**
+     * 打点系统应用id缓存
+     */
+    public static final String TRACK_APPID = "track:appid";
+
+    public static final String SCENE_DRAW = "scene:draw:num:%s";
+
+
+
+
+}

src/main/java/com/fdkankan/redis/constant/RedisLockKey.java

@@ -0,0 +1,192 @@
+package com.fdkankan.redis.constant;
+
+import cn.hutool.core.io.FileUtil;
+
+import java.io.File;
+
+/**
+ * <p>
+ *   分布式锁key定义
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/1/12
+ **/
+public class RedisLockKey {
+
+    /**
+     * 场景浏览量
+     */
+    public static String LOCK_SCENE_VISIT_CNT = "lock:scene:visit:cnt:scenecode:%s";
+
+    /**
+     * 场景访问量更新锁 hash
+     */
+    public static String LOCK_SCENE_VISIT_UPDATE = "lock:scene:visit:update";
+
+    /**
+     *
+     *
+     *
+     * 场景上传图片锁
+     */
+    public static String LOCK_UPLOAD_PIC = "lock:upload:pic:scenecode:%s";
+
+    /**
+     * 场景pro上传图片锁
+     */
+    public static String LOCK_UPLOAD_PRO_PIC = "lock:upload:pro:pic:scenecode:%s";
+
+    /**
+     * 场景上传音频锁
+     */
+    public static String LOCK_UPLOAD_VOICE = "lock:upload:voice:scenecode:%s";
+
+    /**
+     * 场景pro上传音频锁
+     */
+    public static String LOCK_UPLOAD_PRO_VOICE = "lock:upload:pro:voice:scenecode:%s";
+
+    /**
+     * 画墙重建模型锁
+     */
+    public static String LOCK_UPLOAD_FLOORJSON_REBUILD = "lock:upload:floorjson:rebuild:scenecode:%s";
+
+    /**
+     * 上传图片多媒体数据锁
+     */
+    public static String LOCK_UPLOAD_FLOORPLAN_PNG = "lock:upload:floorplan:png:scenecode:%s";
+
+    /**
+     * 加载场景码池锁
+     */
+    public static String LOCK_FDKANKAN_SCENE_NUMS = "lock:4dkankan:scene:nums";
+
+    /**
+     * 同步场景
+     */
+    public static String LOCK_SCENE_SYNC = "lock:scene:sync:num:%s";
+
+    /**
+     * 热点数据恢复锁
+     */
+    public static String LOCK_HOT_DATA_SYNC = "lock:hot:data:sync:num:%s";
+
+    /**
+     * icons数据恢复锁
+     */
+    public static String LOCK_HOT_ICONS_SYNC = "lock:hot:icons:sync:num:%s";
+
+    /**
+     * 场景关联数据恢复锁
+     */
+    public static String LOCK_LINKPAN_DATA_SYNC = "lock:linkpan:data:sync:num:%s";
+
+    /**
+     * 场景关联styles数据恢复锁
+     */
+    public static String LOCK_LINKPAN_STYLES_SYNC = "lock:linkpan:styles:sync:num:%s";
+
+    /**
+     * 场景关联styles数据恢复锁
+     */
+    public static String LOCK_BILLBOARDS_STYLES_SYNC = "lock:Billboards:styles:sync:num:%s";
+
+    /**
+     * 场景指示牌数据恢复锁
+     */
+    public static String LOCK_BILLBOARDS_SYNC = "lock:billboards:sync:num:%s";
+
+    /**
+     * 裁剪模型数据恢复锁
+     */
+    public static String LOCK_CUT_MODEL_SYNC = "lock:cutmodel:sync:num:%s";
+
+    /**
+     * 热点数据写文件锁
+     */
+    public static String LOCK_HOT_JSON = "lock:hot:json:num:%s";
+
+    /**
+     * 批量生成场景码锁
+     */
+    public static String LOCK_BATCH_CREATE_NUM = "lock:batch:create:num";
+
+    /**
+     * 加载场景中断下载列表锁
+     */
+    public static String LOCK_SCENE_DOWNLOAD_ING = "lock:scene:downloads:ing";
+
+
+    /**
+     * 加载场景中断下载列表锁
+     */
+    public static String LOCK_STARTUP_MODELING_SERVER = "lock:startup:modeling:server";
+
+    /**
+     * 加载场景中断下载列表锁
+     */
+    public static String LOCK_SCENE_UPGRADE_V4 = "lock:scene:upgrade:v4:num:%s";
+
+    /**
+     * 场景关联数据写本地文件锁
+     */
+    public static String LOCK_LINK_SCENE_JSON = "lock:link:scene:json:num:%s";
+
+    /**
+     * 场景关联数据写本地文件锁
+     */
+    public static String LOCK_SCENE_UPGRADE_FAILED_ROLLBACK = "lock:scene:upgrade:failed:rollback";
+
+    /**
+     * 马赛克数据恢复锁
+     */
+    public static String LOCK_MOSAIC_DATA_SYNC = "lock:mosaic:data:sync:num:%s";
+
+    /**
+     * 马赛克数据写文件锁
+     */
+    public static String LOCK_MOSAIC_JSON = "lock:mosaic:json:num:%s";
+
+    /**
+     * 滤镜数据写文件锁
+     */
+    public static String LOCK_filter_JSON = "lock:filter:json:num:%s";
+
+    /**
+     * 滤镜数据恢复锁
+     */
+    public static String LOCK_FILTER_DATA_SYNC = "lock:filter:data:sync:num:%s";
+
+    /**
+     * 场景资源清理定时任务锁
+     */
+    public static final String LOCK_SCENE_CLEAN = "lock:scene:clean";
+
+    /**
+     * 思维打包下载锁
+     */
+    public static final String LOCK_DOWNLOAD_SIWEI_HTML = "lock:download:siwei:html";
+
+    /**
+     * 思维打包下载锁
+     */
+    public static final String LOCK_GET_MATTERPRO_NUM = "lock:get:matterpro:num";
+
+    public static final String LOCK_CLEAN_SCENE_ORIG_V3 = "lock:clean:scene:orig:v3";
+
+    public static final String LOCK_CLEAN_SCENE_ORIG_V4 = "lock:clean:scene:orig:v4";
+
+    public static final String LOCK_CLEAN_SCENE_DELETED_ORIG_V3 = "lock:clean:scene:deleted:orig:v3";
+
+    public static final String LOCK_CLEAN_SCENE_DELETED_ORIG_V4 = "lock:clean:scene:deleted:orig:v4";
+
+    public static String LOCK_SCENE_DRAW = "lock:sceneDraw:sync:num:%s";
+
+    public static void main(String[] args) {
+        FileUtil.copyContent(new File("F:\\test\\test"), new File("F:\\test\\test2"), true);
+    }
+
+
+
+}

src/main/java/com/fdkankan/redis/util/RedisLockUtil.java

@@ -0,0 +1,145 @@
+package com.fdkankan.redis.util;
+
+import cn.hutool.core.lang.UUID;
+import cn.hutool.core.util.StrUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.script.DefaultRedisScript;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+@Component
+@Slf4j
+public class RedisLockUtil {
+
+    private ConcurrentHashMap<String, String> THREADID_LOCKVAL_MAP = new ConcurrentHashMap<>();
+
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    private static final String UNLOCK_LUA =
+            "if redis.call('get',KEYS[1]) == ARGV[1] then\n" +
+            "    return redis.call('del',KEYS[1])\n" +
+            "else\n" +
+            "    return 0\n" +
+            "end";
+
+    /**
+     * 加锁，自旋重试三次
+     * 默认以线程id作为锁的值
+     *
+     * @param lockKey 锁key
+     * @param expireTime 锁过期时间 单位 毫秒
+     * @return
+     */
+    public boolean lock(String lockKey, int expireTime) {
+        return this.lock(lockKey, null, expireTime);
+    }
+
+    /**
+     * 加锁，自旋重试三次
+     * @param lockKey 锁key
+     * @param lockVal 锁value
+     * @param expireTime 锁过期时间 单位 毫秒
+     * @return
+     */
+    public boolean lock(String lockKey, String lockVal, int expireTime) {
+        boolean locked = false;
+        int tryCount = 3;
+        String threadId = null;
+        String uuid = null;
+        if(lockVal == null){
+            threadId = String.valueOf(Thread.currentThread().getId());
+            uuid = UUID.randomUUID().toString();
+            lockVal = uuid + ":" + threadId;
+            log.info("加锁lockval：{}",lockVal);
+        }
+        while (tryCount > 0) {
+            locked = redisTemplate.opsForValue().setIfAbsent(lockKey, lockVal, expireTime, TimeUnit.SECONDS);
+            if(locked){
+                if(threadId != null){
+                    THREADID_LOCKVAL_MAP.put(threadId, lockVal);
+                }
+                return locked;
+            }
+            tryCount--;
+            try {
+                Thread.sleep(300);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+        return locked;
+    }
+
+    /**
+     * 非原子解锁，可能解别人锁，不安全
+     *
+     * @return
+     */
+    public boolean unlock(String lockKey) {
+        return this.unlock(lockKey, null);
+    }
+
+    /**
+     * 非原子解锁，可能解别人锁，不安全
+     *
+     * @return
+     */
+    public boolean unlock(String lockKey, String lockVal) {
+        if(lockVal == null){
+            String threadId = String.valueOf(Thread.currentThread().getId());
+            lockVal = THREADID_LOCKVAL_MAP.get(threadId);
+        }
+        if (StrUtil.isEmpty(lockKey) || Objects.isNull(lockVal))
+            return false;
+        boolean releaseLock = false;
+        String val = (String) redisTemplate.opsForValue().get(lockKey);
+        if (lockVal.equals(val)) {
+            releaseLock = redisTemplate.delete(lockKey);
+        }
+        return releaseLock;
+    }
+
+    /**
+     * 使用lua脚本解锁，不会解除别人锁
+     *
+     * @param
+     * @return
+     */
+    public boolean unlockLua(String lockKey) {
+        return this.unlockLua(lockKey, null);
+    }
+
+    /**
+     * 使用lua脚本解锁，不会解除别人锁
+     *
+     * @param
+     * @return
+     */
+    public boolean unlockLua(String lockKey, String lockVal) {
+        if(lockVal == null){
+            String threadId = String.valueOf(Thread.currentThread().getId());
+            lockVal = THREADID_LOCKVAL_MAP.get(threadId);
+        }
+        log.info("解锁lockval：{}",lockVal);
+        if (StrUtil.isEmpty(lockKey) || Objects.isNull(lockVal))
+            return false;
+        DefaultRedisScript<Long> redisScript = new DefaultRedisScript();
+        redisScript.setScriptText(UNLOCK_LUA);
+        redisScript.setResultType(Long.class);
+
+        Object result = redisTemplate.execute(redisScript, Arrays.asList(lockKey), lockVal);
+        return result.equals(Long.valueOf(1));
+    }
+
+
+
+
+
+}

src/main/java/com/fdkankan/redis/util/RedisUtil.java

@@ -0,0 +1,498 @@
+package com.fdkankan.redis.util;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+@Component
+@Slf4j
+public class RedisUtil<K, V>{
+
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    /**
+     * 指定缓存失效时间
+     *
+     * @param key  键
+     * @param time 时间(秒)
+     * @return
+     */
+    public boolean expire(String key, long time) {
+        if (time > 0) {
+            redisTemplate.expire(key, time, TimeUnit.SECONDS);
+        }
+        return true;
+    }
+    /**
+     * 根据key 获取过期时间
+     *
+     * @param key 键 不能为null
+     * @return 时间(秒) 返回0代表为永久有效
+     */
+    public long getExpire(String key) {
+        return redisTemplate.getExpire(key, TimeUnit.SECONDS);
+    }
+    /**
+     * 判断key是否存在
+     *
+     * @param key 键
+     * @return true 存在 false不存在
+     */
+    public boolean hasKey(String key) {
+        return redisTemplate.hasKey(key);
+    }
+    /**
+     * 删除缓存
+     *
+     * @param key 可以传一个值 或多个
+     */
+    @SuppressWarnings("unchecked")
+    public void del(String... key) {
+        if (key != null && key.length > 0) {
+            if (key.length == 1) {
+                redisTemplate.delete(key[0]);
+            } else {
+                redisTemplate.delete(CollectionUtils.arrayToList(key));
+            }
+        }
+    }
+    // ============================String=============================
+    /**
+     * 普通缓存获取
+     *
+     * @param key 键
+     * @return 值
+     */
+    public String get(String key) {
+        return key == null ? null : (String) redisTemplate.opsForValue().get(key);
+    }
+    /**
+     * 普通缓存放入
+     *
+     * @param key   键
+     * @param value 值
+     * @return true成功 false失败
+     */
+    public boolean set(String key, String value) {
+        redisTemplate.opsForValue().set(key, value);
+        return true;
+    }
+    /**
+     * 普通缓存放入并设置时间
+     *
+     * @param key   键
+     * @param value 值
+     * @param time  时间(秒) time要大于0 如果time小于等于0 将设置无限期
+     * @return true成功 false 失败
+     */
+    public boolean set(String key, String value, long time) {
+        if (time > 0) {
+            redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS);
+        } else {
+            set(key, value);
+        }
+        return true;
+    }
+    /**
+     * 递增
+     *
+     * @param key   键
+     * @param delta 要增加几(大于0)
+     * @return
+     */
+    public long incr(String key, long delta) {
+        if (delta < 0) {
+            throw new RuntimeException("递增因子必须大于0");
+        }
+        return redisTemplate.opsForValue().increment(key, delta);
+    }
+    /**
+     * 递减
+     *
+     * @param key   键
+     * @param delta 要减少几(小于0)
+     * @return
+     */
+    public long decr(String key, long delta) {
+        if (delta < 0) {
+            throw new RuntimeException("递减因子必须大于0");
+        }
+        return redisTemplate.opsForValue().increment(key, -delta);
+    }
+    // ================================Map=================================
+    /**
+     * HashGet
+     *
+     * @param key  键 不能为null
+     * @param item 项 不能为null
+     * @return 值
+     */
+    public String hget(String key, String item) {
+        return (String)redisTemplate.opsForHash().get(key, item);
+    }
+
+    /**
+     * HashGet
+     *
+     * @param key  键 不能为null
+     * @return 值
+     */
+    public List<String> hgetValues(String key) {
+        return redisTemplate.opsForHash().values(key);
+    }
+    /**
+     * 获取hashKey对应的所有键值
+     *
+     * @param key 键
+     * @return 对应的多个键值
+     */
+    public Map<String, String> hmget(String key) {
+        return redisTemplate.opsForHash().entries(key);
+    }
+
+
+    /**
+     * <p>
+            查询指定key中匹配多项
+     * </p>
+     * @author dengsixing
+     * @date 2022/2/8
+     * @param key
+     * @param items
+     * @return java.util.List<java.lang.String>
+     **/
+    public List<String> hMultiGet(String key, List<String> items) {
+        return redisTemplate.opsForHash().multiGet(key, items);
+    }
+
+    /**
+     * HashSet
+     *
+     * @param key 键
+     * @param map 对应多个键值
+     * @return true 成功 false 失败
+     */
+    public boolean hmset(String key, Map<String, Object> map) {
+        redisTemplate.opsForHash().putAll(key, map);
+        return true;
+    }
+    /**
+     * HashSet 并设置时间
+     *
+     * @param key  键
+     * @param map  对应多个键值
+     * @param time 时间(秒)
+     * @return true成功 false失败
+     */
+    public boolean hmset(String key, Map<String, Object> map, long time) {
+        redisTemplate.opsForHash().putAll(key, map);
+        if (time > 0) {
+            expire(key, time);
+        }
+        return true;
+    }
+    /**
+     * 向一张hash表中放入数据,如果不存在将创建
+     *
+     * @param key   键
+     * @param item  项
+     * @param value 值
+     * @return true 成功 false失败
+     */
+    public boolean hset(String key, String item, Object value) {
+        redisTemplate.opsForHash().put(key, item, value);
+        return true;
+    }
+    /**
+     * 向一张hash表中放入数据,如果不存在将创建
+     *
+     * @param key   键
+     * @param item  项
+     * @param value 值
+     * @param time  时间(秒) 注意:如果已存在的hash表有时间,这里将会替换原有的时间
+     * @return true 成功 false失败
+     */
+    public boolean hset(String key, String item, Object value, long time) {
+        redisTemplate.opsForHash().put(key, item, value);
+        if (time > 0) {
+            expire(key, time);
+        }
+        return true;
+    }
+    /**
+     * 删除hash表中的值
+     *
+     * @param key  键 不能为null
+     * @param item 项 可以使多个 不能为null
+     */
+    public void hdel(String key, Object... item) {
+        redisTemplate.opsForHash().delete(key, item);
+    }
+    /**
+     * 判断hash表中是否有该项的值
+     *
+     * @param key  键 不能为null
+     * @param item 项 不能为null
+     * @return true 存在 false不存在
+     */
+    public boolean hHasKey(String key, String item) {
+        return redisTemplate.opsForHash().hasKey(key, item);
+    }
+    /**
+     * hash递增 如果不存在,就会创建一个 并把新增后的值返回
+     *
+     * @param key  键
+     * @param item 项
+     * @param by   要增加几(大于0)
+     * @return
+     */
+    public double hincr(String key, String item, double by) {
+        return redisTemplate.opsForHash().increment(key, item, by);
+    }
+    /**
+     * hash递减
+     *
+     * @param key  键
+     * @param item 项
+     * @param by   要减少记(小于0)
+     * @return
+     */
+    public double hdecr(String key, String item, double by) {
+        return redisTemplate.opsForHash().increment(key, item, -by);
+    }
+    // ============================set=============================
+    /**
+     * 根据key获取Set中的所有值
+     *
+     * @param key 键
+     * @return
+     */
+    public Set<Object> sGet(String key) {
+        return redisTemplate.opsForSet().members(key);
+    }
+    /**
+     * 根据value从一个set中查询,是否存在
+     *
+     * @param key   键
+     * @param value 值
+     * @return true 存在 false不存在
+     */
+    public boolean sHasKey(String key, Object value) {
+        return redisTemplate.opsForSet().isMember(key, value);
+    }
+    /**
+     * 将数据放入set缓存
+     *
+     * @param key    键
+     * @param values 值 可以是多个
+     * @return 成功个数
+     */
+    public long sSet(String key, Object... values) {
+        return redisTemplate.opsForSet().add(key, values);
+    }
+    /**
+     * 将set数据放入缓存
+     *
+     * @param key    键
+     * @param time   时间(秒)
+     * @param values 值 可以是多个
+     * @return 成功个数
+     */
+    public long sSet(String key, long time, Object... values) {
+        Long count = redisTemplate.opsForSet().add(key, values);
+        if (time > 0)
+            expire(key, time);
+        return count;
+    }
+    /**
+     * 获取set缓存的长度
+     *
+     * @param key 键
+     * @return
+     */
+    public long sGetSize(String key) {
+        return redisTemplate.opsForSet().size(key);
+    }
+
+    /**
+     * 获取set缓存的长度
+     *
+     * @param key 键
+     * @return
+     */
+    public boolean sExists(String key, Object value) {
+        return redisTemplate.opsForSet().isMember(key, value);
+    }
+
+    /**
+     * 移除值为value的
+     *
+     * @param key    键
+     * @param values 值 可以是多个
+     * @return 移除的个数
+     */
+    public long setRemove(String key, Object... values) {
+        return redisTemplate.opsForSet().remove(key, values);
+    }
+    // ===============================list=================================
+    /**
+     * 获取list缓存的内容
+     *
+     * @param key   键
+     * @param start 开始
+     * @param end   结束 0 到 -1代表所有值
+     * @return
+     */
+    public List<Object> lGet(String key, long start, long end) {
+        return redisTemplate.opsForList().range(key, start, end);
+    }
+    /**
+     * 获取list缓存的长度
+     *
+     * @param key 键
+     * @return
+     */
+    public long lGetSize(String key) {
+        return redisTemplate.opsForList().size(key);
+    }
+    /**
+     * 通过索引 获取list中的值
+     *
+     * @param key   键
+     * @param index 索引 index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推
+     * @return
+     */
+    public Object lGetIndex(String key, long index) {
+        return redisTemplate.opsForList().index(key, index);
+    }
+    /**
+     * 将list放入缓存
+     * @param key   键
+     * @param value 值
+     * @return
+     */
+    public boolean lRightPush(String key, Object value) {
+        redisTemplate.opsForList().rightPush(key, value);
+        return true;
+    }
+    /**
+     * 将list放入缓存
+     *
+     * @param key   键
+     * @param value 值
+     * @param time  时间(秒)
+     * @return
+     */
+    public boolean lRightPush(String key, Object value, long time) {
+        redisTemplate.opsForList().rightPush(key, value);
+        if (time > 0)
+            expire(key, time);
+        return true;
+    }
+    /**
+     * 将list放入缓存
+     *
+     * @param key   键
+     * @param value 值
+     * @return
+     */
+    public boolean lRightPushAll(String key, List<Object> value) {
+        redisTemplate.opsForList().rightPushAll(key, value);
+        return true;
+    }
+
+    /**
+     * 将list放入缓存
+     *
+     * @param key   键
+     * @param value 值
+     * @param time  时间(秒)
+     * @return
+     */
+    public boolean lRightPushAll(String key, List<Object> value, long time) {
+        redisTemplate.opsForList().rightPushAll(key, value);
+        if (time > 0)
+            expire(key, time);
+        return true;
+    }
+
+    /**
+     * 将list放入缓存
+     *
+     * @param key   键
+     * @param value 值
+     * @return
+     */
+    public boolean lLeftPushAll(String key, List<Object> value) {
+        redisTemplate.opsForList().leftPushAll(key, value);
+        return true;
+    }
+
+    /**
+     * 将list放入缓存
+     *
+     * @param key   键
+     * @param value 值
+     * @return
+     */
+    public boolean lLeftPush(String key, String value) {
+        redisTemplate.opsForList().leftPush(key, value);
+        return true;
+    }
+
+    /**
+     *
+     * @param key   键
+     * @return
+     */
+    public String lLeftPop(String key) {
+        return (String)redisTemplate.opsForList().leftPop(key);
+    }
+
+    /**
+     * 根据索引修改list中的某条数据
+     *
+     * @param key   键
+     * @param index 索引
+     * @param value 值
+     * @return
+     */
+    public boolean lUpdateByIndex(String key, long index, Object value) {
+        redisTemplate.opsForList().set(key, index, value);
+        return true;
+    }
+    /**
+     * 移除N个值为value
+     *
+     * @param key   键
+     * @param count 移除多少个
+     * @param value 值
+     * @return 移除的个数
+     */
+    public long lRemove(String key, long count, Object value) {
+        return redisTemplate.opsForList().remove(key, count, value);
+    }
+
+    /**
+     * 移除N个值为value
+     *
+     * @param pattern   键
+     * @return 移除的个数
+     */
+    public Set<String> keys(String pattern) {
+        return redisTemplate.keys(pattern);
+    }
+
+    public void expire(String key,Duration time){
+        redisTemplate.expire(key, time);
+    }
+}

src/main/java/com/fdkankan/scene/Interceptor/CheckPermitAspect.java

@@ -1,119 +0,0 @@
-package com.fdkankan.scene.Interceptor;
-
-import cn.hutool.core.util.StrUtil;
-import com.fdkankan.common.constant.CommonStatus;
-import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.constant.PayStatus;
-import com.fdkankan.common.constant.SceneStatus;
-import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.redis.constant.RedisKey;
-import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.scene.entity.SceneCooperation;
-import com.fdkankan.scene.entity.ScenePlus;
-import com.fdkankan.scene.service.ISceneCooperationService;
-import com.fdkankan.scene.service.IScenePlusService;
-import com.fdkankan.web.user.SSOLoginHelper;
-import com.fdkankan.web.user.SSOUser;
-import com.fdkankan.web.util.WebUtil;
-import java.io.IOException;
-import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-import lombok.extern.log4j.Log4j2;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-@Log4j2
-@Aspect
-@Component
-@Order(101)
-public class CheckPermitAspect {
-
-	@Autowired
-	private SSOLoginHelper ssoLoginHelper;
-	@Autowired
-	private RedisUtil redisUtil;
-	@Autowired
-	private IScenePlusService scenePlusService;
-	@Autowired
-	private ISceneCooperationService sceneCooperationService;
-
-
-	@Pointcut("@annotation(com.fdkankan.scene.annotation.CheckPermit)")
-	public void checkCooperationPermit() {
-	}
-
-	/**
-	 * 前置通知 用于判断用户协作场景是否有协作权限
-	 *
-	 * @param joinPoint
-	 *            切点
-	 * @throws IOException
-	 */
-	@Before("checkCooperationPermit()")
-	public void doBefore(JoinPoint joinPoint) throws Exception {
-		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-		// 读取session中的用户
-		SSOUser user = ssoLoginHelper.getSsoUser(request.getHeader("token"));
-		if(Objects.isNull(user)){
-			throw new BusinessException(ErrorCode.TOKEN_NOT_FOUND);
-		}
-		String num = WebUtil.getParameter("num", joinPoint, request);
-		if(StrUtil.isEmpty(num)){
-			throw new BusinessException(ErrorCode.PARAM_REQUIRED);
-		}
-
-        ScenePlus scenePlus= scenePlusService.getScenePlusByNum(num);
-		if(Objects.isNull(scenePlus)){
-			throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
-		}
-		//如果是计算中或者计算出错，返回计算中
-		if(SceneStatus.wait.code().equals(scenePlus.getSceneStatus())
-			|| SceneStatus.FAILD.code().equals(scenePlus.getSceneStatus())){
-			throw new BusinessException(ErrorCode.FAILURE_CODE_5033);
-		}
-		if(!PayStatus.PAY.code().equals(scenePlus.getPayStatus())){
-			throw new BusinessException(ErrorCode.FAILURE_CODE_5034);
-		}
-
-		//判断是否相机登录，是否场景的相机id和相机登录的相机id是否相等，如果都满足，则放行,否则判定为用户登录
-		if(Objects.nonNull(user.getCameraLogin())
-			&& CommonStatus.YES.code().byteValue() == user.getCameraLogin().intValue()){
-			if(scenePlus.getCameraId().equals(user.getCameraId())){
-				return;
-			}else{
-				throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
-			}
-		}
-
-		//走到这里代表是用户账号密码登录，如果查到的场景的userid是空，证明相机解绑了，需要返回无权操作
-		if(Objects.isNull(scenePlus.getUserId())){
-			throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
-		}
-
-        if(scenePlus.getUserId().equals(user.getId())){
-            return;
-        }
-
-        //如果不是用户自己的场景，判断是否有协作权限
-        Long userId = null;
-		SceneCooperation sceneCooperation = sceneCooperationService.getByNum(num);
-		if(Objects.nonNull(sceneCooperation)){
-			userId = sceneCooperation.getUserId();
-		}
-
-		if(Objects.isNull(userId)){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
-        }
-        if(!userId.equals(user.getId())){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_5014);
-        }
-	}
-
-}

src/main/java/com/fdkankan/scene/Interceptor/TokenInterceptor.java

@@ -1,61 +0,0 @@
-package com.fdkankan.scene.Interceptor;
-
-
-import cn.hutool.http.ContentType;
-import com.alibaba.fastjson.JSON;
-import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.redis.constant.RedisKey;
-import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.web.response.ResultData;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpHeaders;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.HandlerInterceptor;
-
-@Component
-@Slf4j
-public class TokenInterceptor implements HandlerInterceptor {
-
-	@Autowired
-	private RedisUtil redisUtil;
-
-	@Override
-	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-		response.setHeader(HttpHeaders.CONTENT_TYPE, ContentType.JSON.getValue());
-		response.setCharacterEncoding(StandardCharsets.UTF_8.name());
-		String token = request.getHeader("token");
-		if(StringUtils.isEmpty(token)){
-			this.needLogin(request,response);
-			return false;
-		}
-		try {
-			String redisKey = String.format(RedisKey.USER_TOKEN_KEY, token);
-			if(redisUtil.hasKey(redisKey)){
-				redisUtil.expire(redisKey,2 * 60 * 60);
-				return true;
-			}
-		}catch (Exception e){
-			log.error("校验token缓存出错", e);
-		}
-		this.needLogin(request,response);
-		return false;
-	}
-
-	private void needLogin(HttpServletRequest request, HttpServletResponse response) {
-		try {
-			ResultData error = ResultData.error(ErrorCode.TOKEN_NOT_FOUND);
-			response.getWriter().append(JSON.toJSONString(error));
-		} catch (IOException e) {
-			log.info("LoginInterceptor|needLogin|IOException|" + e);
-			e.printStackTrace();
-		}
-	}
-
-}
-

src/main/java/com/fdkankan/scene/callback/FdkkMiniReqErrorCallback.java

@@ -1,41 +0,0 @@
-package com.fdkankan.scene.callback;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.dtflys.forest.callback.OnError;
-import com.dtflys.forest.exceptions.ForestRuntimeException;
-import com.dtflys.forest.http.ForestRequest;
-import com.dtflys.forest.http.ForestResponse;
-import com.fdkankan.common.constant.ServerCode;
-import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.web.response.Result;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/4/25
- **/
-@Slf4j
-public class FdkkMiniReqErrorCallback implements OnError {
-
-    @Override
-    public void onError(ForestRuntimeException e, ForestRequest forestRequest,
-        ForestResponse forestResponse) {
-        JSONObject jsonObject = JSON.parseObject(forestResponse.getContent());
-        Integer status = jsonObject.getInteger("status");
-        if(status != null && status == 500){
-            log.error("v3接口报错,status:{},error:{}", status, jsonObject.getString("error"));
-            throw new BusinessException(ServerCode.SYSTEM_ERROR);
-        }
-        Result result = JSON.parseObject(forestResponse.getContent(), Result.class);
-        if(result.getCode() != ServerCode.SUCCESS.code()){
-            throw new BusinessException(result.getCode(), result.getMsg());
-        }
-        log.error("跨服务请求失败！", e);
-        throw new BusinessException(ServerCode.FEIGN_REQUEST_FAILD);
-    }
-}

src/main/java/com/fdkankan/scene/callback/FdkkMiniReqSuccessCallback.java

@@ -1,25 +0,0 @@
-package com.fdkankan.scene.callback;
-
-import com.dtflys.forest.callback.OnSuccess;
-import com.dtflys.forest.http.ForestRequest;
-import com.dtflys.forest.http.ForestResponse;
-import com.fdkankan.web.response.Result;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/4/25
- **/
-@Slf4j
-public class FdkkMiniReqSuccessCallback implements OnSuccess<Result> {
-
-    @Override
-    public void onSuccess(Result result, ForestRequest forestRequest,
-        ForestResponse forestResponse) {
-        log.info("请求v3成功，url:{},result:{}", forestRequest.getUrl(), forestResponse.getContent());
-    }
-}

src/main/java/com/fdkankan/scene/callback/FdkkMiniReqSuccessCondition.java

@@ -1,50 +0,0 @@
-package com.fdkankan.scene.callback;
-
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
-import com.dtflys.forest.callback.SuccessWhen;
-import com.dtflys.forest.http.ForestRequest;
-import com.dtflys.forest.http.ForestResponse;
-import com.fdkankan.common.constant.ServerCode;
-import com.fdkankan.web.response.Result;
-
-/**
- * <p>
- *  自定义成功/失败条件实现类
- *  需要实现 SuccessWhen 接口
- * </p>
- *
- * @author dengsixing
- * @since 2022/4/25
- **/
-
-public class FdkkMiniReqSuccessCondition implements SuccessWhen {
-
-    /**
-     * 请求成功条件
-     * @param req Forest请求对象
-     * @param res Forest响应对象
-     * @return 是否成功，true: 请求成功，false: 请求失败
-     */
-    @Override
-    public boolean successWhen(ForestRequest req, ForestResponse res) {
-        boolean reqStatus = res.noException() &&   // 请求过程没有异常
-            res.statusOk() &&     // 并且状态码在 100 ~ 399 范围内
-            res.statusIsNot(203);
-        if(!reqStatus){
-            return reqStatus;
-        }
-
-        String content = res.getContent();
-        if(StrUtil.isEmpty(content)){
-            reqStatus = false;
-            return reqStatus;
-        }
-        Result result = JSON.parseObject(content, Result.class);
-        if(result.getCode() != ServerCode.SUCCESS.code()){
-            reqStatus = false;
-            return reqStatus;
-        }
-        return true;
-    }
-}

src/main/java/com/fdkankan/scene/config/DataSourceInitFunc.java

@@ -1,65 +0,0 @@
-package com.fdkankan.scene.config;//package com.fdkankan.scene.config;
-//
-//import com.alibaba.cloud.sentinel.SentinelProperties;
-//import com.alibaba.cloud.sentinel.datasource.config.NacosDataSourceProperties;
-//import com.alibaba.csp.sentinel.datasource.ReadableDataSource;
-//import com.alibaba.csp.sentinel.datasource.nacos.NacosDataSource;
-//import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
-//import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager;
-//import com.alibaba.csp.sentinel.slots.block.flow.FlowRule;
-//import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager;
-//import com.alibaba.fastjson.JSON;
-//import com.alibaba.fastjson.TypeReference;
-//import java.util.List;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//
-///**
-// * <p>
-// * TODO
-// * </p>
-// *
-// * @author dengsixing
-// * @since 2022/2/14
-// **/
-//@Configuration
-//@Slf4j
-//public class DataSourceInitFunc {
-//
-//    @Autowired
-//    private SentinelProperties sentinelProperties;
-//
-//    @Bean
-//    public DataSourceInitFunc init() throws Exception {
-//
-//        log.info("[NacosSource初始化,从Nacos中获取熔断规则]");
-//
-//        sentinelProperties.getDatasource().entrySet().stream().filter(map -> {
-//            return map.getValue().getNacos() != null;
-//        }).forEach(map -> {
-//            NacosDataSourceProperties nacos = map.getValue().getNacos();
-//            // 限流规则，需要Nacos的dataId中包含flow字符串
-//            if (nacos.getDataId().contains("flow")) {
-//                ReadableDataSource<String, List<FlowRule>> flowRuleDataSource = new NacosDataSource<>(nacos.getServerAddr(),
-//                    nacos.getGroupId(), nacos.getDataId(),
-//                    source -> JSON.parseObject(source, new TypeReference<List<FlowRule>>() {
-//                    }));
-//                FlowRuleManager.register2Property(flowRuleDataSource.getProperty());
-//            }
-//
-//            // 降级规则，需要Nacos的dataId中包含degrade字符串
-//            if (nacos.getDataId().contains("degrade")) {
-//                ReadableDataSource<String, List<DegradeRule>> degradeRuleDataSource = new NacosDataSource<>(nacos.getServerAddr(),
-//                    nacos.getGroupId(), nacos.getDataId(),
-//                    source -> JSON.parseObject(source, new TypeReference<List<DegradeRule>>() {
-//                    }));
-//                DegradeRuleManager.register2Property(degradeRuleDataSource.getProperty());
-//            }
-//
-//        });
-//        return new DataSourceInitFunc();
-//    }
-//
-//}

src/main/java/com/fdkankan/scene/config/InterceptorConfig.java

@@ -1,38 +0,0 @@
-package com.fdkankan.scene.config;
-
-import com.fdkankan.scene.Interceptor.TokenInterceptor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-
-@Configuration
-public class InterceptorConfig implements WebMvcConfigurer {
-
-	@Autowired
-	private TokenInterceptor tokenInterceptor;
-
-//	@Override
-//	public void addCorsMappings(CorsRegistry registry) {
-//		registry.addMapping("/**").allowCredentials(true).allowedHeaders("*").allowedOrigins("*").allowedMethods("*");
-//
-//	}
-
-	@Override
-	public void addInterceptors(InterceptorRegistry registry) {
-		registry.addInterceptor(tokenInterceptor).addPathPatterns("/service/scene/edit/**");
-//				.excludePathPatterns("/**/sso/**","/app/**","/test/**","/**/inner/**")
-
-		WebMvcConfigurer.super.addInterceptors(registry);
-	}
-
-	@Override
-	public void addResourceHandlers(ResourceHandlerRegistry registry) {
-		WebMvcConfigurer.super.addResourceHandlers(registry);
-	}
-
-}
-

src/main/java/com/fdkankan/scene/controller/FileConvertController.java

@@ -1,69 +0,0 @@
-package com.fdkankan.scene.controller;
-
-import com.fdkankan.scene.service.IFileConvertService;
-import com.fdkankan.web.controller.BaseController;
-import com.fdkankan.web.response.ResultData;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/5/17
- **/
-@RestController
-@RequestMapping("/service/scene/common/convert")
-public class FileConvertController extends BaseController {
-
-    @Autowired
-    private IFileConvertService fileConvertService;
-
-    /**
-     * <p>
-            TODO
-     * </p>      
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param file
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @PostMapping("/convertTxtToModeldata")
-    public ResultData convertTxtToModeldata(@RequestParam("file") MultipartFile file) throws Exception{
-        fileConvertService.convertTxtToModeldata(file, this.response);
-        return ResultData.ok();
-    }
-
-    /**
-     * <p>
-            TODO
-     * </p>      
-     * @author dengsixing
-     * @date 2022/8/1 
-     * @param file 
-     **/
-    @PostMapping("/convertTxtToDam")
-    public void convertTxtToDam(@RequestParam("file") MultipartFile file) throws Exception{
-        fileConvertService.convertTxtToDam(file, this.response);
-    }
-
-    /**
-     * <p>
-            TODO
-     * </p>      
-     * @author dengsixing
-     * @date 2022/8/1 
-     * @param file 
-     **/
-    @PostMapping("/convertTxtToLzma")
-    public void convertTxtToLzma(@RequestParam("file") MultipartFile file) throws Exception{
-        fileConvertService.convertTxtToLzma(file, this.response);
-    }
-
-}

src/main/java/com/fdkankan/scene/controller/SceneAsynOperLogController.java

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

src/main/java/com/fdkankan/scene/controller/SceneCleanController.java

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

src/main/java/com/fdkankan/scene/controller/SceneCleanOrigController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.scene.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 删除oss原始资源记录 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-03-29
- */
-@RestController
-@RequestMapping("/scene/sceneCleanOrig")
-public class SceneCleanOrigController {
-
-}
-

src/main/java/com/fdkankan/scene/controller/SceneColdStorageLogController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.scene.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 场景冷归档日志表 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-07-12
- */
-@RestController
-@RequestMapping("/scene/sceneColdStorageLog")
-public class SceneColdStorageLogController {
-
-}
-

src/main/java/com/fdkankan/scene/controller/SceneController.java

@@ -2,18 +2,14 @@ package com.fdkankan.scene.controller;
 
 
 import com.fdkankan.common.constant.SceneInfoReqType;
-import com.fdkankan.scene.service.ISceneCustomService;
-import com.fdkankan.scene.service.ISceneEditInfoService;
-import com.fdkankan.scene.service.IScenePlusService;
-import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
+import com.fdkankan.scene.service.SceneService;
 import com.fdkankan.scene.vo.SceneInfoParamVO;
 import com.fdkankan.scene.vo.SceneInfoVO;
-import com.fdkankan.web.controller.BaseController;
-import com.fdkankan.web.response.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -25,14 +21,10 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @RestController
 @RequestMapping("/service/scene")
-public class SceneController extends BaseController {
+public class SceneController {
 
     @Autowired
-    private ISceneEditInfoService sceneEditInfoService;
-    @Autowired
-    private IScenePlusService scenePlusService;
-    @Autowired
-    private ISceneCustomService sceneService;
+    private SceneService sceneService;
 //    @Resource
 //    UserTokenApi userTokenApi;
 
@@ -57,58 +49,9 @@ public class SceneController extends BaseController {
 //            throw new BusinessException(ErrorCode.AUTH_FAIL);
 //        }
         param.setReqType(SceneInfoReqType.VIEW.code());
-        return sceneEditInfoService.getSceneInfo(param);
-    }
-
-    /**
-     * <p>
-     根据场景密码打开场景
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @PostMapping(value = "/check/key")
-    public ResultData checkKey(@RequestBody @Validated SceneCheckKeyParamVO param) throws Exception {
-        return sceneEditInfoService.checkKey(param);
-    }
-
-    /**
-     * <p>
-     获取数据对接下载信息
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @GetMapping(value = "/downLoadZSData")
-    public ResultData downLoadZSData(String sceneNum) throws Exception{
-        return scenePlusService.downLoadZSData(sceneNum);
-    }
-
-    /**
-     * 上传人体抠图原图
-     * @param num
-     * @param file
-     * @return
-     * @throws Exception
-     */
-    @PostMapping(value = "/uploadBodySegment")
-    public ResultData uploadBodySegment(@RequestParam("file") MultipartFile file,
-                                        @RequestParam(value = "rotate", required = false) Integer rotate) throws Exception {
-        return sceneService.uploadBodySegment(file, rotate);
+        return sceneService.getSceneInfo(param);
     }
 
-    /**
-     * 获取人体抠图提取状态
-     * @return ResultData
-     * @throws Exception
-     */
-    @PostMapping(value = "/getBodySegmentStatus")
-    public ResultData getBodySegmentStatus(@RequestParam(value = "serialNum") String uuid) throws Exception {
-        return sceneService.getBodySegmentStatus(uuid);
-    }
 
 }
 

src/main/java/com/fdkankan/scene/controller/SceneEditController.java

@@ -1,918 +0,0 @@
-package com.fdkankan.scene.controller;
-
-import com.fdkankan.common.constant.ErrorCode;
-import com.fdkankan.common.constant.SceneInfoReqType;
-import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.scene.annotation.CheckPermit;
-import com.fdkankan.scene.service.*;
-import com.fdkankan.scene.vo.*;
-import com.fdkankan.web.controller.BaseController;
-import com.fdkankan.web.response.ResultData;
-import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-
-/**
- * 场景编辑管理
- */
-@Log4j2
-@RestController
-@RequestMapping("/service/scene/edit")
-public class SceneEditController extends BaseController {
-
-    @Value("${spring.profiles.active}")
-    private String env;
-
-    @Autowired
-    private ISceneProService sceneProService;
-    @Autowired
-    private ISceneEditInfoService sceneEditInfoService;
-    @Autowired
-    private ISceneUploadService sceneUploadService;
-    @Autowired
-    private ISceneEditService sceneEditService;
-    @Autowired
-    private IDownloadTourVideoService downloadTourVideoService;
-    @Autowired
-    private ISurveillanceService surveillanceService;
-    @Autowired
-    private IBoxModelService boxModelService;
-    @Autowired
-    private IScenePlusService scenePlusService;
-    @Autowired
-    private ISceneAsynOperLogService sceneAsynOperLogService;
-    @Autowired
-    private ISceneEditInfoExtService sceneEditInfoExtService;
-    @Autowired
-    private ICutModelService cutModelService;
-
-    /**
-     * <p>
-     保存场景编辑数据
-     * </p>
-     * @author dengsixing
-     * @date 2022/1/12
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/base/save")
-    public SceneEditInfoVO saveScene(@RequestBody @Validated SceneEditInfoParamVO param){
-        return sceneEditInfoService.saveScene(param);
-    }
-
-    /**
-     * <p>
-     发布场景数据
-     * </p>
-     * @author dengsixing
-     * @date 2022/1/12
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/publicScene")
-    public ResultData publicScene(@RequestBody @Validated SceneEditInfoParamVO param) throws Exception {
-        return sceneEditInfoService.publicScene(param);
-    }
-
-    /**
-     * <p>
-     保存初始页面
-     * </p>
-     * @author dengsixing
-     * @date 2022/1/12
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/saveInitialPage")
-    public ResultData saveInitialPage(@RequestBody @Validated FileNameAndDataParamVO param) throws Exception {
-        return sceneProService.saveInitialPage(param);
-    }
-
-    /**
-     * <p>
-        新增或修改场景热点
-     * </p>
-     * @author dengsixing
-     * @date 2022/1/12
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/tag/save")
-    public ResultData saveTag(@RequestBody @Validated SaveTagsParamVO param) throws Exception {
-        return sceneProService.addOrUpdateTag(param);
-    }
-
-    /**
-     * <p>
-            删除热点
-     * </p>
-     * @author dengsixing
-     * @date 2022/2/16
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/tag/delete")
-    public ResultData deleteTag(@RequestBody @Validated DeleteHotParamVO param) throws Exception {
-        return sceneProService.deleteTag(param);
-    }
-
-    /**
-     * <p>
-            热点列表
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param num
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @PostMapping(value = "/tag/list")
-    public ResultData listTags(@RequestParam(value = "num") String num) throws Exception {
-        return sceneProService.listTags(num);
-    }
-
-    /**
-     * <p>
-     删除热点
-     * </p>
-     * @author dengsixing
-     * @date 2022/2/16
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/icons/delete")
-    public ResultData deleteIcons(@RequestBody @Validated DeleteHotIconParamVO param) throws Exception {
-        return sceneProService.deleteIcons(param);
-    }
-
-    /**
-     * <p>
-     保存漫游可行
-     * </p>
-     * @author dengsixing
-     * @date 2022/1/12
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/saveRoam")
-    public ResultData saveRoam(@RequestBody @Validated BaseDataParamVO param) throws Exception {
-        return sceneProService.saveRoam(param);
-    }
-
-    /**
-     * <p>
-     保存热点可见性的数据
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/saveTagsVisible")
-    public ResultData saveTagsVisible(@RequestBody @Validated SaveTagsVisibleParamVO param) throws Exception {
-        return sceneProService.saveTagsVisible(param);
-    }
-
-    /**
-     * <p>
-            下载模型
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param num
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/downloadModel")
-    public ResultData downloadTexData(@RequestParam("num") String num) throws Exception {
-        return sceneProService.downloadTexData(num);
-    }
-
-    /**
-     * <p>
-            上传模型
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param num
-     * @param file
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/uploadModel")
-    public ResultData uploadObjAndImg(@RequestParam("num") String num, @RequestParam("file") MultipartFile file) throws Exception {
-        return sceneProService.uploadObjAndImg(num, file);
-    }
-
-    /**
-     * <p>
-     保存关联全景图
-     * </p>      
-     * @author dengsixing
-     * @date 2022/8/1 
-     * @param num
-     * @param sid
-     * @param fileName
-     * @param file 
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/linkPan/upload")
-    public ResultData uploadLinkPan(
-        @RequestParam(value = "num") String num,
-        @RequestParam(value = "sid") String sid,
-        @RequestParam(value = "fileName") String fileName,
-        @RequestParam("file") MultipartFile file) throws Exception{
-        return sceneEditInfoService.uploadLinkPan(num, sid, fileName, file);
-    }
-
-    /**
-     * <p>
-     保存关联全景图
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/linkPan/save")
-    public ResultData saveLinkPan(@RequestBody @Validated SaveLinkPanParamVO param) throws Exception{
-        return sceneEditInfoService.saveLinkPan(param);
-    }
-
-    /**
-     * <p>
-            删除场景关联
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/linkPan/delete")
-    public ResultData deleteLinkPan(@RequestBody @Validated DeleteLinkPanParamVO param) throws Exception {
-        return sceneEditInfoService.deleteLinkPan(param);
-    }
-
-    /**
-     * <p>
-            删除场景关联图标
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/styles/delete")
-    public ResultData deleteStyles(@RequestBody @Validated DeleteStylesParamVO param) throws Exception {
-        return sceneEditInfoService.deleteStyles(param);
-    }
-
-    /**
-     * <p>
-            场景关联列表
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param num
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/linkPan/list")
-    public ResultData listLinkPan(@RequestParam(value = "num") String num) throws Exception {
-        return sceneEditInfoService.listLinkPan(num);
-    }
-
-    /**
-     * <p>
-     保存户型图
-     * </p>
-     * @author dengsixing
-     * @date 2022/1/20
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/cad/save")
-    public ResultData saveCad(@RequestBody @Validated BaseDataParamVO param) throws Exception{
-        return sceneEditInfoService.saveCad(param);
-    }
-
-    /**
-     * <p>
-     重置户型图
-     * </p>
-     * @author dengsixing
-     * @date 2022/2/16
-     * @param num
-     * @return
-     **/
-    @CheckPermit
-    @PostMapping(value = "/cad/reset")
-    public ResultData resetCad(@RequestParam(value = "num") String num) throws Exception {
-        return sceneEditInfoService.resetCad(num);
-    }
-
-    /**
-     * <p>
-     楼层户型重命名
-     * </p>
-     * @author dengsixing
-     * @date 2022/2/16
-     * @return
-     **/
-    @CheckPermit
-    @PostMapping(value = "/cad/rename")
-    public ResultData renameCad(@RequestBody @Validated RenameCadParamVO param) throws IOException {
-        return sceneEditInfoService.renameCad(param);
-    }
-
-    /**
-     * <p>
-     获取场景详情
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param param
-     * @return com.fdkankan.scene.vo.SceneInfoVO
-     **/
-    @GetMapping(value = "/getInfo")
-    public SceneInfoVO getInfo(@Validated SceneInfoParamVO param) throws Exception{
-        param.setReqType(SceneInfoReqType.EDIT.code());
-        return sceneEditInfoService.getSceneInfo(param);
-    }
-
-    /**
-     * <p>
-            上传全景图
-     * </p>
-     * @author dengsixing
-     * @date 2022/2/16
-     * @param num
-     * @param file
-     * @return java.util.List<java.lang.String>
-     **/
-    @CheckPermit
-    @PostMapping(value = "/uploadPanorama")
-    public ResultData uploadPanorama(@RequestParam(value = "num") String num,
-        @RequestParam("file") MultipartFile file) throws Exception {
-        return sceneEditInfoService.uploadPanorama(num, file);
-    }
-
-    /**
-     * <p>
-            下载全景图
-     * </p>
-     * @author dengsixing
-     * @date 2022/2/16
-     * @return java.util.List<java.lang.String>
-     **/
-    @CheckPermit
-    @PostMapping(value = "/downloadPanorama")
-    public ResultData downloadPanorama(@RequestBody @Validated FileParamVO param) throws Exception {
-        return sceneEditInfoService.downloadPanorama(param);
-    }
-
-    /**
-     * <p>
-            保存视频盒子
-     * </p>
-     * @author dengsixing
-     * @date 2022/2/18
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/video/box/save")
-    public ResultData saveVideoBox(@RequestBody @Validated FileNameAndDataParamVO param) throws Exception {
-        return sceneEditInfoService.saveVideoBox(param);
-    }
-
-    /**
-     * <p>
-            删除视频盒子
-     * </p>
-     * @author dengsixing
-     * @date 2022/2/18
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/video/box/delete")
-    public ResultData deleteVideoBox(@RequestBody @Validated DeleteSidParamVO param) throws Exception {
-        return sceneEditInfoService.deleteVideoBox(param);
-    }
-
-    /**
-     * <p>
-     保存空间贴图
-     * </p>
-     * @author dengsixing
-     * @date 2022/2/18
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/photo/box/save")
-    public ResultData savePhotoBox(@RequestBody @Validated BaseDataParamVO param) throws Exception {
-        return sceneEditInfoService.saveBoxPhoto(param);
-    }
-
-    /**
-     * <p>
-     删除空间贴图
-     * </p>
-     * @author dengsixing
-     * @date 2022/2/18
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/photo/box/delete")
-    public ResultData deletePhotoBox(@RequestBody @Validated DeleteSidParamVO param) throws Exception {
-        return sceneEditInfoService.deleteBoxPhoto(param);
-    }
-
-
-    /**
-     * <p>
-        下载视频
-     * </p>
-     * @author dengsixing
-     * @date 2022/2/23
-     * @param param
-     * @return com.fdkankan.scene.vo.DownloadVO
-     **/
-    @CheckPermit
-    @PostMapping(value = "/downloadBallScreenVideo")
-    public DownloadVO downloadBallScreenVideo(@RequestBody @Validated BallScreenVideoParamVO param){
-        return sceneEditInfoService.downloadBallScreenVideo(param);
-    }
-
-    /**
-     * <p>
-            上传视频
-     * </p>
-     * @author dengsixing
-     * @date 2022/2/23
-     * @param num
-     * @param fileName
-     * @param file
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/uploadBallScreenVideo")
-    public ResultData uploadBallScreenVideo(
-            @RequestParam("num") String num,
-            @RequestParam("fileName") String fileName,
-            @RequestParam("file") MultipartFile file) throws Exception {
-        return sceneEditInfoService.uploadBallScreenVideo(num, fileName, file);
-    }
-
-    /**
-     * <p>
-            上传文件
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param base64
-     * @param fileName
-     * @param bizType
-     * @param files
-     * @param num
-     * @param type
-     * @param uploadPath
-     * @return java.lang.String
-     **/
-    @CheckPermit
-    @RequestMapping(value = "/upload/files", method = RequestMethod.POST)
-    public String uploads(@RequestParam(value = "base64",required = false) String base64,
-        @RequestParam(value = "fileName",required = false) String fileName,
-        @RequestParam(value = "bizType",required = false) String bizType,
-        @RequestParam(value = "files",required = false) MultipartFile[] files,
-        @RequestParam(value = "num",required = false) String num,
-        @RequestParam(value = "type",required = false,defaultValue = "1") Integer type,
-        @RequestParam(value = "uploadPath",required = false) String uploadPath) throws Exception {
-        return sceneUploadService.uploads(base64,fileName,bizType,files,num,type,getToken(),uploadPath);
-    }
-
-    /**
-     * <p>
-     用户自定义上传文本内容上传
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param param
-     * @return java.lang.String
-     **/
-    @RequestMapping(value = "/upload/content", method = RequestMethod.POST)
-    public String uploadContent(@RequestBody @Validated UploadContentParamVO param) throws Exception {
-        return sceneUploadService.uploadContent(param);
-    }
-
-    /**
-     * <p>
-            删除文件
-     * </p>
-     * @author dengsixing
-     * @date 2022/2/23
-     * @param paramVO
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping("/delete/file")
-    public ResultData delete(@RequestBody @Validated DeleteFileParamVO paramVO) throws Exception{
-        return sceneUploadService.delete(paramVO);
-    }
-
-    /**
-     * <p>
-     场景同步
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param num
-     * @param type
-     * @param floorPlanJson
-     * @param ajkJson
-     * @param cameraJson
-     * @param files
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/sceneSync")
-    public ResultData sceneSync(
-        @RequestParam("num") String num,
-        @RequestParam(value = "type", defaultValue = "ajk") String type,
-        @RequestParam("floorPlanJson") String floorPlanJson,
-        @RequestParam("ajkJson") String ajkJson,
-        @RequestParam("cameraJson") String cameraJson,
-        @RequestParam("files") MultipartFile[] files) throws Exception{
-        return sceneEditInfoService.sceneSync(num, type, floorPlanJson, ajkJson, cameraJson, files);
-    }
-
-    /**
-     * <p>
-     获取场景权限
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param num
-     * @return com.fdkankan.scene.vo.SceneAuthVO
-     **/
-    @CheckPermit
-    @PostMapping(value = "/getAuth")
-    public SceneAuthVO getAuth(@RequestParam("num") String num) throws Exception{
-        return sceneEditService.getAuth(num, this.getSsoUser());
-    }
-
-    /**
-     * <p>
-            上传国际化文件
-     * </p>
-     * @author dengsixing
-     * @date 2022/4/11
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @PostMapping(value = "/locales")
-    public ResultData locales(@RequestBody @Validated LocalesParamVO param) throws Exception {
-        if("pro".equals(env)){
-            throw new BusinessException(ErrorCode.HAVE_NO_RIGHT);
-        }
-        return sceneEditService.locales(param);
-    }
-
-    /**
-     * <p>
-     保存导览
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/tour/save")
-    public ResultData saveTour(@RequestBody @Validated BaseDataParamVO param) throws Exception{
-        return sceneEditService.saveTour(param);
-    }
-
-    /**
-     * <p>
-     删除导览
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/tour/delete")
-    public ResultData deleteTour(@RequestBody @Validated BaseSceneParamVO param) throws Exception{
-        return sceneEditService.deleteTour(param);
-    }
-
-    @PostMapping(value = "/tour/video/upload")
-    public ResultData uploadTourVideo(@RequestParam("num") String num, @RequestParam("file") MultipartFile file) throws Exception {
-        return downloadTourVideoService.uploadTourVideo(num, file);
-    }
-
-    @PostMapping(value = "/tour/video/download")
-    public ResultData downloadTourVideo(@RequestParam("num") String num) throws Exception {
-        return downloadTourVideoService.downloadTourVideo(num);
-    }
-
-    /**
-     * <p>
-     添加马赛克
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/mosaics/add")
-    public ResultData addMosaics(@RequestBody @Validated BaseDataParamVO param) throws Exception{
-        return sceneEditInfoService.addMosaics(param);
-    }
-
-    /**
-     * <p>
-     删除马赛克
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/mosaics/delete")
-    public ResultData deleteMosaics(@RequestBody @Validated DeleteMosaicParamVO param) throws Exception{
-        return sceneEditInfoService.deleteMosaics(param);
-    }
-
-    /**
-     * <p>
-     马赛克列表
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/mosaics/list")
-    public ResultData getMosaicList(@RequestBody @Validated BaseSceneParamVO param) throws Exception{
-        return ResultData.ok(sceneEditInfoService.getMosaicList(param.getNum()));
-    }
-
-    /**
-     * <p>
-     添加水印
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/waterMark/add")
-    public ResultData addWaterMark(@RequestBody @Validated BaseFileParamVO param) throws Exception{
-        return sceneEditInfoService.addWaterMark(param);
-    }
-
-    /**
-     * <p>
-     删除水印
-     * </p>
-     * @author dengsixing
-     * @date 2022/8/1
-     * @param param
-     * @return com.fdkankan.web.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping(value = "/waterMark/delete")
-    public ResultData deleteWaterMark(@RequestBody @Validated BaseFileParamVO param) throws Exception{
-        return sceneEditInfoService.deleteWaterMark(param);
-    }
-
-    /**
-     * 删除水印
-     * @param param
-     * @return
-     * @throws Exception
-     */
-    @CheckPermit
-    @PostMapping(value = "/filter/save")
-    public ResultData saveFilter(@RequestBody @Validated SaveFiltersParamVO param) throws Exception{
-        return sceneEditInfoService.saveFilter(param);
-    }
-
-    /**
-     * 删除水印
-     * @param param
-     * @return
-     * @throws Exception
-     */
-    @CheckPermit
-    @PostMapping(value = "/filter/list")
-    public ResultData listFilter(@RequestBody @Validated BaseSceneParamVO param) throws Exception{
-        return sceneEditInfoService.listFilter(param);
-    }
-
-    /**
-     * <p>
-     添加监控
-     * </p>
-     * @author dengsixing
-     * @date 2022/9/20
-     * @param param
-     * @return com.fdkankan.common.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping("/surveillance/save")
-    ResultData saveSurveillance(@RequestBody @Validated SurveillanceParamVO param){
-        return surveillanceService.saveSurveillance(param);
-    }
-
-    @CheckPermit
-    @PostMapping("/surveillance/delete")
-    public ResultData deleteSurveillance(@RequestBody @Validated BaseSidParamVO param) throws IOException {
-        return surveillanceService.deleteSurveillance(param);
-    }
-
-    @CheckPermit
-    @PostMapping("/surveillance/list")
-    public ResultData listSurveillance(@RequestBody @Validated BaseSceneParamVO param){
-        return ResultData.ok(surveillanceService.listSurveillance(param.getNum()));
-    }
-
-    /**
-     * <p>
-     上传空间模型
-     * </p>
-     * @author dengsixing
-     * @date 2022/10/19
-     * @param num
-     * @param sid
-     * @param file
-     * @return com.fdkankan.common.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping("/model/box/upload")
-    public ResultData uploadBoxModel(
-        @RequestParam(value = "num") String num,
-        @RequestParam(value = "sid") String sid,
-        @RequestParam(value = "file") MultipartFile file) throws Exception {
-        return boxModelService.uploadBoxModel(num, sid, file);
-    }
-
-    /**
-     * <p>
-     保存空间模型
-     * </p>
-     * @author dengsixing
-     * @date 2022/10/19
-     * @param param
-     * @return com.fdkankan.common.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping("/model/box/save")
-    public ResultData saveBoxModel(@RequestBody @Validated BaseJsonDataParamVO param) throws Exception {
-        return boxModelService.saveBoxModel(param);
-    }
-
-    /**
-     * <p>
-     删除空间模型
-     * </p>
-     * @author dengsixing
-     * @date 2022/10/19
-     * @param param
-     * @return com.fdkankan.common.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping("/model/box/delete")
-    public ResultData delBoxModel(@RequestBody @Validated DeleteSidParamVO param) throws Exception {
-        return boxModelService.deleteBoxModel(param);
-    }
-
-    /**
-     * 上传二维码和分享的logo
-     * @return
-     */
-    @PostMapping(value = "/uploadShareLogo")
-    public ResultData uploadShareLogo(@RequestParam("num") String num, @RequestParam("file") MultipartFile file) throws Exception {
-        return scenePlusService.uploadShareLogo(num, file);
-    }
-
-    /**
-     * <p>
-     删除空间模型
-     * </p>
-     * @author dengsixing
-     * @date 2022/10/19
-     * @param param
-     * @return com.fdkankan.common.response.ResultData
-     **/
-    @CheckPermit
-    @PostMapping("/getAsynOperLog")
-    public ResultData getAsynOperLog(@RequestBody @Validated SceneAsynOperLogParamVO param){
-        return sceneAsynOperLogService.getAsynOperLog(param);
-    }
-
-    /**
-     * 获取编辑器版本信息
-     * @return
-     */
-    @GetMapping("/getServiceUpTip")
-    public ResultData getServiceUpTip(){
-        return sceneEditService.getServiceUpTip();
-    }
-
-    /**
-     * 保存或者修改指示牌
-     * @param param
-     * @return
-     * @throws Exception
-     */
-    @CheckPermit
-    @PostMapping("/billboards/save")
-    public ResultData saveBillboards(@RequestBody @Validated BaseJsonArrayParamVO param) throws Exception {
-        return sceneEditInfoExtService.saveBillboards(param);
-    }
-
-    /**
-     * 删除指示牌
-     * @param param
-     * @return
-     * @throws Exception
-     */
-    @CheckPermit
-    @PostMapping("/billboards/delete")
-    public ResultData deleteBillboards(@RequestBody @Validated DeleteSidListParamVO param) throws Exception {
-        return sceneEditInfoExtService.deleteBillboards(param);
-    }
-
-    /**
-     * 获取指示牌列表
-     * @param param
-     * @return
-     * @throws Exception
-     */
-    @CheckPermit
-    @PostMapping("/billboards/list")
-    public ResultData deleteBillboards(@RequestBody @Validated BaseSceneParamVO param) throws Exception {
-        return ResultData.ok(sceneEditInfoExtService.listBillboards(param));
-    }
-
-    /**
-     * 获取指示牌列表
-     * @param param
-     * @return
-     * @throws Exception
-     */
-    @CheckPermit
-    @PostMapping("/billboards/styles/delete")
-    public ResultData deleteBillboards(@RequestBody @Validated DeleteStylesParamVO param) throws Exception {
-        return ResultData.ok(sceneEditInfoExtService.deleteBillboardsStyles(param));
-    }
-
-    @CheckPermit
-    @PostMapping(value = "/cutModel/save")
-    public ResultData saveCutModel(@RequestBody @Validated BaseJsonArrayParamVO param) throws Exception {
-        return cutModelService.saveCutModel(param);
-    }
-
-    @CheckPermit
-    @PostMapping(value = "/cutModel/list")
-    public ResultData listCutModel(@RequestBody @Validated BaseSceneParamVO param) throws Exception {
-        return ResultData.ok(cutModelService.listCutModel(param));
-    }
-
-    @CheckPermit
-    @PostMapping(value = "/cutModel/delete")
-    public ResultData deleteCutModel(@RequestBody @Validated DeleteSidListParamVO param) throws Exception {
-        return cutModelService.deleteCutModel(param);
-    }
-
-
-
-}

src/main/java/com/fdkankan/scene/controller/SceneEditControlsController.java

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

src/main/java/com/fdkankan/scene/controller/SceneEditInfoController.java

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

src/main/java/com/fdkankan/scene/controller/SceneEditInfoExtController.java

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

src/main/java/com/fdkankan/scene/controller/ScenePlusController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.scene.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 场景主表 前端控制器
- * </p>
- *
- * @author 
- * @since 2022-03-16
- */
-@RestController
-@RequestMapping("/test/scenePlus")
-public class ScenePlusController {
-
-}
-

src/main/java/com/fdkankan/scene/controller/ScenePlusExtController.java

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

src/main/java/com/fdkankan/scene/controller/SceneProController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.scene.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * pro场景表 前端控制器
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@RestController
-@RequestMapping("/scene/scenePro")
-public class SceneProController {
-
-}
-

src/main/java/com/fdkankan/scene/controller/SceneRepairLogController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.scene.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 场景数据迁移日志--V4版本稳定后可删除 前端控制器
- * </p>
- *
- * @author 
- * @since 2022-04-22
- */
-@RestController
-@RequestMapping("/scene/sceneRepairLog")
-public class SceneRepairLogController {
-
-}
-

src/main/java/com/fdkankan/scene/controller/SceneUploadController.java

@@ -1,13 +0,0 @@
-package com.fdkankan.scene.controller;
-
-
-import com.fdkankan.web.controller.BaseController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/service/scene/edit")
-public class SceneUploadController extends BaseController {
-
-
-}

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

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

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

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

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

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

src/main/java/com/fdkankan/scene/entity/DownloadTourVideo.java

@@ -1,87 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 导览视频转换记录表
- * </p>
- *
- * @author 
- * @since 2022-10-12
- */
-@Getter
-@Setter
-@TableName("t_download_tour_video")
-public class DownloadTourVideo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 场景码
-     */
-    @TableField("num")
-    private String num;
-
-    /**
-     * 视频转换状态（0-等待中，1-成功，2-失败）
-     */
-    @TableField("state")
-    private Integer state;
-
-    /**
-     * 转换失败原因
-     */
-    @TableField("reason")
-    private String reason;
-
-    /**
-     * 文件名称
-     */
-    @TableField("file_name")
-    private String fileName;
-
-    /**
-     * 本地临时文件地址
-     */
-    @TableField("local_path")
-    private String localPath;
-
-    /**
-     * 导览视频目录地址
-     */
-    @TableField("download_path")
-    private String downloadPath;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 修改时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * A-有效，I-无效
-     */
-    @TableField("rec_status")
-    @TableLogic(value = "A", delval = "I")
-    private String recStatus;
-
-
-}

src/main/java/com/fdkankan/scene/entity/SceneAsynOperLog.java

@@ -1,105 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 
- * @since 2022-12-07
- */
-@Getter
-@Setter
-@TableName("t_scene_asyn_oper_log")
-public class SceneAsynOperLog implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 场景码
-     */
-    @TableField("num")
-    private String num;
-
-    /**
-     * 操作类型（upload-上传,download-下载）
-     */
-    @TableField("oper_type")
-    private String operType;
-
-    /**
-     * 模块名称
-     */
-    @TableField("module")
-    private String module;
-
-    /**
-     * 功能
-     */
-    @TableField("func")
-    private String func;
-
-    /**
-     * 版本号
-     */
-    @TableField("version")
-    private Integer version;
-
-    /**
-     * 状态(0-处理中，1-处理完成，2-处理失败)
-     */
-    @TableField("state")
-    private Integer state;
-
-    /**
-     * 下载链接
-     */
-    @TableField("url")
-    private String url;
-
-    /**
-     * 是否需要弹窗（0-否，1-是）
-     */
-    @TableField("pop")
-    private Integer pop;
-
-    /**
-     * 扩展信息
-     */
-    @TableField("ext_data")
-    private String extData;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 修改时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 状态（A-有效，I-无效）
-     */
-    @TableField("rec_status")
-    @TableLogic(value = "A", delval = "I")
-    private String recStatus;
-
-
-}

src/main/java/com/fdkankan/scene/entity/SceneCleanOrig.java

@@ -1,69 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 删除oss原始资源记录
- * </p>
- *
- * @author 
- * @since 2023-03-29
- */
-@Getter
-@Setter
-@TableName("t_scene_clean_orig")
-public class SceneCleanOrig implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @TableField("num")
-    private String num;
-
-    /**
-     * type
-     */
-    @TableField("type")
-    private Integer type;
-
-    /**
-     * 0-处理中，1-成功，-1失败
-     */
-    @TableField("state")
-    private Integer state;
-
-    /**
-     * 失败原因
-     */
-    @TableField("reason")
-    private String reason;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 修改时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    @TableLogic(value = "A", delval = "I")
-    private String recStatus;
-
-
-}

src/main/java/com/fdkankan/scene/entity/SceneColdStorage.java

@@ -1,72 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 场景封存状态表
- * </p>
- *
- * @author 
- * @since 2023-07-25
- */
-@Getter
-@Setter
-@TableName("t_scene_cold_storage")
-public class SceneColdStorage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 场景码
-     */
-    @TableField("num")
-    private String num;
-
-    /**
-     * 1-封存，2-未封存
-     */
-    @TableField("state")
-    private Integer state;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 修改时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    @TableField("rec_status")
-    @TableLogic(value = "A", delval = "I")
-    private String recStatus;
-
-    /**
-     * 冷存储bucket
-     */
-    @TableField("cold_bucket")
-    private String coldBucket;
-
-    /**
-     * 正常使用bucket
-     */
-    @TableField("bucket")
-    private String bucket;
-
-
-}

src/main/java/com/fdkankan/scene/entity/SceneColdStorageLog.java

@@ -1,75 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 场景冷归档日志表
- * </p>
- *
- * @author 
- * @since 2023-07-12
- */
-@Getter
-@Setter
-@TableName("t_scene_cold_storage_log")
-public class SceneColdStorageLog implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 场景码
-     */
-    @TableField("num")
-    private String num;
-
-    /**
-     * 封存地址
-     */
-    @TableField("path")
-    private String path;
-
-    /**
-     * 操作类型（1-封存，2-解封存）
-     */
-    @TableField("type")
-    private Integer type;
-
-    @TableField("state")
-    private Integer state;
-
-    @TableField("reason")
-    private String reason;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 修改时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * A-有效，I-无效
-     */
-    @TableField("rec_status")
-    @TableLogic(value = "A", delval = "I")
-    private String recStatus;
-
-
-}

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

@@ -1,54 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 
- * @since 2022-07-04
- */
-@Getter
-@Setter
-@TableName("t_scene_cooperation")
-public class SceneCooperation implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 场景码
-     */
-    @TableField("scene_num")
-    private String sceneNum;
-
-    /**
-     * 协作的用户id
-     */
-    @TableField("user_id")
-    private Long userId;
-
-    @TableField("create_time")
-    private Date createTime;
-
-    @TableField("update_time")
-    private Date updateTime;
-
-    @TableLogic(value = "A", delval = "I")
-    @TableField("rec_status")
-    private String recStatus;
-
-
-}

src/main/java/com/fdkankan/scene/entity/SceneDataDownload.java

@@ -1,66 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 安居客场景数据下载
- * </p>
- *
- * @author 
- * @since 2022-01-20
- */
-@Getter
-@Setter
-@TableName("t_scene_data_download")
-public class SceneDataDownload implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 场景码
-     */
-    @TableField("scene_num")
-    private String sceneNum;
-
-    /**
-     * 文件md5
-     */
-    @TableField("file_md5")
-    private String fileMd5;
-
-    /**
-     * 文件下载地址
-     */
-    @TableField("download_path")
-    private String downloadPath;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    @TableLogic(value = "A", delval = "I")
-    private String recStatus;
-
-
-}

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

@@ -1,161 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 
- * @since 2022-01-20
- */
-@Getter
-@Setter
-@TableName("t_scene_edit_controls")
-public class SceneEditControls implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * t_scene_edit_info表id
-     */
-    @TableField("edit_info_id")
-    private Long editInfoId;
-
-    /**
-     * 是否展示小地图（0-不展示，1-展示）
-     */
-    @TableField("show_map")
-    private Integer showMap;
-
-    /**
-     * 是否需要密码（0-不需要，1-需要）
-     */
-    @TableField("show_lock")
-    private Integer showLock;
-
-    /**
-     * 是否展示标题（0-不需要，1-需要）
-     */
-    @TableField("show_title")
-    private Integer showTitle;
-
-    /**
-     * 是否展示漫游按钮（0-不需要，1-需要）
-     */
-    @TableField("show_panorama")
-    private Integer showPanorama;
-
-    /**
-     * 是否展示3D按钮（0-不需要，1-需要）
-     */
-    @TableField("show_dollhouse")
-    private Integer showDollhouse;
-
-    /**
-     * 是否展示2D按钮（0-不需要，1-需要）
-     */
-    @TableField("show_floorplan")
-    private Integer showFloorplan;
-
-    /**
-     * 是否展示VR（0-不需要，1-需要）
-     */
-    @TableField("show_VR")
-    private Integer showVR;
-
-    /**
-     * 是否展示自动导览（0-不需要，1-需要）
-     */
-    @TableField("show_tour")
-    private Integer showTour;
-
-    /**
-     * 是否展示测量线（0-不需要，1-需要）
-     */
-    @TableField("show_rule")
-    private Integer showRule;
-
-
-    /**
-     * 是否展示标尺（0-不需要，1-需要）
-     */
-    @TableField("show_scale")
-    private Integer showScale;
-
-    /**
-     * 是否展示分享场景（0-不需要，1-需要）
-     */
-    @TableField("show_share")
-    private Integer showShare;
-
-    /**
-     * 是否展示分享热点（0-不需要，1-需要）
-     */
-    @TableField("show_tagshare")
-    private Integer showTagshare;
-
-    /**
-     * 是否展示合照开关（0-不需要，1-需要）
-     */
-    @TableField("show_capture")
-    private Integer showCapture;
-
-    /**
-     * 是否显示多媒体标签标题（0-否，1-是）
-     */
-    @TableField("show_tag_title")
-    private Integer showTagTitle;
-
-    /**
-     * 是否显示指示牌标签标题（0-否，1-是）
-     */
-    @TableField("show_billboard_title")
-    private Integer showBillboardTitle;
-
-    /**
-     * 是否显示视频监控标签标题（0-否，1-是）
-     */
-    @TableField("show_camera_title")
-    private Integer showCameraTitle;
-
-    /**
-     * 是否显示场景关联标签标题（0-否，1-是）
-     */
-    @TableField("show_link_title")
-    private Integer showLinkTitle;
-
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    @TableLogic(value = "A", delval = "I")
-    private String recStatus;
-
-
-}

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

@@ -1,207 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 
- * @since 2022-01-20
- */
-@Getter
-@Setter
-@TableName("t_scene_edit_info")
-public class SceneEditInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @TableField("scene_pro_id")
-    private Long sceneProId;
-
-    @TableField("scene_plus_id")
-    private Long scenePlusId;
-
-    /**
-     * 地面logo名称
-     */
-    @TableField("floor_logo")
-    private String floorLogo;
-
-    /**
-     * 地面logo大小
-     */
-    @TableField("floor_logo_size")
-    private Integer floorLogoSize;
-
-    /**
-     * 地面logo文件名称
-     */
-    @TableField("floor_logo_file")
-    private String floorLogoFile;
-
-    /**
-     * 背景音乐名称
-     */
-    @TableField("music")
-    private String music;
-
-    /**
-     * 背景音乐文件名称
-     */
-    @TableField("music_file")
-    private String musicFile;
-
-    /**
-     * 浏览密码
-     */
-    @TableField("scene_password")
-    private String scenePassword;
-
-    /**
-     * 场景标题
-     */
-    @TableField("title")
-    private String title;
-
-    /**
-     * 场景描述
-     */
-    @TableField("description")
-    private String description;
-
-    /**
-     * 用户是否上传户型图
-     */
-    @TableField("floor_plan_user")
-    private Byte floorPlanUser;
-
-//    /**
-//     *
-//     */
-//    @TableField("cad_info")
-//    private String cadInfo;
-
-    /**
-     * 是否有热点数据（0-否，1-是）
-     */
-    @TableField("tags")
-    private Byte tags;
-
-    /**
-     * 版本
-     */
-    @TableField("version")
-    private Integer version;
-
-    /**
-     * 图片版本
-     */
-    @TableField("img_version")
-    private Integer imgVersion;
-
-    /**
-     * 场景关联版本
-     */
-    @TableField("link_version")
-    private Integer linkVersion;
-
-    /**
-     * 是否上传模型
-     */
-    @TableField("is_upload_obj")
-    private Byte isUploadObj;
-
-    /**
-     * 重新建模的版本
-     */
-    @TableField("floor_edit_ver")
-    private Integer floorEditVer;
-
-    /**
-     * 正式发布重新建模的版本
-     */
-    @TableField("floor_publish_ver")
-    private Integer floorPublishVer;
-
-    /**
-     * 空间视频数据
-     */
-    @TableField("box_videos")
-    private String boxVideos;
-
-    /**
-     * 空间贴图数据
-     */
-    @TableField("box_photos")
-    private String boxPhotos;
-
-    /**
-     * 空间模型数据
-     */
-    @TableField("box_models")
-    private String boxModels;
-
-    /**
-     * 是否需要处理球幕视频
-     */
-    @TableField("build_video_status")
-    private Byte buildVideoStatus;
-
-    /**
-     * 初始点信息
-     */
-    @TableField("entry")
-    private String entry;
-
-    /**
-     * 加载logo名
-     */
-    @TableField("loading_logo")
-    private String loadingLogo;
-
-    /**
-     * 加载logo文件名
-     */
-    @TableField("loading_logo_file")
-    private String loadingLogoFile;
-
-    /**
-     * 用户上传自定义平面图数据
-     */
-    @TableField("floor_plan_upload")
-    private String floorPlanUpload;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 修改时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    @TableLogic(value = "A", delval = "I")
-    private String recStatus;
-
-
-}

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

@@ -1,137 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 
- * @since 2022-03-07
- */
-@Getter
-@Setter
-@TableName("t_scene_edit_info_ext")
-public class SceneEditInfoExt {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @TableField("scene_pro_id")
-    private Long sceneProId;
-
-    @TableField("scene_plus_id")
-    private Long scenePlusId;
-
-    @TableField("edit_info_id")
-    private Long editInfoId;
-
-    @TableField("floor_plan_angle")
-    private Float floorPlanAngle;
-
-    @TableField("floor_plan_compass")
-    private Float floorPlanCompass;
-
-    /**
-     * 大场景序号(随心装场景码)  原pro_edit表中的字段
-     */
-    @TableField("vr_num")
-    private String vrNum;
-
-    /**
-     * 是否有保存导览（0-否，1-是）
-     */
-    @TableField("tours")
-    private Integer tours;
-
-    /**
-     * 是否有马赛克
-     */
-    @TableField("mosaic")
-    private Integer mosaic;
-
-    /**
-     * 水印文件名
-     */
-    @TableField("water_mark")
-    private String waterMark;
-
-    /**
-     * 是否有场景关联(0-否，1-是)
-     */
-    @TableField("links")
-    private Integer links;
-
-    /**
-     * 是否有滤镜(0-否，1-是)
-     */
-    @TableField("filters")
-    private Integer filters;
-
-    /**
-     * 是否有监控摄像头（0-否，1-是）
-     */
-    @TableField("surveillances")
-    private Integer surveillances;
-
-    /**
-     * 二维码logo路径（oss相对路径）
-     */
-    @TableField("share_logo_img")
-    private String shareLogoImg;
-
-    /**
-     * 是否有指示牌（0-否，1-是）
-     */
-    @TableField("billboards")
-    private Integer billboards;
-
-    /**
-     * 是否有指示牌（0-否，1-是）
-     */
-    @TableField("cut_model")
-    private Integer cutModel;
-
-    /**
-     * 分享配置信息
-     */
-    @TableField("sns_info")
-    private String snsInfo;
-
-    /**
-     * 启动页信息
-     */
-    @TableField("started")
-    private String started;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    @TableLogic(value = "A", delval = "I")
-    private String recStatus;
-
-
-}

src/main/java/com/fdkankan/scene/entity/SceneMarkShape.java

@@ -1,74 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 场景标记多边形识别数据
- * </p>
- *
- * @author Xiewj
- * @date 2023/3/30
- */
-@Data
-@TableName(value = "t_scene_mark_shape",autoResultMap = true)
-@Accessors(chain = true)
-public class SceneMarkShape implements Serializable {
-
-      /**
-       * 主键
-       */
-      @TableId(value = "id", type = IdType.AUTO)
-      private Long id;
-
-      @TableField("version")
-      private String version;
-      @TableField(typeHandler = FastjsonTypeHandler.class, value = "flag")
-      private JSONObject flag;
-
-      @TableField(typeHandler = FastjsonTypeHandler.class, value = "shapes")
-      private List<JSONObject> shapes;
-
-      @TableField("image_path")
-      private String imagePath;
-      @TableField("image_height")
-      private Integer imageHeight;
-      @TableField("image_width")
-      private Integer imageWidth;
-      @TableField("num")
-      private String num;
-      /**
-       * 0不需要 1需要
-       */
-      @TableField("re_train")
-      private Integer reTrain;
-      /**
-       * 0需要训练 1已经训练过
-       */
-      @TableField("to_train")
-      private Integer toTrain;
-
-      @TableField("create_time")
-      private Date createTime;
-
-      @TableField("update_time")
-      private Date updateTime;
-
-      /**
-       * 记录的状态，A: 生效，I: 禁用
-       */
-      @TableField("rec_status")
-      @TableLogic(value = "A", delval = "I")
-      private String recStatus;
-
-}

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

@@ -1,123 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 场景主表
- * </p>
- *
- * @author 
- * @since 2022-03-16
- */
-@Getter
-@Setter
-@TableName("t_scene_plus")
-public class ScenePlus implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 场景码
-     */
-    @TableField("num")
-    private String num;
-
-    /**
-     * 用户id
-     */
-    @TableField("user_id")
-    private Long userId;
-
-    /**
-     * 相机id
-     */
-    @TableField("camera_id")
-    private Long cameraId;
-
-    /**
-     * 手机id
-     */
-    @TableField("phone_id")
-    private String phoneId;
-
-    /**
-     * 场景名称
-     */
-    @TableField("title")
-    private String title;
-
-    /**
-     * 场景描述
-     */
-    @TableField("description")
-    private String description;
-
-    /**
-     * 场景状态：0-未建好，1--已建好，-1-计算出错，-2--不在官网显示
-     */
-    @TableField("scene_status")
-    private Integer sceneStatus;
-
-    /**
-     * 场景来源：相机拍摄10以内表示，1表示八目，2双目，3转台，4 激光  其他来源10以上，11：一键换装，12：123看房，13文通虚拟场景
-     */
-    @TableField("scene_source")
-    private Integer sceneSource;
-
-    /**
-     * 支付状态：0表示未付款，1表示付款了，-1表示欠费，-2表示容量不足
-     */
-    @TableField("pay_status")
-    private Integer payStatus;
-
-    /**
-     * 场景类型  0-其他，1-文博，2-地产，3-电商，4-餐饮，5-家居,99-一件换装虚拟房源
-     */
-    @TableField("scene_type")
-    private Integer sceneType;
-
-    /**
-     * 是否推荐：0-否，1-是
-     */
-    @TableField("recommend")
-    private Integer recommend;
-
-    /**
-     * 是否有housetype文件（0-否，1-是）
-     */
-    @TableField("house_type")
-    private Integer houseType;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    @TableLogic(value = "A", delval = "I")
-    private String recStatus;
-
-
-}

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

@@ -1,174 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 
- * @since 2022-03-16
- */
-@Getter
-@Setter
-@TableName("t_scene_plus_ext")
-public class ScenePlusExt implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * t_scene_plus主键
-     */
-    @TableField("plus_id")
-    private Long plusId;
-
-    /**
-     * 场景数据目录
-     */
-    @TableField("data_source")
-    private String dataSource;
-
-    /**
-     * 场景链接
-     */
-    @TableField("web_site")
-    private String webSite;
-
-    /**
-     * 缩略图链接
-     */
-    @TableField("thumb")
-    private String thumb;
-
-    /**
-     * 方案：1-双目，2-转台，3-六目,4-八目,10-获取4k图，11-获取2k，12-获取1k
-     */
-    @TableField("scene_scheme")
-    private Integer sceneScheme;
-
-    /**
-     * 使用用量
-     */
-    @TableField("space")
-    private Long space;
-
-    /**
-     * 云服务器类型
-     */
-    @TableField("ecs")
-    private String ecs;
-
-    /**
-     * 点位数量
-     */
-    @TableField("shoot_count")
-    private Integer shootCount;
-
-    /**
-     * 浏览次数
-     */
-    @TableField("view_count")
-    private Integer viewCount;
-
-    /**
-     * gps定位
-     */
-    @TableField("gps")
-    private String gps;
-
-    /**
-     * 算法类型(slam、sfm)
-     */
-    @TableField("algorithm")
-    private String algorithm;
-
-    /**
-     * 固件版本
-     */
-    @TableField("firmware_version")
-    private String firmwareVersion;
-
-    /**
-     * 算法类型（V2,V3）
-     */
-    @TableField("build_type")
-    private String buildType;
-
-    /**
-     * 分辨率（2k,4k）
-     */
-    @TableField("scene_resolution")
-    private String sceneResolution;
-
-    /**
-     * 场景来源，lite：双目lite相机，pro：八目相机，minion：双面转台相机，laser：激光相机，virtual：虚拟场景，sketch：图片建模场景
-     */
-    @TableField("scene_from")
-    private String sceneFrom;
-
-    /**
-     * 切图方式（tiles：瓦片图，face：切片图，pan：全景图 ，local：本地切片，cube：立体图）
-     */
-    @TableField("scene_kind")
-    private String sceneKind;
-
-    /**
-     * 算法模型类型（dam,3dtiles）
-     */
-    @TableField("model_kind")
-    private String modelKind;
-
-    /**
-     * 算法计算完成时间
-     */
-    @TableField("algorithm_time")
-    private Date algorithmTime;
-
-    /**
-     * 计算耗时
-     */
-    @TableField("compute_time")
-    private String computeTime;
-
-    /**
-     * 点位视频
-     */
-    @TableField("videos")
-    private String videos;
-
-    @TableField("yun_file_bucket")
-    private String yunFileBucket;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    @TableLogic(value = "A", delval = "I")
-    private String recStatus;
-
-
-}

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

@@ -1,231 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * pro场景表
- * </p>
- *
- * @author 
- * @since 2022-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;
-
-
-}

src/main/java/com/fdkankan/scene/entity/SceneRepairLog.java

@@ -1,69 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 场景数据迁移日志--V4版本稳定后可删除
- * </p>
- *
- * @author 
- * @since 2022-04-22
- */
-@Getter
-@Setter
-@TableName("t_scene_repair_log")
-public class SceneRepairLog implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 场景码
-     */
-    @TableField("num")
-    private String num;
-
-    /**
-     * 0-迁移中，1-成功，2-失败
-     */
-    @TableField("state")
-    private Integer state;
-
-    /**
-     * 失败原因
-     */
-    @TableField("reason")
-    private String reason;
-
-    /**
-     * 迁移耗时
-     */
-    @TableField("consum_time")
-    private Long consumTime;
-
-    @TableField("create_time")
-    private Date createTime;
-
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    @TableLogic(value = "A", delval = "I")
-    private String recStatus;
-
-
-}

src/main/java/com/fdkankan/scene/entity/SceneResource.java

@@ -1,78 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 场景资源表
- * </p>
- *
- * @author 
- * @since 2022-01-20
- */
-@Getter
-@Setter
-@TableName("t_scene_resource")
-public class SceneResource implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 权限名称
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 英文名
-     */
-    @TableField("en_name")
-    private String enName;
-
-    /**
-     * 权限key
-     */
-    @TableField("key_word")
-    private String keyWord;
-
-    /**
-     * 权限图标
-     */
-    @TableField("icon")
-    private String icon;
-
-    /**
-     * 资源描述
-     */
-    @TableField("description")
-    private String description;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    @TableLogic(value = "A", delval = "I")
-    private String recStatus;
-
-
-}

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

@@ -1,60 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 场景资源和协作用户关联表
- * </p>
- *
- * @author 
- * @since 2022-01-20
- */
-@Getter
-@Setter
-@TableName("t_scene_resource_cooperation")
-public class SceneResourceCooperation implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 场景资源id
-     */
-    @TableField("scene_resource_id")
-    private Long sceneResourceId;
-
-    /**
-     * 协作用户的id
-     */
-    @TableField("scene_cooperation_id")
-    private Long sceneCooperationId;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    @TableLogic(value = "A", delval = "I")
-    private String recStatus;
-
-
-}

src/main/java/com/fdkankan/scene/entity/SceneUpload.java

@@ -1,73 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 
- * @since 2022-01-19
- */
-@Getter
-@Setter
-@TableName("t_scene_upload")
-public class SceneUpload implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 文件上传资源表
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 场景码
-     */
-    @TableField("num")
-    private String num;
-
-    /**
-     * 文件名称
-     */
-    @TableField("file_path")
-    private String filePath;
-
-    /**
-     * 文件后缀
-     */
-    @TableField("biz_type")
-    private String bizType;
-
-    /**
-     * 文件上传者id
-     */
-    @TableField("upload_user")
-    private Long uploadUser;
-
-    @TableField("create_time")
-    private Date createTime;
-
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    @TableLogic(value = "A", delval = "I")
-    private String recStatus;
-
-
-}

src/main/java/com/fdkankan/scene/entity/Surveillance.java

@@ -1,104 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 监控推拉流信息
- * </p>
- *
- * @author 
- * @since 2022-09-16
- */
-@Getter
-@Setter
-@TableName("t_surveillance")
-public class Surveillance implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 场景码
-     */
-    @TableField("num")
-    private String num;
-
-    /**
-     * 监控名称
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 监控唯一标识
-     */
-    @TableField("sid")
-    private String sid;
-
-    /**
-     * panoId
-     */
-    @TableField("pano_id")
-    private String panoId;
-
-    /**
-     * 摄像头设置信息
-     */
-    @TableField("data")
-    private String data;
-
-    /**
-     * 播放地址
-     */
-    @TableField("play_url")
-    private String playUrl;
-
-    /**
-     * 类型
-     */
-    @TableField("url_type")
-    private Integer urlType;
-
-
-    /**
-     * 播放地址
-     */
-    @TableField("file_name")
-    private String  fileName;
-
-    /**
-     * 封面图
-     */
-    @TableField("poster")
-    private String  poster;
-
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    @TableField("rec_status")
-    @TableLogic(value = "A", delval = "I")
-    private String recStatus;
-
-
-}

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

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

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

@@ -1,102 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 用户增值权益表
- * </p>
- *
- * @author 
- * @since 2022-07-05
- */
-@Getter
-@Setter
-@TableName("t_user_increment")
-public class UserIncrement implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 权益包标识
-     */
-    @TableField("key_word")
-    private String keyWord;
-
-    /**
-     * 用户表t_user的id
-     */
-    @TableField("user_id")
-    private Long userId;
-
-    /**
-     * 相机主表t_camera的id
-     */
-    @TableField("camera_id")
-    private Long cameraId;
-
-    /**
-     * 会员权益类型Id
-     */
-    @TableField("increment_type_id")
-    private Integer incrementTypeId;
-
-    /**
-     * 结束时间
-     */
-    @TableField("increment_end_time")
-    private Date incrementEndTime;
-
-    /**
-     * 是否过期（1过期，0未过期）
-     */
-    @TableField("is_expired")
-    private Integer isExpired;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Date createTime;
-
-    /**
-     * 记录的状态，A: 生效，I: 禁用
-     */
-    @TableField("rec_status")
-    @TableLogic(value = "A", delval = "I")
-    private String recStatus;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Date updateTime;
-
-    /**
-     * 扩容订单集合
-     */
-    @TableField("order_sn")
-    private String orderSn;
-
-    /**
-     * 生效时间
-     */
-    @TableField("increment_start_time")
-    private Date incrementStartTime;
-
-    @TableField("download_num")
-    private Integer downloadNum;
-
-
-}

src/main/java/com/fdkankan/scene/httpclient/FdkankanMiniClient.java

@@ -1,57 +0,0 @@
-//package com.fdkankan.scene.httpclient;
-//
-//import com.dtflys.forest.annotation.Get;
-//import com.dtflys.forest.annotation.Header;
-//import com.dtflys.forest.annotation.Post;
-//import com.dtflys.forest.annotation.Retry;
-//import com.dtflys.forest.annotation.Success;
-//import com.dtflys.forest.annotation.Var;
-//import com.dtflys.forest.callback.OnError;
-//import com.dtflys.forest.callback.OnSuccess;
-//import com.fdkankan.common.response.Result;
-//import java.util.Map;
-//import com.fdkankan.scene.bean.CameraBean;
-//import com.fdkankan.scene.bean.UserIncrementBean;
-//import com.fdkankan.scene.callback.FdkkMiniReqSuccessCondition;
-//
-///**
-// * <p>
-// * TODO
-// * </p>
-// *
-// * @author dengsixing
-// * @since 2022/4/24
-// **/
-//@Success(condition = FdkkMiniReqSuccessCondition.class)
-//public interface FdkankanMiniClient {
-//
-//    @Get(url="{url}"
-////        ,interceptor = TLogForestInterceptor.class    加这个拦截器，打印的tlog日志会详细一些，包括头信息等等
-//    )
-//    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
-//    Result<String> getDataSyncType(@Var("url") String url, OnSuccess<Result> onSuccess, OnError onError);
-//
-//    @Get("{url}")
-//    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
-//    Result<UserIncrementBean> getUserIncrementByCameraId(@Var("url") String url, OnSuccess<Result> onSuccess, OnError onError);
-//
-//    @Get("{url}")
-//    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
-//    Result<CameraBean> getCameraByCameraId(@Var("url") String url, OnSuccess<Result> onSuccess, OnError onError);
-//
-////    @Get(url="{url}")
-////    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
-////    Result<SceneProV3> getSceneProByNum(@Var("url") String url, OnSuccess<Result> onSuccess, OnError onError);
-//
-//    @Post(url="{url}")
-//    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
-//    Result<Map<String, Object>> getIsLogin(@Var("url") String url, @Header("token") String token, OnSuccess<Result> onSuccess, OnError onError);
-//
-////    @Post(
-////        url = "${url}",
-////        contentType = "application/json"
-////    )
-////    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
-////    Result upgradeToV4ResultSync(@Var("url") String url, @Body RequestSceneProV4 param, OnSuccess<Result> onSuccess, OnError onError);
-//
-//}

src/main/java/com/fdkankan/scene/httpclient/MyClient.java

@@ -1,33 +0,0 @@
-package com.fdkankan.scene.httpclient;
-
-
-import com.dtflys.forest.annotation.Get;
-import com.dtflys.forest.annotation.Var;
-import com.dtflys.forest.callback.OnProgress;
-import com.dtflys.forest.extensions.DownloadFile;
-import com.fdkankan.web.response.ResultData;
-
-import java.io.File;
-
-public interface MyClient {
-
-    /**
-     * 在方法上加上@DownloadFile注解
-     * dir属性表示文件下载到哪个目录
-     * filename属性表示文件下载成功后以什么名字保存，如果不填，这默认从URL中取得文件名
-     * OnProgress参数为监听上传进度的回调函数
-     */
-    @Get(url = "{url}")
-    @DownloadFile(dir = "{dir}", filename = "{filename}")
-    File downloadFile(@Var("url") String url, @Var("dir") String dir, @Var("filename")String filename);
-
-    /**
-     * 在方法上加上@DownloadFile注解
-     * dir属性表示文件下载到哪个目录
-     * filename属性表示文件下载成功后以什么名字保存，如果不填，这默认从URL中取得文件名
-     * OnProgress参数为监听上传进度的回调函数
-     */
-    @Get(url = "${url}?${params}")
-    ResultData get(@Var("url") String url, @Var("params") String params);
-
-}

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

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

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

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

src/main/java/com/fdkankan/scene/mapper/ICompanyMapper.java

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

src/main/java/com/fdkankan/scene/mapper/IDownloadTourVideoMapper.java

@@ -1,18 +0,0 @@
-package com.fdkankan.scene.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.scene.entity.DownloadTourVideo;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 导览视频转换记录表 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2022-10-12
- */
-@Mapper
-public interface IDownloadTourVideoMapper extends BaseMapper<DownloadTourVideo> {
-
-}

src/main/java/com/fdkankan/scene/mapper/ISceneAsynOperLogMapper.java

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

src/main/java/com/fdkankan/scene/mapper/ISceneCleanOrigMapper.java

@@ -1,18 +0,0 @@
-package com.fdkankan.scene.mapper;
-
-import com.fdkankan.scene.entity.SceneCleanOrig;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 删除oss原始资源记录 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2023-03-29
- */
-@Mapper
-public interface ISceneCleanOrigMapper extends BaseMapper<SceneCleanOrig> {
-
-}

src/main/java/com/fdkankan/scene/mapper/ISceneColdStorageLogMapper.java

@@ -1,18 +0,0 @@
-package com.fdkankan.scene.mapper;
-
-import com.fdkankan.scene.entity.SceneColdStorageLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 场景冷归档日志表 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2023-07-12
- */
-@Mapper
-public interface ISceneColdStorageLogMapper extends BaseMapper<SceneColdStorageLog> {
-
-}

src/main/java/com/fdkankan/scene/mapper/ISceneColdStorageMapper.java

@@ -1,18 +0,0 @@
-package com.fdkankan.scene.mapper;
-
-import com.fdkankan.scene.entity.SceneColdStorage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 场景封存状态表 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2023-07-25
- */
-@Mapper
-public interface ISceneColdStorageMapper extends BaseMapper<SceneColdStorage> {
-
-}

src/main/java/com/fdkankan/scene/mapper/ISceneCooperationMapper.java

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

src/main/java/com/fdkankan/scene/mapper/ISceneDataDownloadMapper.java

@@ -1,18 +0,0 @@
-package com.fdkankan.scene.mapper;
-
-import com.fdkankan.scene.entity.SceneDataDownload;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 安居客场景数据下载 Mapper 接口
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Mapper
-public interface ISceneDataDownloadMapper extends BaseMapper<SceneDataDownload> {
-
-}

src/main/java/com/fdkankan/scene/mapper/ISceneEditControlsMapper.java

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

src/main/java/com/fdkankan/scene/mapper/ISceneEditInfoExtMapper.java

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

src/main/java/com/fdkankan/scene/mapper/ISceneEditInfoMapper.java

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

src/main/java/com/fdkankan/scene/mapper/IScenePlusExtMapper.java

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

src/main/java/com/fdkankan/scene/mapper/IScenePlusMapper.java

@@ -1,31 +0,0 @@
-package com.fdkankan.scene.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.scene.bean.SceneBean;
-import com.fdkankan.scene.entity.ScenePlus;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-/**
- * <p>
- * 场景主表 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2022-03-16
- */
-@Mapper
-public interface IScenePlusMapper extends BaseMapper<ScenePlus> {
-
-    List<SceneBean> selectCleanOrigScene(Date time);
-
-    List<SceneBean> selectCleanOrigSceneDeleted(Date time);
-
-    List<SceneBean> listCleanOss4TestCamera(Set<Long> cameraIds, Date time);
-
-    List<SceneBean> selectColdStorageScene(Date time);
-
-}

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

@@ -1,33 +0,0 @@
-package com.fdkankan.scene.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.scene.bean.SceneBean;
-import com.fdkankan.scene.entity.ScenePro;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-/**
- * <p>
- * pro场景表 Mapper 接口
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-@Mapper
-public interface ISceneProMapper extends BaseMapper<ScenePro> {
-
-    List<SceneBean> selectCleanOrigScene(Date time);
-
-    List<SceneBean> listCleanOss4DeletedScene(Date time);
-
-    List<SceneBean> listCleanOss4TestCamera(Set<Long> cameraIds, Date time);
-
-    List<SceneBean> selectColdStorageScene(Date time);
-
-
-
-}

src/main/java/com/fdkankan/scene/mapper/ISceneRepairLogMapper.java

@@ -1,18 +0,0 @@
-package com.fdkankan.scene.mapper;
-
-import com.fdkankan.scene.entity.SceneRepairLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 场景数据迁移日志--V4版本稳定后可删除 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2022-04-22
- */
-@Mapper
-public interface ISceneRepairLogMapper extends BaseMapper<SceneRepairLog> {
-
-}

src/main/java/com/fdkankan/scene/mapper/ISceneResourceCooperationMapper.java

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

src/main/java/com/fdkankan/scene/mapper/ISceneResourceMapper.java

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

src/main/java/com/fdkankan/scene/mapper/ISceneUploadMapper.java

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

src/main/java/com/fdkankan/scene/mapper/ISurveillanceMapper.java

@@ -1,18 +0,0 @@
-package com.fdkankan.scene.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.scene.entity.Surveillance;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 监控推拉流信息 Mapper 接口
- * </p>
- *
- * @author 
- * @since 2022-09-16
- */
-@Mapper
-public interface ISurveillanceMapper extends BaseMapper<Surveillance> {
-
-}

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

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

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

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

src/main/java/com/fdkankan/scene/mapper/MarkShapeMapper.java

@@ -1,16 +0,0 @@
-package com.fdkankan.scene.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.scene.entity.SceneMarkShape;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Component;
-
-/**
- * @author Xiewj
- * @date 2021/11/22
- */
-@Mapper
-@Component("MarkShapeMapper")
-public interface MarkShapeMapper extends BaseMapper<SceneMarkShape> {
-}
-

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

@@ -1,188 +0,0 @@
-//package com.fdkankan.scene.schedule;
-//
-//import com.fdkankan.redis.constant.RedisLockKey;
-//import com.fdkankan.redis.util.RedisLockUtil;
-//import com.fdkankan.scene.service.ISceneAsynOperLogService;
-//import com.fdkankan.scene.service.ISceneCleanOrigService;
-//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;
-//
-//import javax.annotation.PostConstruct;
-//
-//@Log4j2
-//@Component
-//public class ScheduleJob {
-//
-//    @Value("${environment:#{null}}")
-//    private String environment;
-//
-//    @Autowired
-//    private ISceneAsynOperLogService sceneAsynOperLogService;
-//    @Autowired
-//    private ISceneCleanOrigService sceneCleanOrigService;
-//    @Autowired
-//    private RedisLockUtil redisLockUtil;
-//
-//    /**
-//     * 每天凌晨一点执行
-//     */
-//    @Scheduled(cron="0 0 1 * * ?")
-//    public void cleanDownloadPanorama() {
-//        log.info("定时清除全景图压缩包开始");
-//        sceneAsynOperLogService.cleanDownloadPanorama();
-//        log.info("定时清除全景图压缩包完毕");
-//    }
-//
-////    /**
-////     * 删除场景原始资源
-////     * 每天凌晨执行
-////     */
-////    @Scheduled(cron="0 0 1 * * ?")
-////    public void cleanOssHomeV3() {
-////        log.info("删除v3场景原始资源开始");
-////        String lockKey = RedisLockKey.LOCK_CLEAN_SCENE_ORIG_V3;
-////        try {
-////            boolean lock = redisLockUtil.lock(lockKey, 24*60*60);
-////            if(!lock){
-////                return;
-////            }
-////            sceneCleanOrigService.cleanOrigV3();
-////        }finally {
-////            redisLockUtil.unlockLua(lockKey);
-////        }
-////        log.info("删除v3场景原始资源结束");
-////    }
-////
-////    /**
-////     * 删除场景原始资源
-////     * 每天凌晨执行
-////     */
-////    @Scheduled(cron="0 0 1 * * ?")
-////    public void cleanOssHomeV4() {
-////        log.info("删除v4场景原始资源开始");
-////        String lockKey = RedisLockKey.LOCK_CLEAN_SCENE_ORIG_V4;
-////        try {
-////            boolean lock = redisLockUtil.lock(lockKey, 24*60*60);
-////            if(!lock){
-////                return;
-////            }
-////            sceneCleanOrigService.cleanOrigV4();
-////        }finally {
-////            redisLockUtil.unlockLua(lockKey);
-////        }
-////        log.info("删除v4场景原始资源结束");
-////    }
-//
-//    /**
-//     * 删除已删除场景原始资源及caches
-//     * 每天凌晨执行
-//     */
-//    @Scheduled(cron="0 0 1 * * ?")
-//    public void cleanOss4DeletedSceneV3() {
-//        log.info("删除已删除V3场景原始资源开始");
-//        String lockKey = RedisLockKey.LOCK_CLEAN_SCENE_DELETED_ORIG_V3;
-//        try {
-//            boolean lock = redisLockUtil.lock(lockKey, 24*60*60);
-//            if(!lock){
-//                return;
-//            }
-//            sceneCleanOrigService.cleanOss4DeletedSceneV3();
-//        }finally {
-//            redisLockUtil.unlockLua(lockKey);
-//        }
-//        log.info("删除已删除V3场景原始资源结束");
-//    }
-//
-//
-//    /**
-//     * 删除已删除场景原始资源及caches
-//     * 每天凌晨执行
-//     */
-//    @Scheduled(cron="0 0 1 * * ?")
-//    public void cleanOss4DeletedSceneV4() {
-//        log.info("删除已删除V4场景原始资源开始");
-//        String lockKey = RedisLockKey.LOCK_CLEAN_SCENE_DELETED_ORIG_V4;
-//        try {
-//            boolean lock = redisLockUtil.lock(lockKey, 24*60*60);
-//            if(!lock){
-//                return;
-//            }
-//            sceneCleanOrigService.cleanOss4DeletedSceneV4();
-//        }finally {
-//            redisLockUtil.unlockLua(lockKey);
-//        }
-//        log.info("删除已删除V4场景原始资源结束");
-//    }
-//
-////    /**
-////     * 删除测试相机场景原始资源及caches
-////     * 每天凌晨执行
-////     */
-////    @Scheduled(cron="0 0 1 * * ?")
-////    public void cleanOss4TestCameraV3() {
-////        if(StrUtil.isEmpty(environment) || !environment.equals("dev")){
-////            return;
-////        }
-////        log.info("删除已删除V4场景原始资源开始");
-////        sceneCleanOrigService.cleanOss4TestCameraV3();
-////        log.info("删除已删除V4场景原始资源结束");
-////    }
-////
-////
-////    /**
-////     * 删除测试相机场景原始资源及caches
-////     * 每天凌晨执行
-////     */
-////    @Scheduled(cron="0 0 1 * * ?")
-////    public void cleanOss4TestCameraV4() {
-////        if(StrUtil.isEmpty(environment) || !environment.equals("dev")){
-////            return;
-////        }
-////        log.info("删除已删除V4场景原始资源开始");
-////        sceneCleanOrigService.cleanOss4TestCameraV4();
-////        log.info("删除已删除V4场景原始资源结束");
-////    }
-//
-//    /**
-//     * 删除场景原始资源
-//     * 每天凌晨执行
-//     */
-//    @Scheduled(cron="0 0 1 * * ?")
-//    public void coldStorageHomeV3() {
-//        log.info("冻结v3场景原始资源开始");
-//        String lockKey = RedisLockKey.LOCK_CLEAN_SCENE_ORIG_V3;
-//        try {
-//            boolean lock = redisLockUtil.lock(lockKey, 24*60*60);
-//            if(!lock){
-//                return;
-//            }
-//            sceneCleanOrigService.coldStorageHomeV3();
-//        }finally {
-//            redisLockUtil.unlockLua(lockKey);
-//        }
-//        log.info("冻结v3场景原始资源结束");
-//    }
-//
-//    /**
-//     * 删除场景原始资源
-//     * 每天凌晨执行
-//     */
-//    @Scheduled(cron="0 0 1 * * ?")
-//    public void coldStorageHomeV4() {
-//        log.info("冻结v4场景原始资源开始");
-//        String lockKey = RedisLockKey.LOCK_CLEAN_SCENE_ORIG_V4;
-//        try {
-//            boolean lock = redisLockUtil.lock(lockKey, 24*60*60);
-//            if(!lock){
-//                return;
-//            }
-//            sceneCleanOrigService.coldStorageHomeV4();
-//        }finally {
-//            redisLockUtil.unlockLua(lockKey);
-//        }
-//        log.info("冻结v4场景原始资源结束");
-//    }
-//}

src/main/java/com/fdkankan/scene/service/IBoxModelService.java

@@ -1,24 +0,0 @@
-package com.fdkankan.scene.service;
-
-import com.fdkankan.scene.vo.BaseJsonDataParamVO;
-import com.fdkankan.scene.vo.DeleteSidParamVO;
-import com.fdkankan.web.response.ResultData;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/10/19
- **/
-public interface IBoxModelService {
-
-    ResultData uploadBoxModel(String num, String sid, MultipartFile file) throws Exception;
-
-    ResultData saveBoxModel(BaseJsonDataParamVO param) throws Exception;
-
-    ResultData deleteBoxModel(DeleteSidParamVO param) throws Exception;
-
-}

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

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

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

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

src/main/java/com/fdkankan/scene/service/ICompanyService.java

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

src/main/java/com/fdkankan/scene/service/ICutModelService.java

@@ -1,27 +0,0 @@
-package com.fdkankan.scene.service;
-
-import cn.hutool.core.collection.CollUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.model.constants.UploadFilePath;
-import com.fdkankan.redis.constant.RedisKey;
-import com.fdkankan.scene.vo.BaseJsonArrayParamVO;
-import com.fdkankan.scene.vo.BaseSceneParamVO;
-import com.fdkankan.scene.vo.DeleteSidListParamVO;
-import com.fdkankan.web.response.ResultData;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public interface ICutModelService {
-
-    ResultData saveCutModel(BaseJsonArrayParamVO param) throws Exception;
-
-    List<JSONObject> listCutModel(BaseSceneParamVO param) throws Exception;
-
-    ResultData deleteCutModel(DeleteSidListParamVO param) throws Exception;
-
-    void publicCutModel(String num, String bucket) throws IOException;
-
-}

src/main/java/com/fdkankan/scene/service/IDownloadTourVideoService.java

@@ -1,28 +0,0 @@
-package com.fdkankan.scene.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.scene.entity.DownloadTourVideo;
-import com.fdkankan.web.response.ResultData;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * <p>
- * 导览视频转换记录表 服务类
- * </p>
- *
- * @author 
- * @since 2022-10-12
- */
-public interface IDownloadTourVideoService extends IService<DownloadTourVideo> {
-
-    DownloadTourVideo getWaitingByNum(String num);
-
-    void removeByNum(String num);
-
-    ResultData uploadTourVideo(String num, MultipartFile file) throws Exception;
-
-    void transferTourVideo(DownloadTourVideo downloadTourVideo);
-
-    ResultData downloadTourVideo(String num);
-
-}

src/main/java/com/fdkankan/scene/service/IFileConvertService.java

@@ -1,24 +0,0 @@
-package com.fdkankan.scene.service;
-
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/5/17
- **/
-public interface IFileConvertService {
-
-    void convertTxtToModeldata(MultipartFile file, HttpServletResponse response) throws Exception;
-
-    void convertTxtToDam(MultipartFile file, HttpServletResponse response) throws Exception;
-
-    void convertTxtToLzma(MultipartFile file, HttpServletResponse response) throws Exception;
-
-
-
-}

src/main/java/com/fdkankan/scene/service/ISceneAsynOperLogService.java

@@ -1,24 +0,0 @@
-package com.fdkankan.scene.service;
-
-import com.fdkankan.scene.entity.SceneAsynOperLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.scene.vo.SceneAsynOperLogParamVO;
-import com.fdkankan.web.response.ResultData;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 
- * @since 2022-12-07
- */
-public interface ISceneAsynOperLogService extends IService<SceneAsynOperLog> {
-
-    ResultData getAsynOperLog(SceneAsynOperLogParamVO param);
-
-    void cleanDownloadPanorama();
-
-}

src/main/java/com/fdkankan/scene/service/ISceneCleanOrigService.java

@@ -1,32 +0,0 @@
-package com.fdkankan.scene.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.scene.entity.SceneCleanOrig;
-
-/**
- * <p>
- * 删除oss原始资源记录 服务类
- * </p>
- *
- * @author 
- * @since 2023-03-29
- */
-public interface ISceneCleanOrigService extends IService<SceneCleanOrig> {
-
-    void cleanOrigV3();
-
-    void cleanOrigV4();
-
-    void cleanOss4DeletedSceneV3();
-
-    void cleanOss4DeletedSceneV4();
-
-    void cleanOss4TestCameraV3();
-
-    void cleanOss4TestCameraV4();
-
-    void coldStorageHomeV3();
-
-    void coldStorageHomeV4();
-
-}

src/main/java/com/fdkankan/scene/service/ISceneColdStorageLogService.java

@@ -1,16 +0,0 @@
-package com.fdkankan.scene.service;
-
-import com.fdkankan.scene.entity.SceneColdStorageLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 场景冷归档日志表 服务类
- * </p>
- *
- * @author 
- * @since 2023-07-12
- */
-public interface ISceneColdStorageLogService extends IService<SceneColdStorageLog> {
-    void saveLog(String num, String path, Integer type, Integer state, String reason);
-}

src/main/java/com/fdkankan/scene/service/ISceneColdStorageService.java

@@ -1,18 +0,0 @@
-package com.fdkankan.scene.service;
-
-import com.fdkankan.scene.entity.SceneColdStorage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 场景封存状态表 服务类
- * </p>
- *
- * @author 
- * @since 2023-07-25
- */
-public interface ISceneColdStorageService extends IService<SceneColdStorage> {
-
-    void save(String num, Integer state, String coldBucket, String standarBucket);
-
-}

src/main/java/com/fdkankan/scene/service/ISceneCooperationService.java

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

src/main/java/com/fdkankan/scene/service/ISceneCustomService.java

@@ -1,14 +0,0 @@
-package com.fdkankan.scene.service;
-
-import com.fdkankan.web.response.ResultData;
-import org.springframework.web.multipart.MultipartFile;
-
-public interface ISceneCustomService {
-
-    ResultData uploadBodySegment(MultipartFile file,Integer rotate) throws Exception;
-
-    void bodySegmentHandler(String imgUrl, String uuid);
-
-    ResultData getBodySegmentStatus(String uuid);
-
-}

src/main/java/com/fdkankan/scene/service/ISceneDataDownloadService.java

@@ -1,18 +0,0 @@
-package com.fdkankan.scene.service;
-
-import com.fdkankan.scene.entity.SceneDataDownload;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 安居客场景数据下载 服务类
- * </p>
- *
- * @author dengsixing
- * @since 2021-12-23
- */
-public interface ISceneDataDownloadService extends IService<SceneDataDownload> {
-
-    SceneDataDownload findBySceneNum(String sceneNum);
-
-}

src/main/java/com/fdkankan/scene/service/ISceneEditControlsService.java

@@ -1,18 +0,0 @@
-package com.fdkankan.scene.service;
-
-import com.fdkankan.scene.entity.SceneEditControls;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 
- * @since 2022-01-18
- */
-public interface ISceneEditControlsService extends IService<SceneEditControls> {
-
-    SceneEditControls getBySceneEditId(long sceneEditInfoId);
-
-}

src/main/java/com/fdkankan/scene/service/ISceneEditInfoExtService.java

@@ -1,35 +0,0 @@
-package com.fdkankan.scene.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.scene.entity.SceneEditInfoExt;
-import com.fdkankan.scene.vo.*;
-import com.fdkankan.web.response.ResultData;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 
- * @since 2022-03-07
- */
-public interface ISceneEditInfoExtService extends IService<SceneEditInfoExt> {
-
-    SceneEditInfoExt getByScenePlusId(long scenePlusId);
-
-    SceneEditInfoExt getByEditInfoId(long editInfoId);
-
-    void updateToursByNum(String num, Integer tours);
-
-    ResultData saveBillboards(BaseJsonArrayParamVO param) throws Exception;
-
-    ResultData deleteBillboards(DeleteSidListParamVO param) throws Exception;
-
-    JSONObject listBillboards(BaseSceneParamVO param) throws Exception;
-
-    ResultData deleteBillboardsStyles(DeleteStylesParamVO param) throws Exception;
-
-}

src/main/java/com/fdkankan/scene/service/ISceneEditInfoService.java

@@ -1,113 +0,0 @@
-package com.fdkankan.scene.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.scene.vo.BaseSceneParamVO;
-import com.fdkankan.scene.vo.SaveFiltersParamVO;
-import com.fdkankan.web.response.ResultData;
-import com.fdkankan.scene.entity.SceneEditInfo;
-import com.fdkankan.scene.vo.BallScreenVideoParamVO;
-import com.fdkankan.scene.vo.BaseDataParamVO;
-import com.fdkankan.scene.vo.BaseFileParamVO;
-import com.fdkankan.scene.vo.DeleteLinkPanParamVO;
-import com.fdkankan.scene.vo.DeleteStylesParamVO;
-import com.fdkankan.scene.vo.DeleteMosaicParamVO;
-import com.fdkankan.scene.vo.DeleteSidParamVO;
-import com.fdkankan.scene.vo.DownloadVO;
-import com.fdkankan.scene.vo.FileNameAndDataParamVO;
-import com.fdkankan.scene.vo.FileParamVO;
-import com.fdkankan.scene.vo.RenameCadParamVO;
-import com.fdkankan.scene.vo.SaveLinkPanParamVO;
-import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
-import com.fdkankan.scene.vo.SceneEditInfoParamVO;
-import com.fdkankan.scene.vo.SceneEditInfoVO;
-import com.fdkankan.scene.vo.SceneInfoParamVO;
-import com.fdkankan.scene.vo.SceneInfoVO;
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 
- * @since 2022-01-18
- */
-public interface ISceneEditInfoService extends IService<SceneEditInfo> {
-
-    SceneEditInfoVO saveScene(SceneEditInfoParamVO param);
-
-    SceneEditInfo getBySceneProId(long sceneProId);
-
-    SceneEditInfo getByScenePlusId(long scenePlusId);
-
-    ResultData publicScene(SceneEditInfoParamVO param) throws Exception;
-
-    SceneInfoVO getSceneInfo(SceneInfoParamVO param) throws Exception;
-
-//    ResultData saveUpload(SaveUploadParamVO param) throws Exception;
-
-    ResultData saveCad(BaseDataParamVO param) throws Exception;
-
-    ResultData resetCad(String num) throws IOException;
-
-    ResultData renameCad(RenameCadParamVO param) throws IOException;
-
-    void upgradeVersionById(Long id);
-
-    void upgradeVersionAndImgVersionById(Long id);
-
-    void upgradeSceneJsonVersion(String num, int version, Integer imgVersion, String bucket) throws IOException ;
-
-    ResultData uploadPanorama(String num, MultipartFile file) throws Exception;
-
-    ResultData downloadPanorama(FileParamVO param) throws Exception;
-
-    void saveTagsToSceneEditInfo(String num, SceneEditInfo sceneEditInfo);
-
-    ResultData saveVideoBox(FileNameAndDataParamVO param) throws Exception;
-
-    ResultData deleteVideoBox(DeleteSidParamVO param) throws Exception;
-
-    ResultData saveBoxPhoto(BaseDataParamVO param) throws Exception;
-
-    ResultData deleteBoxPhoto(DeleteSidParamVO param) throws Exception;
-
-    DownloadVO downloadBallScreenVideo(BallScreenVideoParamVO param);
-
-    ResultData uploadBallScreenVideo(String num,String fileName,MultipartFile file) throws Exception;
-
-    void upgradeVersionToSceneJson(String num, String bucket) throws Exception;
-
-    ResultData sceneSync(String num, String type, String floorPlanJson, String ajkJson, String cameraJson, MultipartFile[] files) throws Exception;
-
-    ResultData checkKey(SceneCheckKeyParamVO param) throws Exception;
-
-    ResultData addMosaics(BaseDataParamVO param) throws Exception;
-
-    ResultData uploadLinkPan(String num, String sid, String fileName, MultipartFile file) throws Exception;
-
-    ResultData saveLinkPan(SaveLinkPanParamVO param) throws Exception;
-
-    ResultData listLinkPan(String num) throws Exception;
-
-    ResultData deleteLinkPan(DeleteLinkPanParamVO param) throws Exception;
-
-    ResultData deleteStyles(DeleteStylesParamVO param) throws Exception;
-
-    ResultData deleteMosaics(DeleteMosaicParamVO param) throws Exception;
-
-    List<JSONObject> getMosaicList(String num) throws Exception;
-
-    ResultData addWaterMark(BaseFileParamVO param) throws Exception;
-
-    ResultData deleteWaterMark(BaseFileParamVO param) throws Exception;
-
-    ResultData saveFilter(SaveFiltersParamVO param) throws Exception;
-
-    ResultData listFilter(BaseSceneParamVO param) throws Exception;
-
-}