Sfoglia il codice sorgente

1.7.0 对接相机初次提交1

xiewj 1 anno fa
parent
commit
8e9e43c816

+ 2 - 2
720yun_fd_consumer/gis_consumer/src/main/java/com/gis/listener/SceneListener.java

@@ -93,12 +93,12 @@ public class SceneListener {
                 //初始化创建work表数据
                 workService.entityAdd(param.getPhoneNum(),param.getSceneCode(),param.getStatus(),param.getSceneName());
                 channel.basicAck(deliveryTag, false);
-            }else {
+            }else if (ObjectUtil.isNotEmpty(param.getSceneCode())&&param.getStatus()==1){
                 //计算完成处理
                 WorkEntity workEntity=workService.findByNum(param.getSceneCode());
                 //处理业务
                 //1,下载场景的全景图 默认 。scene_view_data/panorama/目录下的全景图图片
-                String ossPath =  "/scene_view_data/"+param.getSceneCode()+"/panorama/";
+                String ossPath =  "scene_view_data/"+param.getSceneCode()+"/panorama/";
                 List<String> list=aliyunOssUtil.getFileFolder("4dkankan",ossPath);
 //            workEntity.setIcon(someDataJson.getString("icon"));
 //            workEntity.setShare(someDataJson.getString("share"));

+ 16 - 9
720yun_fd_consumer/gis_consumer/src/main/resources/application-sit.yml

@@ -45,14 +45,21 @@ spring:
                 enabled: true
         type: com.alibaba.druid.pool.DruidDataSource
     rabbitmq:
-        address: 127.0.0.1:5672
-        connection-timeout: 15000
-        password: 4dagecui2019$
-        publisher-confirms: true
-        publisher-returns: true
-        template:
-            mandatory: true
-        username: guest
-        virtual-host: /
+        host: 172.18.156.39
+        port: 5672
+        username: admin
+        password: adminv41234
+        virtual-host: 4dkankan
+        connection-timeout: 0
+        listener:
+            simple:
+                prefetch: 1
+                max-concurrency: 2
+                acknowledge-mode: manual #开启消费者手动确认
+        #开启消息投递确认机制
+        publisher-confirm-type: correlated
 tlog:
     enable-invoke-time-print: true
+queue:
+    scene-queue: queue-pano-scene
+    do-slice-queue: queue-do-slice