海鑫分支、江门分支合并

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

@@ -1,15 +1,12 @@
 package com.fdkankan.contro.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 com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
+import java.util.Date;
+
 
 /**
  * <p>
@@ -150,5 +147,11 @@ public class CameraDetail implements Serializable {
     @TableField("unit")
     private String unit;
 
+    /**
+     * 分辨率，为空时默认分辨率
+     */
+    @TableField("resolution")
+    private String resolution;
+
 
 }

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

@@ -1,15 +1,12 @@
 package com.fdkankan.contro.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 com.baomidou.mybatisplus.annotation.*;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  *
@@ -113,7 +110,7 @@ public class ScenePlusExt implements Serializable {
     private String buildType;
 
     /**
-     * 分辨率（2k,4k）
+     * 分辨率（2k,4k,6k）
      */
     @TableField("scene_resolution")
     private String sceneResolution;

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -204,6 +204,13 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 ext.put("128G", 1);
             }
 
+            ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
+            CameraDetail cameraDetail = cameraDetailService.getByCameraId(scenePlus.getCameraId());
+            String resolution = cameraDetail.getResolution();
+            if(StrUtil.isNotEmpty(resolution)){
+                message.setResolution(resolution);
+            }
+
             message.setBizType("standard");
 
             log.info("场景计算资源准备结束，场景码：{}", message.getSceneNum());
@@ -607,6 +614,12 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 break;
         }
 
+        CameraDetail cameraDetail = cameraDetailService.getByCameraId(scenePlus.getCameraId());
+        String resolution = cameraDetail.getResolution();
+        if(StrUtil.isNotEmpty(resolution)){
+            scenePlusExt.setSceneResolution(resolution);
+        }
+
         String sceneKind = scenePlusExt.getSceneScheme() == 3 ? SceneKind.FACE.code():SceneKind.TILES.code();
         scenePlusExt.setSceneKind(sceneKind);
 //        scenePlusExt.setModelKind(modelKind);