Merge branch 'release' into 'master'

Release

See merge request !21

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

@@ -15,27 +15,35 @@ public class TemplateTempRecord {
 
     private String url;
 
+    private String esId;
+
     private String mtag;
 
+    private Long createAt;
+
     public TemplateTempRecord() {}
 
     public TemplateTempRecord(String id, String templateId, String templateTitle,
-                              String group, String url, String mtag) {
+                              String group, String url, String esId, String mtag) {
         this.id = id;
         this.templateId = templateId;
         this.templateTitle = templateTitle;
         this.group = group;
         this.url = url;
+        this.esId = esId;
         this.mtag = mtag;
+        this.createAt = System.currentTimeMillis();
     }
 
     public TemplateTempRecord(String templateId, String templateTitle,
-                              String group, String url, String mtag) {
+                              String group, String url, String esId, String mtag) {
         this.templateId = templateId;
         this.templateTitle = templateTitle;
         this.group = group;
         this.url = url;
+        this.esId = esId;
         this.mtag = mtag;
+        this.createAt = System.currentTimeMillis();
     }
 
     public String getId() {
@@ -61,4 +69,8 @@ public class TemplateTempRecord {
     public String getMtag() {
         return mtag;
     }
+
+    public Long getCreateAt() {
+        return createAt;
+    }
 }

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

@@ -214,7 +214,8 @@ public class TaskServiceCommon extends BaseTaskTypePair<TaskServiceCommon.TaskCo
                 // 模板标注count累加
                 redissonUtil.putCount(Tools.assembleKey(COUNT_KEY, group, templateTitleVo.getId()), 1);
                 // 测试环境临时添加，用于对比
-                templateRecordDao.tempRecord(new TemplateTempRecord(templateTitleVo.getId(), templateTitleVo.getTemplateTitle(), group, getUrl(markInfo), templateTitleVo.getMtag()));
+                templateRecordDao.tempRecord(new TemplateTempRecord(templateTitleVo.getId(), templateTitleVo.getTemplateTitle(), group, getUrl(markInfo),
+                        sourceObj.getString("id"), templateTitleVo.getMtag()));
                 return true;
             } catch (Exception e) {
                 log.error("记录事件采集-标注数据特征值失败", e);