浏览代码

是否采用3dtiles,根据配置来判断

dsx 2 年之前
父节点
当前提交
bef37cf372

+ 8 - 3
src/main/java/com/fdkankan/contro/controller/TestController.java

@@ -1,10 +1,14 @@
 package com.fdkankan.contro.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.fdkankan.web.response.ResultData;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * TODO
@@ -17,11 +21,12 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/test")
 public class TestController {
 
+    @Value("#{'${model.3dtiles.sceneSource:}'.split(',')}")
+    private List<Integer> sdTilesSceneSourceList;
+
     @GetMapping("/test")
     public ResultData test(){
-        String test = null;
-        test.equals("");
-        return ResultData.ok();
+        return ResultData.ok(JSON.toJSONString(sdTilesSceneSourceList));
     }
 
 }

+ 1 - 1
src/main/java/com/fdkankan/contro/mq/service/impl/BuildObjServiceImpl.java

@@ -53,7 +53,7 @@ public class BuildObjServiceImpl implements IBuildSceneService {
     @Value("${model.modelKind:3dtiles}")
     private String modelKind;
 
-    @Value("${model.3dtiles.sceneSource}")
+    @Value("#{'${model.3dtiles.sceneSource:}'.split(',')}")
     private List<Integer> sdTilesSceneSourceList;
 
     @Autowired

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

@@ -76,7 +76,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     @Value("${model.modelKind:3dtiles}")
     private String modelKind;
 
-    @Value("${model.3dtiles.sceneSource}")
+    @Value("#{'${model.3dtiles.sceneSource:}'.split(',')}")
     private List<Integer> sdTilesSceneSourceList;
 
     @Autowired

+ 1 - 1
src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -89,7 +89,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     @Value("${model.modelKind:3dtiles}")
     private String modelKind;
 
-    @Value("${model.3dtiles.sceneSource}")
+    @Value("#{'${model.3dtiles.sceneSource:}'.split(',')}")
     private List<Integer> sdTilesSceneSourceList;
 
     @Value("${build.notSupport.beforeTime:202203}")