Merge branch 'dev/dev_xp' into dev/dev

src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java

@@ -110,6 +110,7 @@ public class GenerateConsumer {
         long start = System.currentTimeMillis();
 
         Map<String, String> generateResult = JSONObject.parseObject(msg.getBody(), Map.class);
+        log.info("generate response : {}", generateResult);
 
         try {
             log.info("tasks_id : {} start ", generateResult.get("tasks_id"));
@@ -146,7 +147,7 @@ public class GenerateConsumer {
         }
 
         long end = System.currentTimeMillis();
-        log.info("tasks_id : {}, message : {}, 执行时长： {} 毫秒",generateResult.get("tasks_id"), generateResult.get("message"), (end - start));
+        log.info("tasks_id : {}, end , message : {}, 执行时长： {} 毫秒", generateResult.get("tasks_id"), generateResult.get("message"), (end - start));
         log.info("============ProcessGenerateResult End listening==========");
 
     }

src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java

@@ -132,17 +132,31 @@ public class SRConsumer {
 
         try {
             result = JSONObject.parseObject(msg.getBody(), JSONObject.class);
+            log.info("SR response : {}", result);
             taskId = result.get("tasks_id").toString();
         } catch (JSONException e) {
             log.error("SRResult 返回数据格式不合规范");
             log.error(e.getMessage());
             setErrorMessage(msg, channel, e.getMessage(), null);
+            try {
+                // 第二个参数，是否批量确认消息，当传false时，只确认当前 deliveryTag对应的消息;当传true时，会确认当前及之前所有未确认的消息。
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
+            } catch (IOException exception) {
+                log.error("手动确认，取消返回队列，不再重新消费");
+            }
+        } catch (Exception e){
+            log.error(e.getMessage());
+            setErrorMessage(msg, channel, e.getMessage(), null);
+            try {
+                // 第二个参数，是否批量确认消息，当传false时，只确认当前 deliveryTag对应的消息;当传true时，会确认当前及之前所有未确认的消息。
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
+            } catch (IOException exception) {
+                log.error("手动确认，取消返回队列，不再重新消费");
+            }
         }
 
 
         try {
-//            channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
-
             // 2、判断状态是否成功
             if ("SUCCESS".equals(result.get("status").toString())) {
                 String output = result.get("data").toString();

src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java

@@ -38,6 +38,7 @@ import javax.annotation.Resource;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.ai.da.common.enums.CollectionLevel1TypeEnum.*;
 
@@ -527,6 +528,11 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
             }
             results.add(generateResultVO);
         });
+        // todo
+        Set<String> collect = results.stream().map(GenerateResultVO::getStatus).collect(Collectors.toSet());
+        if (taskIdList.size() == 4 && collect.size() == 1 && collect.contains("Fail")){
+            throw new BusinessException("generate.interface.error");
+        }
         return results;
     }