dengsixing 2 年之前
父节点
当前提交
5ade5e8eb8

+ 3 - 4
src/main/java/com/fdkankan/scene/listener/RabbitMqListener.java

@@ -41,10 +41,9 @@ public class RabbitMqListener {
         concurrency = "${maxThread.scene.upgrade-to-v4}"
     )
     public void buildScenePreHandler(Channel channel, Message message) throws Exception {
-        Object correlation = message.getMessageProperties().getHeader("spring_returned_message_correlation");
-        String correlationId = (String) correlation;
+        String messageId = message.getMessageProperties().getMessageId();
         String msg = new String(message.getBody(), StandardCharsets.UTF_8);
-        log.info("场景升级开始,队列名:{},id:{},消息体:{}", upgradeToV4, correlationId, msg);
+        log.info("场景升级开始,队列名:{},id:{},消息体:{}", upgradeToV4, messageId, msg);
         HashMap hashMap = null;
         try {
             hashMap = JSON.parseObject(msg, HashMap.class);
@@ -57,7 +56,7 @@ public class RabbitMqListener {
         boolean reUpgrade = (boolean)hashMap.get("reUpgrade");
         //迁移数据
         sceneUpgradeToV4Service.upgrade(sceneProId,reUpgrade);
-        log.info("场景升级结束,队列名:{},id:{}", upgradeToV4, correlationId);
+        log.info("场景升级结束,队列名:{},id:{}", upgradeToV4, messageId);
         channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
     }
 

+ 2 - 0
src/main/java/com/fdkankan/scene/service/impl/SceneUpgradeToV4Service.java

@@ -117,6 +117,8 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
     @Override
     public void upgrade(long sceneProId, boolean reUpgrade)  throws Exception{
 
+        Thread.sleep(30000);
+
         ScenePro scenePro = sceneProService.getById(sceneProId);
         //线程开始,正在执行线程数+1
         String num = scenePro.getNum();