Merge branch 'feature-slimming-nas-20220130-dsx' into test

# Conflicts:
#	src/main/java/com/fdkankan/contro/controller/TestController.java
#	src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

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

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

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

@@ -330,13 +330,13 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             String pushToken = fdageData.getString("pushToken");
             this.pushMsgToApp(pushChannel,pushToken, cameraType, scenePlus.getTitle(), scenePlusExt.getWebSite());
 
-            //更新场景主表
-            scenePlusService.updateById(scenePlus);
-
             //上传计算结果文件
             commonService.uploadBuildResultData(sceneCode, path, SceneVersionType.V4.code());
 
             //删除计算目录
+            //更新场景主表
+            scenePlusService.updateById(scenePlus);
+
             CreateObjUtil.deleteFile(path.replace(ConstantFilePath.BUILD_MODEL_PATH, "/"));
 
             log.info("场景计算结果处理结束，场景码：{}", sceneCode);
@@ -882,7 +882,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     }
 
     public boolean uploadHouseTypeJson(String num, String dataSource) {
-        String floorPlanCardFilePath = dataSource + File.separator + "floorplan_cad.json";
+        String floorPlanCardFilePath = dataSource + File.separator + "results/floorplan_cad.json";
         if (!new File(floorPlanCardFilePath).exists()) {
             log.warn("floorplan_cad.json 文件不存在，文件路径：{}", floorPlanCardFilePath);
             return false;