Merge branch 'feature-3dtiles-20221202' into test

# Conflicts:
#	src/main/java/com/fdkankan/contro/controller/TestController.java

src/main/java/com/fdkankan/contro/controller/TestController.java

@@ -1,31 +1,32 @@
 package com.fdkankan.contro.controller;
 
-import com.fdkankan.contro.service.IScene3dNumService;
+import com.alibaba.fastjson.JSON;
 import com.fdkankan.web.response.ResultData;
-import org.springframework.beans.factory.annotation.Autowired;
+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
  * </p>
  *
  * @author dengsixing
- * @since 2022/12/12
+ * @since 2022/12/13
  **/
 @RestController
 @RequestMapping("/test")
 public class TestController {
 
-    @Autowired
-    private IScene3dNumService scene3dNumService;
+    @Value("#{'${model.3dtiles.sceneSource:}'.split(',')}")
+    private List<Integer> sdTilesSceneSourceList;
 
     @GetMapping("/test")
-    public ResultData test() throws Exception {
-        String s = scene3dNumService.generateSceneNum(1);
-        return ResultData.ok(s);
+    public ResultData test(){
+        return ResultData.ok(JSON.toJSONString(sdTilesSceneSourceList));
     }
 
 }

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

@@ -59,7 +59,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

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

@@ -78,7 +78,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

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}")