场景计算优化

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

@@ -133,6 +133,7 @@ public enum ErrorCode {
     FAILURE_CODE_5054(5054, "该场景不存在无法扣除容量"),
     FAILURE_CODE_5055(5055, "该场景不属于八目相机无法扣除容量"),
     FAILURE_CODE_5056(5056, "双目相机异常"),
+    FAILURE_CODE_5057(5057, "该场景不属于八目相机，无法更改容量"),
 
 
     FAILURE_CODE_7001(7001, "激光场景状态同步失败，请重试！"),

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

@@ -601,7 +601,7 @@ public class CreateObjUtil {
 	}
 
 	public static void main(String[] args) throws Exception{
-		CreateObjUtil.convertTxtToVisionmodeldata("F:\\visiontest\\vision.txt", "F:\\visiontest\\vision.modeldata");
+		CreateObjUtil.convertTxtToVisionmodeldata("F:\\visiontest\\jaBgoe9uyx-vision-1.txt", "F:\\visiontest\\vision.modeldata");
 	}
 
 }

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

@@ -1,6 +1,7 @@
 package com.fdkankan.common.util;
 
 import cn.hutool.core.util.StrUtil;
+import java.io.InputStream;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.ClassPathResource;
 
@@ -10,6 +11,9 @@ import java.awt.geom.RoundRectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
 
 @Slf4j
 public class LogoConfig {
@@ -28,22 +32,26 @@ public class LogoConfig {
            
          int matrixWidth = matrixImage.getWidth();  
          int matrixHeigh = matrixImage.getHeight();
-         /**
-          * 读取Logo图片
-          */
-         ClassPathResource classPathResource = null;
-         if(logoPath == null){
-//             logoPath = this.getClass().getResource("/static/img/logo.png").getPath();
-             classPathResource = new ClassPathResource("static/img/logo.jpg");
-//             logoPath  =classPathResource.getURL().getPath();
-         }
+         File file = null;
          BufferedImage logo = null;
          try {
-             if(StrUtil.isNotEmpty(logoPath)){
-                 logo = ImageIO.read(new File(logoPath));
-             }else{
-                 logo = ImageIO.read(classPathResource.getFile());
+             /**
+              * 读取Logo图片
+              */
+             if(StrUtil.isEmpty(logoPath)){
+                 ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+                 Resource[] resources = resolver.getResources("static/img/logo.jpg");
+                 Resource resource = resources[0];
+                //获得文件流，因为在jar文件中，不能直接通过文件资源路径拿到文件，但是可以在jar包中拿到文件流
+                 InputStream inputStream = resource.getInputStream();
+                 logo = ImageIO.read(inputStream);
+             }else {
+                 file = new File(logoPath);
+                 logo = ImageIO.read(file);
              }
+
+
+
          }catch (IOException e){
             log.info("读取图片流失败，path="+ logoPath, e);
          }

4dkankan-utils-mq/src/main/java/com/fdkankan/mq/message/BuildSceneResultMqMessage.java

@@ -20,8 +20,6 @@ public class BuildSceneResultMqMessage {
 
     private Integer payStatus;
 
-    private String videosJson;
-
     private Long computeTime;
 
     private String fileId;
@@ -37,4 +35,6 @@ public class BuildSceneResultMqMessage {
     private String pushToken;
 
     private String prefix;
+
+    private Integer videoVersion;
 }