场景计算优化

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

@@ -259,24 +259,6 @@ public class ComputerUtil {
         return map;
     }
 
-    public static String getPath(String path, String cameraName, String fileId, int cameraType, String unicode){
-        if(cameraType < 3){
-            return path;
-        }
-        String localPath = cameraName.replace("4DKKPRO_", "")
-            .replace("-fdage", "").toLowerCase() +
-            File.separator + fileId + File.separator + unicode;
-
-        if(cameraType == 5 || cameraType == 6){
-            path = ConstantFilePath.BUILD_MODEL_PATH + unicode;
-        }else if(cameraType == 14) {
-            path = ConstantFilePath.BUILD_MODEL_LASER_PATH + localPath;
-        } else{
-            path = ConstantFilePath.BUILD_MODEL_PATH + localPath;
-        }
-        return path;
-    }
-
     public static Map<String,String> computerRebuildVideo(String projectNum, String path) throws Exception{
 
         String videosPath = String.format(UploadFilePath.VIDEOS_VIEW_PATH, projectNum);     //新版本文件路径

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

@@ -0,0 +1,34 @@
+package com.fdkankan.common.util;
+
+import com.fdkankan.common.constant.ConstantFilePath;
+import java.io.File;
+
+/**
+ * <p>
+ * 此工具类提供场景信息处理相关工具函数
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/3/10
+ **/
+public class SceneUtil {
+
+    public static String getPath(String path, String cameraName, String fileId, int cameraType, String unicode){
+        if(cameraType < 3){
+            return path;
+        }
+        String localPath = cameraName.replace("4DKKPRO_", "")
+            .replace("-fdage", "").toLowerCase() +
+            File.separator + fileId + File.separator + unicode;
+
+        if(cameraType == 5 || cameraType == 6){
+            path = ConstantFilePath.BUILD_MODEL_PATH + unicode;
+        }else if(cameraType == 14) {
+            path = ConstantFilePath.BUILD_MODEL_LASER_PATH + localPath;
+        } else{
+            path = ConstantFilePath.BUILD_MODEL_PATH + localPath;
+        }
+        return path;
+    }
+
+}

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

@@ -0,0 +1,30 @@
+package com.fdkankan.mq.message;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * 计算失败，发送钉钉MQ消息体实体
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/3/10
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BuildSceneFailDTMqMessage {
+
+    private String reason;
+
+    private String serverPath;
+
+    private String num;
+
+    private String hostName;
+
+}

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

@@ -1,5 +1,6 @@
 package com.fdkankan.mq.message;
 
+import java.util.Map;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -27,5 +28,13 @@ public class BuildSceneResultMqMessage {
 
     private Boolean buildSuccess;
 
-    private Integer sceneStatus;
+    private Map<String, String> uploadFiles;
+
+    private String path;
+
+    private Integer pushChannel;
+
+    private String pushToken;
+
+    private String prefix;
 }