Merge branch 'release-24k' into test

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/httpclient/LaserAddressSource.java

@@ -3,9 +3,11 @@ package com.fdkankan.contro.httpclient;
 import com.dtflys.forest.callback.AddressSource;
 import com.dtflys.forest.http.ForestAddress;
 import com.dtflys.forest.http.ForestRequest;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+@Slf4j
 @Component
 public class LaserAddressSource implements AddressSource {
 
@@ -15,6 +17,7 @@ public class LaserAddressSource implements AddressSource {
 
     @Override
     public ForestAddress getAddress(ForestRequest forestRequest) {
+        log.info("------------basePath:{}--------------", basePath);
         return new ForestAddress("","",null,basePath);
     }
 }

src/main/java/com/fdkankan/contro/httpclient/LaserClient.java

@@ -2,6 +2,7 @@ package com.fdkankan.contro.httpclient;
 
 import com.dtflys.forest.annotation.Address;
 import com.dtflys.forest.annotation.Get;
+import com.dtflys.forest.annotation.Var;
 import com.fdkankan.contro.common.Result;
 
 /**
@@ -11,7 +12,8 @@ import com.fdkankan.contro.common.Result;
 public interface LaserClient {
 
 
-    @Get("/laser/init/${0}")
-    Result getSceneByNum(String num);
+//    @Get("/laser/init/${0}")
+    @Get(url = "${url}")
+    Result getSceneByNum(@Var("url") String url);
 
 }

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

@@ -223,6 +223,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");
 
             //写入算法参数文件
@@ -659,6 +666,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);

src/main/java/com/fdkankan/contro/service/impl/SceneProServiceImpl.java

@@ -43,6 +43,10 @@ import java.util.Objects;
 @Service
 public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro> implements ISceneProService {
 
+    private static final String GET_LASER_INIT_API = "/laser/init/@num@";
+    @Value("${4dkk.laserService.basePath}")
+    private String laserBasePath;
+
     @Value("${queue.modeling.obj.modeling-pre}")
     private String queueObjModelingPre;
     @Autowired
@@ -110,7 +114,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
 
         // 获取最新的场景名称
-        Result laserSceneByNum = laserClient.getSceneByNum(num);
+        String url = laserBasePath + GET_LASER_INIT_API.replace("@num@", num);
+        Result laserSceneByNum = laserClient.getSceneByNum(url);
         if(laserSceneByNum.getCode() != HttpStatus.OK.value()){
             throw new RuntimeException("获取激光转台场景失败!");
         }
@@ -166,7 +171,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
 
         // 获取最新的场景名称
-        Result laserSceneByNum = laserClient.getSceneByNum(num);
+        String url = laserBasePath + GET_LASER_INIT_API.replace("@num@", num);
+        Result laserSceneByNum = laserClient.getSceneByNum(url);
         if(laserSceneByNum.getCode() != HttpStatus.OK.value()){
             throw new RuntimeException("获取激光转台场景失败!");
         }