111

4dkankan-common-utils/src/main/java/com/fdkankan/common/constant/ErrorCode.java

@@ -159,6 +159,7 @@ public enum ErrorCode {
     FAILURE_CODE_5070(5070, "楼层文件数据不正常"),
     FAILURE_CODE_5071(5071, "复制场景不支持重算"),
     FAILURE_CODE_5072(5072, "相机原始资源已被删除，不支持重算"),
+    FAILURE_CODE_5073(5073, "相机原始资源正在被清除"),
 
     FAILURE_CODE_6003(6003, "该相机未被绑定，请前往 我的相机 先绑定相机后再进行授权 "),
 

4dkankan-common-utils/src/main/java/com/fdkankan/common/util/StrExtUtil.java

@@ -1,8 +1,13 @@
 package com.fdkankan.common.util;
 
+import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ReUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 import com.fdkankan.common.constant.ErrorCode;
+
+import java.io.File;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import jdk.nashorn.internal.runtime.regexp.joni.Regex;
@@ -54,14 +59,16 @@ public class StrExtUtil extends StrUtil {
         return ReUtil.contains(regex, content);
     }
 
-    public static void main(String[] args) {
-
-        String test = null;
-//        System.out.println(test.lastIndexOf("."));
-//        System.out.println(test.substring(test.lastIndexOf(".")));
+    public static void main(String[] args) throws Exception {
 
-        System.out.println("123".equals(test));;
+//        String test = null;
+////        System.out.println(test.lastIndexOf("."));
+////        System.out.println(test.substring(test.lastIndexOf(".")));
+//
+//        System.out.println("123".equals(test));;
 
+        List<String> fileNames = FileUtils.list(new File("C:\\Users\\dsx\\Desktop\\90d95cdb5_202211141023024060"));
+        System.out.println(JSON.toJSONString(fileNames));
 
 
     }

4dkankan-common-web/src/main/java/com/fdkankan/web/constant/CameraTypeEnum.java

@@ -9,7 +9,8 @@ public enum CameraTypeEnum {
     FDKK_LITE(2,"KK-","4DKKLITE_","四维看看lite"),
     ZHIHOUSE_REDHOUSE(5,"KK-","4DKKLITE_","指房宝小红屋相机"),
     DOUBLE_EYE_TURN(9,"KJ-","4DKKLITE_","双目转台"),
-    LASER_TURN(10,"SS-","4DKKLA_","激光转台");
+    LASER_TURN(10,"SS-","4DKKLA_","激光转台"),
+    LASER_SG(11,"SG-","4DSG_","深光");
 
 
     private int type;

4dkankan-utils-redis/src/main/java/com/fdkankan/redis/constant/RedisKey.java

@@ -173,11 +173,24 @@ public class RedisKey {
     public static final String SCENE_UPLOAD_MATTERPRO_NUM= "scene:upload:matterpro:num";
 
     /**
-     * 上传matterprodata状态
+     * 人体抠图任务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";
 
 
 }