title

720yun_fd_consumer/src/main/java/com/gis/listener/container/SceneQueueListener.java

@@ -75,6 +75,8 @@ public class SceneQueueListener implements ChannelAwareMessageListener {
     @Autowired
     IMqSendLogService mqSendLogService;
 
+    @Value("${queue.update-scene-status}")
+    String updateSceneStatusQueue;
 
     @Override
     @LogAnnotation
@@ -134,7 +136,10 @@ public class SceneQueueListener implements ChannelAwareMessageListener {
 
         }catch (Exception e){
             if (StrUtil.isNotEmpty(sceneCode)){
-                updateOssStatusJson(sceneCode,0);
+                Map<String,Object> map=new HashMap<>();
+                map.put("num",sceneCode);
+                map.put("status",-1);
+                rabbitMqProducerUtil.sendByWorkQueue(updateSceneStatusQueue,map);
             }
             log.error("场景sceneQueue报错{}",e.getMessage());
             e.printStackTrace();

720yun_fd_consumer/src/main/java/com/gis/listener/container/SceneWorkQueueListener.java

@@ -42,10 +42,7 @@ import java.io.File;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Matcher;
@@ -108,6 +105,9 @@ public class SceneWorkQueueListener implements ChannelAwareMessageListener {
     @Value("${other-bucket.fdkk}")
     String fdkkBucket;
 
+    @Value("${queue.update-scene-status}")
+    String updateSceneStatusQueue;
+
     private String queueName;
 
     public void setQueueName(String queueName) {
@@ -156,7 +156,7 @@ public class SceneWorkQueueListener implements ChannelAwareMessageListener {
             sceneCode=param.getSceneCode();
             workEntity=workService.findByNum(param.getSceneCode());
             if (ObjectUtil.isNotEmpty(param.getSceneCode())&&param.getStatus()==1){
-                updateOssStatusJson(param.getSceneCode(),0);
+//                updateOssStatusJson(param.getSceneCode(),0);
 
                 //计算完成处理
                 //1，下载场景的全景图 默认 。scene_view_data/panorama/目录下的全景图图片
@@ -239,13 +239,19 @@ public class SceneWorkQueueListener implements ChannelAwareMessageListener {
                 workEntity.setCalcStatus(1);
                 workService.updateById(workEntity);
                 sendEndMq(param);
-                updateOssStatusJson(param.getSceneCode(),1);
+                Map<String,Object> map=new HashMap<>();
+                map.put("num",sceneCode);
+                map.put("status",1);
+                rabbitMqProducerUtil.sendByWorkQueue(updateSceneStatusQueue,map);
             }
             log.info("场景计算结束,队列名:{},id:{}", queueName, messageId);
 
         }catch (Exception e){
             if (StrUtil.isNotEmpty(sceneCode)){
-                updateOssStatusJson(sceneCode,0);
+                Map<String,Object> map=new HashMap<>();
+                map.put("num",sceneCode);
+                map.put("status",-1);
+                rabbitMqProducerUtil.sendByWorkQueue(updateSceneStatusQueue,map);
             }
             if (ObjUtil.isNotEmpty(workEntity)&&ObjUtil.isNotNull(workEntity.getId())){
                 workService.updatePanoStatus(workEntity.getId(),-1);

720yun_fd_consumer/src/main/resources/application-pro.yml

@@ -82,6 +82,8 @@ queue:
     qjkk-work-offline-done: qjkk-work-offline-done
     update-scene-title: update-scene-title
     delete-scene: delete-scene
+    update-scene-status: update-scene-status
+
 config:
     bashPath: 720yun_fd_manage/
 mq:

720yun_fd_consumer/src/main/resources/application-proAws.yml

@@ -82,6 +82,8 @@ queue:
     qjkk-work-offline-done: qjkk-work-offline-done
     update-scene-title: update-scene-title
     delete-scene: delete-scene
+    update-scene-status: update-scene-status
+
 config:
     bashPath: 720yun_fd_manage/
 mq:

720yun_fd_consumer/src/main/resources/application-sit.yml

@@ -82,6 +82,7 @@ queue:
     qjkk-work-offline-done: qjkk-work-offline-done
     update-scene-title: update-scene-title
     delete-scene: delete-scene
+    update-scene-status: update-scene-status
 
 config:
     bashPath: 720yun_fd_manage/

720yun_fd_consumer/src/main/resources/application-sitAws.yml

@@ -80,6 +80,8 @@ queue:
     qjkk-work-offline-done: qjkk-work-offline-done
     update-scene-title: update-scene-title
     delete-scene: delete-scene
+    update-scene-status: update-scene-status
+
 config:
     bashPath: 720yun_fd_manage/
 mq:

720yun_fd_manage/src/main/resources/application-pro.yml

@@ -104,6 +104,7 @@ queue:
     qjkk-work-offline-done: qjkk-work-offline-done
     update-scene-title: update-scene-title
     delete-scene: delete-scene
+    update-scene-status: update-scene-status
 
 config:
     bashPath: ${project.name}/

720yun_fd_manage/src/main/resources/application-proAws.yml

@@ -96,6 +96,7 @@ queue:
     qjkk-work-offline-done: qjkk-work-offline-done
     update-scene-title: update-scene-title
     delete-scene: delete-scene
+    update-scene-status: update-scene-status
 
 config:
     bashPath: ${project.name}/

720yun_fd_manage/src/main/resources/application-sit.yml

@@ -96,6 +96,7 @@ queue:
     qjkk-work-offline-done: qjkk-work-offline-done
     update-scene-title: update-scene-title
     delete-scene: delete-scene
+    update-scene-status: update-scene-status
 
 config:
     bashPath: ${project.name}/

720yun_fd_manage/src/main/resources/application-sitAws.yml

@@ -96,6 +96,7 @@ queue:
     qjkk-work-offline-done: qjkk-work-offline-done
     update-scene-title: update-scene-title
     delete-scene: delete-scene
+    update-scene-status: update-scene-status
 
 config:
     bashPath: ${project.name}/