Browse Source

计算结果mq主题名优化

dengsixing 3 years ago
parent
commit
9c804c83f1

+ 4 - 4
4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/receiver/BuildSceneMQListener.java

@@ -189,7 +189,7 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
         Long computeTime = null;//计算耗时
         JSONObject videosJson = null;
         //如果mq生产者在消息体中执行了计算结果mq的主题名,就发到这个主题名,否则就发送到配置的主题名
-        buildSceneResultTopic = StrUtil.isNotBlank(message.getResultReceiverMqName()) ?
+        String resultTopicName = StrUtil.isNotBlank(message.getResultReceiverMqName()) ?
                 message.getResultReceiverMqName() : buildSceneResultTopic;
         //该场景使用的容量
         Long space = 0L;
@@ -398,7 +398,7 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
 //            handFail("计算失败",message);
         }finally {
             //发送计算结果到mq,再由消费者消费并操作数据库
-            this.sendCallResult(buildSuccess, cameraType, computeTime, fileId, payStatus, projectNum, space, videosJson);
+            this.sendCallResult(buildSuccess, resultTopicName, cameraType, computeTime, fileId, payStatus, projectNum, space, videosJson);
             //上传status.json   console.log
             this.uploadStatusJsonAndConsoleLog(sceneProId, sceneStatus, webSite, projectNum, thumb, payStatus, dataPath, dataSource);
 
@@ -442,9 +442,9 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
         }
     }
 
-    private void sendCallResult(boolean buildSuccess, String cameraType, Long computeTime, String fileId,
+    private void sendCallResult(boolean buildSuccess, String resultTopicName, String cameraType, Long computeTime, String fileId,
                                 Integer payStatus, String projectNum, Long space, JSONObject videosJson){
-        rocketMQProducer.sendOneWay(buildSceneResultTopic,
+        rocketMQProducer.sendOneWay(resultTopicName,
                 BuildSceneResultMqMessage.builder()
                         .buildSuccess(buildSuccess)
                         .cameraType(cameraType)

+ 7 - 1
4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/TestController.java

@@ -9,6 +9,7 @@ import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.util.MatrixToImageWriterUtil;
+import com.fdkankan.common.util.SpringUtil;
 import com.fdkankan.common.util.StrExtUtil;
 import com.fdkankan.mq.message.BuildSceneMqMessage;
 import com.fdkankan.mq.util.RocketMQProducer;
@@ -20,6 +21,7 @@ import com.fdkankan.platform.api.vo.User;
 import com.fdkankan.redis.constant.RedisLockKey;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.entity.Folder;
+import com.fdkankan.scene.listener.TestListener;
 import com.fdkankan.scene.service.IFolderService;
 import com.fdkankan.scene.service.IScene3dNumService;
 import com.fdkankan.scene.service.ISceneService;
@@ -106,7 +108,11 @@ public class TestController {
 //        ResultData<String> test = platformGoodsClient.test();
 
 //        System.out.println("gghhjjkkllll");
-        return list.toString();
+
+        TestListener bean = SpringUtil.getBean(TestListener.class);
+
+
+        return bean.getBuildSceneResultTopic();
 
     }
 

+ 9 - 0
4dkankan-center-scene/src/main/java/com/fdkankan/scene/listener/BuildSceneResultMQListener.java

@@ -31,6 +31,15 @@ import java.util.List;
 import java.util.Objects;
 
 
+/**
+ * <p>
+        场景计算后 写库相关业务逻辑
+ * </p>
+ * @author dengsixing
+ * @date 2022/2/23
+ * @param null
+ * @return null
+ **/
 @Slf4j
 @Component
 @RocketMQMessageListener(