2023年05/4 markInfo转换bug修复

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/dao/TemplateTempRecord.java

@@ -29,6 +29,15 @@ public class TemplateTempRecord {
         this.mtag = mtag;
     }
 
+    public TemplateTempRecord(String templateId, String templateTitle,
+                              String group, String url, String mtag) {
+        this.templateId = templateId;
+        this.templateTitle = templateTitle;
+        this.group = group;
+        this.url = url;
+        this.mtag = mtag;
+    }
+
     public String getId() {
         return id;
     }

middleware-automatic-center-son/src/main/java/com/zhiwei/middleware/automatic/son/task/service/TaskServiceCommon.java

@@ -214,7 +214,7 @@ public class TaskServiceCommon extends BaseTaskTypePair<TaskServiceCommon.TaskCo
                 // 模板标注count累加
                 redissonUtil.putCount(Tools.assembleKey(COUNT_KEY, group, templateTitleVo.getId()), 1);
                 // 测试环境临时添加，用于对比
-                templateRecordDao.tempRecord(new TemplateTempRecord());
+                templateRecordDao.tempRecord(new TemplateTempRecord(templateTitleVo.getId(), templateTitleVo.getTemplateTitle(), group, getUrl(markInfo), templateTitleVo.getMtag()));
                 return true;
             } catch (Exception e) {
                 log.error("记录事件采集-标注数据特征值失败", e);
@@ -223,6 +223,19 @@ public class TaskServiceCommon extends BaseTaskTypePair<TaskServiceCommon.TaskCo
         return false;
     }
 
+    private String getUrl(MarkInfo markInfo) {
+        switch (markInfo.getTypeB()) {
+            case COMPLETE:
+            case INCOMPLETE:
+            case VIDEO:
+                return markInfo.getSourceObj().getString("url");
+            case QA:
+                String url = markInfo.getSourceObj().getString("answer_url");
+                return Objects.nonNull(url) ? url : markInfo.getSourceObj().getString("question_url");
+        }
+        return null;
+    }
+
     private Map<String, Object> similarMapInfo(Map<String, TemplateTitleVo> titleVoMap, String title, String group) {
         // 相似度最高的模板信息
         Map<String, Object> similarMap = new HashMap<>();
@@ -251,17 +264,17 @@ public class TaskServiceCommon extends BaseTaskTypePair<TaskServiceCommon.TaskCo
         int c2 = Integer.parseInt(String.valueOf(hit.get("c2")));
         switch (ClassB.TypeB.fromEncode(c2)){
             case COMPLETE:
-                CompleteTextMark context =CompleteTextMark.restoreFromEs(hit);
+                CompleteTextMark context = CompleteTextMark.restoreFromEs(hit);
                 return new MarkInfo(context);
             case INCOMPLETE:
                 IncompleteTextMark incompleteTextMark = IncompleteTextMark.restoreFromEs(hit);
                 return new MarkInfo(incompleteTextMark);
             case QA:
                 QATextMark qaTextMark = QATextMark.restoreFromEs(hit);
-                new MarkInfo(qaTextMark);
+                return new MarkInfo(qaTextMark);
             case VIDEO:
                 VideoMark videoMark = VideoMark.restoreFromEs(hit);
-                new MarkInfo(videoMark);
+                return new MarkInfo(videoMark);
         }
         return null;
     }