Merge branch 'feature-统计激光初始化队列更换-dsx' into test

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

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

@@ -4,6 +4,7 @@ import com.fdkankan.contro.service.ICommonService;
 import com.fdkankan.contro.service.IScene3dNumService;
 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;
@@ -24,11 +25,12 @@ public class TestController {
     private IScene3dNumService scene3dNumService;
     @Autowired
     private ICommonService commonService;
+    @Value("${4dkk.laserService.bucket}")
+    private String bucket;
 
     @GetMapping("/test")
     public ResultData test(String num) throws Exception {
-        commonService.sendEmail(num);
-        return ResultData.ok();
+        return ResultData.ok(bucket);
     }
 
 }

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

@@ -93,12 +93,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     @Value("4dkk.laserService.bucket")
     private String laserBucket;
 
-    @Value("${4dkk.laserService.dir}")
-    private String laserDir;
-    @Value("${scaling.rule.extend.ari:#{null}}")
-    private String scalingExtendAri;
-
-
     @Autowired
     private RabbitMqProducer mqProducer;
 

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

@@ -45,6 +45,9 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
     @Value("${queue.application.laser.update-scene}")
     private String updateScene;
 
+    @Value("${queue.application.laser.init-scene}")
+    private String initScene;
+
     @Value("${queue.application.laser.update-build-status}")
     private String updateBuildStatus;
 
@@ -149,7 +152,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
             params.put("location", fdageJson.getInteger("location"));
         }
         params.put("payStatus", payStatus);
-        rabbitMqProducer.sendByWorkQueue(updateScene, params);
+        rabbitMqProducer.sendByWorkQueue(initScene, params);
     }
 
     public void saveScene(ScenePro scenePro, String scenePassword, Camera cameraEntity, String phone, boolean rebuild, Integer payStatus) {
@@ -172,7 +175,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
         params.put("title", scenePro.getSceneName());
         params.put("userId", scenePro.getUserId());
         params.put("payStatus", payStatus);
-        rabbitMqProducer.sendByWorkQueue(updateScene, params);
+        rabbitMqProducer.sendByWorkQueue(initScene, params);
     }
 
     private String getSceneVersion(String num) {
@@ -200,6 +203,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
         }
 
         // 上传点云编辑文件，并通知激光系统
+        log.info("开始上传点云文件,bucket:{}", bucket);
         fYunFileService.uploadFile(bucket,path + "/results/laserData/vision_edit.txt", String.format(cloudPointFyunPath,sceneCode,sceneCode) + "vision_edit.txt");
         fYunFileService.uploadFileByCommand(bucket,path + "/results/laserData/uuidcloud", String.format(cloudPointFyunPath,sceneCode,sceneCode) + "uuidcloud");