1

src/main/java/com/fdkankan/modeling/receiver/RabbitMqListener.java

@@ -13,6 +13,7 @@ import com.fdkankan.modeling.entity.BuildLog;
 import com.fdkankan.modeling.exception.BuildException;
 import com.fdkankan.modeling.handler.LaserSceneObjGenerateHandler;
 import com.fdkankan.modeling.service.IBuildLogService;
+import com.fdkankan.modeling.service.IMqEcsService;
 import com.fdkankan.modeling.service.ISceneBuildProcessLogService;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 import com.fdkankan.rabbitmq.bean.BuildSceneProcessLogMessage;
@@ -78,6 +79,8 @@ public class RabbitMqListener {
     private LaserSceneObjGenerateHandler laserSceneObjGenerateHandler;
     @Autowired
     private ISceneBuildProcessLogService sceneBuildProcessLogService;
+    @Autowired
+    IMqEcsService mqEcsService;
 
     /**
      * 场景计算
@@ -87,7 +90,7 @@ public class RabbitMqListener {
      */
     @RabbitListener(
             //queuesToDeclare = @Queue("${queue.modeling.modeling-call}"),
-            queuesToDeclare = @Queue("#{SysConstants.initIsResidenceService()}"),
+            queuesToDeclare = @Queue("#{mqEcsService.getQueueName()}"),
             concurrency = "${maxThread.modeling.modeling-call}",
             priority = "${mq.consumerPriority}"
     )

src/main/java/com/fdkankan/modeling/service/impl/MqEcsServiceImpl.java

@@ -5,6 +5,7 @@ import com.fdkankan.modeling.entity.MqEcs;
 import com.fdkankan.modeling.mapper.IMqEcsMapper;
 import com.fdkankan.modeling.service.IMqEcsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,9 +21,15 @@ import java.util.List;
 @Service
 public class MqEcsServiceImpl extends ServiceImpl<IMqEcsMapper, MqEcs> implements IMqEcsService {
 
+    @Value("${queue.modeling.modeling-call}")
+    private String queueNameDf;
     @Override
     public String getQueueName(String hostName) {
-        return this.getByHostName(hostName).getQueueName();
+        MqEcs byHostName = this.getByHostName(hostName);
+        if(byHostName == null){
+            return queueNameDf;
+        }
+        return byHostName.getQueueName();
     }
 
     @Override