Merge branch 'feature' into 'release'

2023年05/26 模板id赋值

See merge request !62

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

@@ -197,7 +197,7 @@ public class TaskServiceTemplate extends BaseTaskTypePair<TaskServiceTemplate.Ta
      */
     private void projectDataTemplate(String group, List<Map<String, Object>> sourceList) {
         //聚合模板
-        Map<String, TemplateTitleVo> newTemplate = aggregation(transferMark(sourceList));
+        Map<String, TemplateTitleVo> newTemplate = aggregation(transferMark(sourceList), group);
         //旧的聚合模板
         Map<String, TemplateTitleVo> oldTemplate = templateTitleService.getTemplateTitleByProjectLive(group).entrySet().stream()
                 .filter(e -> {
@@ -228,7 +228,7 @@ public class TaskServiceTemplate extends BaseTaskTypePair<TaskServiceTemplate.Ta
      * @param sourceList 数据集
      * @return 模板集
      */
-    private Map<String, TemplateTitleVo> aggregation(List<CompleteTextMark> sourceList) {
+    private Map<String, TemplateTitleVo> aggregation(List<CompleteTextMark> sourceList, String group) {
         Map<String, TemplateTitleVo> aggregationTitleTagMap = new ConcurrentHashMap<>();
         List<String> titles = sourceList.stream().map(CompleteTextMark::getTitle).collect(Collectors.toList());
         // 得到聚合集
@@ -247,7 +247,9 @@ public class TaskServiceTemplate extends BaseTaskTypePair<TaskServiceTemplate.Ta
             if (title.length() < 6) {
                 continue;
             }
-            aggregationTitleTagMap.put(title, new TemplateTitleVo(title, tag, sourceList.get(result.getDataPoints().get(0)).getUrl()));
+            TemplateTitleVo templateTitleVo = new TemplateTitleVo(title, tag, sourceList.get(result.getDataPoints().get(0)).getUrl());
+            templateTitleVo.buildId(group);
+            aggregationTitleTagMap.put(title, templateTitleVo);
         }
         return aggregationTitleTagMap;
     }