1

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

@@ -0,0 +1,37 @@
+package com.fdkankan.modeling.receiver;
+
+import com.fdkankan.modeling.constants.SysConstants;
+import com.fdkankan.modeling.entity.MqEcs;
+import com.fdkankan.modeling.service.IMqEcsService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class QueueNameService {
+
+    @Value("${queue.modeling.modeling-call}")
+    private String queue;
+    @Autowired
+    IMqEcsService mqEcsService;
+
+
+    public String getQueueName(){
+        String queueName = queue;
+        if(StringUtils.isBlank(SysConstants.hostName)){
+            log.info("获取hostName失败,监听队列名为：{}",queueName);
+            return queueName;
+        }
+        MqEcs mqEcs = mqEcsService.getByHostName(SysConstants.hostName);
+        if(mqEcs != null ){
+            queueName = mqEcs.getQueueName();
+            log.info("获取hostNam成功,监听队列名为：{}",queueName);
+            return queueName;
+        }
+        log.info("获取hostName失败,监听队列名为：{}",queueName);
+        return queueName;
+    }
+}

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

@@ -81,7 +81,7 @@ public class RabbitMqListener {
     @Autowired
     private ISceneBuildProcessLogService sceneBuildProcessLogService;
     @Autowired
-    MqEcsServiceImpl mqEcsService;
+    QueueNameService mqEcsService;
 
     /**
      * 场景计算
@@ -91,7 +91,7 @@ public class RabbitMqListener {
      */
     @RabbitListener(
             //queuesToDeclare = @Queue("${queue.modeling.modeling-call}"),
-            queuesToDeclare = @Queue("#{mqEcsService.getQueueName()}"),
+            queuesToDeclare = @Queue("#{queueNameService.getQueueName()}"),
             concurrency = "${maxThread.modeling.modeling-call}",
             priority = "${mq.consumerPriority}"
     )

src/main/java/com/fdkankan/modeling/service/IMqEcsService.java

@@ -15,7 +15,6 @@ import java.util.List;
  */
 public interface IMqEcsService extends IService<MqEcs> {
 
-    String getQueueName(String hostName);
 
     MqEcs getByHostName(String hostName);
 

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

@@ -21,16 +21,6 @@ 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) {
-        MqEcs byHostName = this.getByHostName(hostName);
-        if(byHostName == null){
-            return queueNameDf;
-        }
-        return byHostName.getQueueName();
-    }
 
     @Override
     public MqEcs getByHostName(String hostName) {