FIX5.4

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

@@ -105,6 +105,7 @@ public class SceneListener {
                 //初始化创建work表数据
                 workService.entityAdd(param);
                 channel.basicAck(deliveryTag, false);
+                sendStartMq(param);
             }if (ObjectUtil.isNotEmpty(workEntity)&&param.getStatus()!=1){
                 //修改状态
                 workEntity.setCalcStatus(param.getStatus());
@@ -113,6 +114,7 @@ public class SceneListener {
                     workEntity.setIsPassword(1);
                 }
                 workService.update(workEntity);
+                sendStartMq(param);
                 channel.basicAck(deliveryTag, false);
             }else if (ObjectUtil.isNotEmpty(param.getSceneCode())&&param.getStatus()==1){
                 //计算完成处理
@@ -187,7 +189,7 @@ public class SceneListener {
 
                 workEntity.setCalcStatus(1);
                 workService.update(workEntity);
-                sendMq(param);
+                sendEndMq(param);
                 channel.basicAck(deliveryTag, false);
             }
 
@@ -198,20 +200,38 @@ public class SceneListener {
             log.error("场景sceneQueue报错{}",e.getMessage());
         }
     }
-
-    private void sendMq(SceneQueueDTO param) {
-        RelicsSceneInitQueueDTO relicsSceneInitQueueDTO=new RelicsSceneInitQueueDTO();
-        relicsSceneInitQueueDTO.setSceneCode(param.getSceneCode());
-        relicsSceneInitQueueDTO.setLocation(param.getLocation());
-        relicsSceneInitQueueDTO.setAlgorithmTime(param.getAlgorithmTime());
-        relicsSceneInitQueueDTO.setCreateTime(param.getCreateTime());
-        relicsSceneInitQueueDTO.setPhoneNum(param.getPhoneNum());
-        relicsSceneInitQueueDTO.setUserId(param.getUserId());
-        relicsSceneInitQueueDTO.setSnCode(param.getSnCode());
-        relicsSceneInitQueueDTO.setStatus(param.getStatus());
-        relicsSceneInitQueueDTO.setSceneName(param.getSceneName());
-        relicsSceneInitQueueDTO.setShootCount(param.getShootCount());
-        rabbitMqProducerUtil.sendByWorkQueue(relicsInitQueue,relicsSceneInitQueueDTO);
+    private void sendStartMq(SceneQueueDTO param) {
+        if (ObjectUtil.isNotEmpty(param.getSceneSource())&& param.getSceneSource()==6) {
+            RelicsSceneInitQueueDTO relicsSceneInitQueueDTO = new RelicsSceneInitQueueDTO();
+            relicsSceneInitQueueDTO.setSceneCode(param.getSceneCode());
+            relicsSceneInitQueueDTO.setLocation(param.getLocation());
+            relicsSceneInitQueueDTO.setCreateTime(param.getCreateTime());
+            relicsSceneInitQueueDTO.setPhoneNum(param.getPhoneNum());
+            relicsSceneInitQueueDTO.setUserId(param.getUserId());
+            relicsSceneInitQueueDTO.setSnCode(param.getSnCode());
+            relicsSceneInitQueueDTO.setStatus(param.getStatus());
+            relicsSceneInitQueueDTO.setSceneName(param.getSceneName());
+            relicsSceneInitQueueDTO.setShootCount(param.getShootCount());
+            relicsSceneInitQueueDTO.setSceneSource(param.getSceneSource());
+            rabbitMqProducerUtil.sendByWorkQueue(relicsInitQueue, relicsSceneInitQueueDTO);
+        }
+    }
+    private void sendEndMq(SceneQueueDTO param) {
+        if (ObjectUtil.isNotEmpty(param.getSceneSource())&& param.getSceneSource()==6) {
+            RelicsSceneInitQueueDTO relicsSceneInitQueueDTO = new RelicsSceneInitQueueDTO();
+            relicsSceneInitQueueDTO.setSceneCode(param.getSceneCode());
+            relicsSceneInitQueueDTO.setLocation(param.getLocation());
+            relicsSceneInitQueueDTO.setAlgorithmTime(param.getAlgorithmTime());
+            relicsSceneInitQueueDTO.setCreateTime(param.getCreateTime());
+            relicsSceneInitQueueDTO.setPhoneNum(param.getPhoneNum());
+            relicsSceneInitQueueDTO.setUserId(param.getUserId());
+            relicsSceneInitQueueDTO.setSnCode(param.getSnCode());
+            relicsSceneInitQueueDTO.setStatus(param.getStatus());
+            relicsSceneInitQueueDTO.setSceneName(param.getSceneName());
+            relicsSceneInitQueueDTO.setShootCount(param.getShootCount());
+            relicsSceneInitQueueDTO.setSceneSource(param.getSceneSource());
+            rabbitMqProducerUtil.sendByWorkQueue(relicsInitQueue, relicsSceneInitQueueDTO);
+        }
     }
 
     private static final String CHARACTERS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";

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

@@ -69,4 +69,5 @@ tlog:
 queue:
     scene-queue: queue-pano-scene
     do-slice-queue: queue-do-slice
-    relics-init-queue: relics-init-queue
+    relics-init-queue: relics-init-queue
+    relics-update-name-queue: relics-update-name-queue

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

@@ -63,4 +63,5 @@ tlog:
 queue:
     scene-queue: queue-pano-scene
     do-slice-queue: queue-do-slice
-    relics-init-queue: relics-init-queue
+    relics-init-queue: relics-init-queue
+    relics-update-name-queue: relics-update-name-queue

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

@@ -92,4 +92,8 @@ forest:
     log-response-status: true # 打开/关闭Forest响应状态日志（默认为 true）
     log-response-content: true # 打开/关闭Forest响应内容日志（默认为 false）
     base-address-scheme: https
-    base-address-host: www.4dkankan.com
+    base-address-host: www.4dkankan.com
+queue:
+    scene-queue: queue-pano-scene
+    do-slice-queue: queue-do-slice
+    relics-update-name-queue: relics-update-name-queue

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

@@ -94,4 +94,5 @@ forest:
     base-address-host: test.4dkankan.com
 queue:
     scene-queue: queue-pano-scene
-    do-slice-queue: queue-do-slice
+    do-slice-queue: queue-do-slice
+    relics-update-name-queue: relics-update-name-queue

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -4,15 +4,14 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.amazonaws.services.dynamodbv2.xspec.S;
 import com.gis.common.constant.*;
 import com.gis.common.exception.BaseRuntimeException;
 import com.gis.common.httpclient.FdkkClient;
+import com.gis.common.mq.RabbitMqProducerUtil;
 import com.gis.common.util.*;
 import com.gis.domain.dto.*;
 import com.gis.domain.entity.FodderEntity;
@@ -37,6 +36,7 @@ import org.apache.http.util.EntityUtils;
 import org.junit.Test;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -87,7 +87,10 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
 
     @Resource
     ScenePanoService scenePanoService;
-
+    @Autowired
+    RabbitMqProducerUtil rabbitMqProducer;
+    @Value("${queue.relics-update-name-queue}")
+    String relicsUpdateNameQueue;
     @Override
     public IBaseStrMapper<WorkEntity, String> getBaseMapper() {
         return this.entityMapper;
@@ -557,6 +560,13 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
      */
     private boolean editEntity(JSONObject someDataJson, WorkEntity entity) {
         entity.setName(someDataJson.getString("name"));
+        if (ObjectUtil.isNotNull(entity.getNum())){
+            Map<String,Object> map=new HashMap<>();
+            map.put("sceneCode", entity.getNum());
+            map.put("sceneName", entity.getName());
+            rabbitMqProducer.sendByWorkQueue(relicsUpdateNameQueue,map);
+         }
+
         entity.setIcon(someDataJson.getString("icon"));
         entity.setShare(someDataJson.getString("share"));
         entity.setQrCode(someDataJson.getString("qrCode"));