Merge branch 'feature-v4-20220801' of http://192.168.0.115:3000/4dkankan-v4/4dkankan-utils into feature-v4-20220801

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

@@ -172,23 +172,20 @@ public class ComputerUtil {
         }
         return map;
     }
-//
-    public static void createJson(String path, String splitType, String skyboxType, String dataDescribe,
-                                  String sceneNum, String dataSource) throws Exception{
+
+    public static void createProjectAndDataFile(String path, String sceneNum, String splitType, String skyboxType,
+                                                Map<String, Object> projectExtras, Map<String, Object> dataExtras) {
         JSONObject projectJson = new JSONObject();
-        projectJson.put("version", "201909231830");
-        projectJson.put("protocol", "file api 1.4");
-        projectJson.put("uuid", UUID.randomUUID().toString());
-        projectJson.put("description", "");
-        projectJson.put("time", System.currentTimeMillis());
-        projectJson.put("category", "default");
-        projectJson.put("tag", null);
-        projectJson.put("status", null);
+        if (!ObjectUtils.isEmpty(projectExtras)) {
+            projectJson.putAll(projectExtras);
+        }
         projectJson.put("sceneNum", sceneNum);
-        projectJson.put("dataSource", dataSource);
         FileUtils.writeFile(path + File.separator + "project.json", projectJson.toString());
 
         JSONObject dataJson = new JSONObject();
+        if (!ObjectUtils.isEmpty(dataExtras)) {
+            dataJson.putAll(dataExtras);
+        }
         dataJson.put("split_type", splitType);
         dataJson.put("skybox_type", skyboxType);
         dataJson.put("extras", null);

4dkankan-utils-rabbitmq/src/main/java/com/fdkankan/rabbitmq/bean/BuildSceneCallMessage.java

@@ -3,38 +3,22 @@ package com.fdkankan.rabbitmq.bean;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.Map;
 
 @Data
 public class BuildSceneCallMessage extends BaseBuildSceneMessage {
 
-    private String unicode;
     private String path;
-    private String prefix;
-    private String imgsName;
+
     private String sceneNum;
-    private String isModel;
-    private String userName;
     //不同的相机不同的方法
     private String cameraType;
     private String algorithm;
-    private String fileId;
-    private String cameraName;
     //0表示有4k图，1表示没有
     private String resolution;
 
     //判断调用V2还是V3版本的算法
     private String buildType;
 
-    private Long sceneProId;
-    private String sceneName;
-    private String webSite;
-    private Date sceneProCreateTime;
-    private Long userId;
-    private String dataSource;
-    private Integer sceneStatus;
-    private Integer PayStatus;
-    private String thumb;
-
-
-
+    private Map<String,Object> ext;
 }

4dkankan-utils-rabbitmq/src/main/java/com/fdkankan/rabbitmq/bean/BuildSceneResultMqMessage.java

@@ -1,40 +1,25 @@
 package com.fdkankan.rabbitmq.bean;
 
-import java.util.Map;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Map;
+
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class BuildSceneResultMqMessage extends BaseBuildSceneMessage{
 
-    private String cameraType;
-
-    private String sceneCode;
-
-    private Long space;
-
-    private Integer payStatus;
-
     private Long computeTime;
 
-    private String fileId;
-
     private Boolean buildSuccess;
 
-    private Map<String, String> uploadFiles;
-
     private String path;
 
-    private Integer pushChannel;
-
-    private String pushToken;
-
-    private String prefix;
+    private String hostName;
 
-    private Integer videoVersion;
+    private Map<String,Object> ext;
 }