Merge branch 'release_gdghg' of ssh://gitlab.gsstcloud.com:10022/poc/poc-api into release_gdghg

src/main/java/cn/com/poc/ai_data_audit/service/impl/BizAiDataAuditTaskServiceImpl.java

@@ -118,6 +118,9 @@ public class BizAiDataAuditTaskServiceImpl extends BaseServiceImpl
         if (entity.getDataAuditTaskName() != null) {
             model.setDataAuditTaskName(entity.getDataAuditTaskName());
         }
+        if (entity.getAuditResult() != null) {
+            model.setAuditResult(entity.getAuditResult());
+        }
         if (entity.getMemberId() != null) {
             model.setMemberId(entity.getMemberId());
         }

src/main/java/cn/com/poc/message/service/impl/AirportConsumerServiceImpl.java

@@ -194,12 +194,14 @@ public class AirportConsumerServiceImpl implements AirportConsumerService {
             countDownLatch.await(10 * 60, TimeUnit.SECONDS);
 
             //更新结果和任务状态
-            bizAiDataAuditTaskEntity.setAuditResult(results.toString());
+            bizAiDataAuditTaskEntity.setAuditResult(JSONObject.toJSONString(results));
             bizAiDataAuditTaskEntity.setStatus("end");
             bizAiDataAuditTaskService.update(bizAiDataAuditTaskEntity);
         } catch (Exception e) {
             redisService.set("ERROR_MSG_AI_DATA_AUDIT_TASK:" + message.getTaskId(), e.getMessage(), 60 * 60 * 24 * 7);
             if (bizAiDataAuditTaskEntity != null) {
+                bizAiDataAuditTaskEntity = new BizAiDataAuditTaskEntity();
+                bizAiDataAuditTaskEntity.setDataAuditTaskId(message.getTaskId());
                 bizAiDataAuditTaskEntity.setStatus("fail");
                 bizAiDataAuditTaskService.update(bizAiDataAuditTaskEntity);
             }