111

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

@@ -126,12 +126,6 @@ public class RabbitMqListener {
             return;
         }
 
-        //进入计算程序前，场景已删除，就不往下跑
-        if(SysConstants.interrupCallingNums.contains(buildSceneMessage.getSceneNum())){
-            SysConstants.interrupCallingNums.remove(buildSceneMessage.getSceneNum());
-            channel.basicAck(deliveryTag, false);
-        }
-
         BuildLog buildLog = new BuildLog();
         log.info("场景计算开始,队列名:{},id:{},deliveryTag:{},消息体:{}", queueModelingCall, messageId,deliveryTag,msg);
         buildLog.setMessageId(messageId);
@@ -271,7 +265,11 @@ public class RabbitMqListener {
 
         //计算模型并返回需要上传oss的文件集合
         SysConstants.callingNum.add(num);
-        ComputerUtil.computer(num, path, buildType);
+        try {
+            ComputerUtil.computer(num, path, buildType);
+        }finally {
+            SysConstants.callingNum.remove(num);
+        }
 
         // 检测计算结果文件是否有生成
         String resultsPath = path + File.separator + "results" + File.separator;