1111

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/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("获取激光转台场景失败!");
         }