Merge branch 'release' into 'master'

Release

See merge request !75

middleware-automatic-center-client/src/main/java/com/zhiwei/middleware/automatic/server/core/AutoMaticClient.java

@@ -48,9 +48,6 @@ public class AutoMaticClient {
         return autoMaticService.getMupdateByTemplateTitle(group, templateTitle);
     }
 
-    public String tryGetTemplateTitleByMupdate(String group, String title, String mupdate) {
-        return autoMaticService.tryGetTemplateTitleByMupdate(group, title, mupdate);
-    }
 
     public Map<String, Object> compareWithTemplateTileOL(String project, String title) {
         return autoMaticService.compareWithTemplateTileOL(project, title);

middleware-automatic-center-client/src/main/java/com/zhiwei/middleware/automatic/server/dubbo/service/AutoMaticService.java

@@ -55,16 +55,6 @@ public interface AutoMaticService {
     List<String> getMupdateByTemplateTitle(String group, String templateTitle);
 
     /**
-     * 根据标题和特征值尝试搜索模板标题
-     *
-     * @param group 项目
-     * @param title 标题
-     * @param mupdate 特征值
-     * @return 模板标题
-     */
-    String tryGetTemplateTitleByMupdate(String group, String title, String mupdate);
-
-    /**
      * 根据项目组和标题在线匹配已有聚合标题
      *
      * @param project 项目

middleware-automatic-center-client/src/main/java/com/zhiwei/middleware/automatic/server/pojo/TemplateRecord.java

@@ -61,6 +61,7 @@ public class TemplateRecord {
         json.put("source", source);
         json.put("realSource", realSource);
         json.put("time", time);
+        json.put("id", id);
         return json;
     }
 

middleware-automatic-center-server/src/main/java/com/zhiwei/middleware/automatic/server/dubbo/service/AutoMaticService.java

@@ -49,14 +49,6 @@ public interface AutoMaticService {
     Map<String, Object> getTemplateTitleByProjectByLost(String project, String searchInfo, List<String> tags, long startTime,
                                                                long endTime, int page, int size, String orderField, boolean isAsc);
 
-    /**
-     * 根据模板标题获取数据(仅最新100条)
-     *
-     * @param group 项目
-     * @param templateTitle 模板标题
-     * @return 特征值
-     */
-    List<String> getMupdateByTemplateTitle(String group, String templateTitle);
 
     /**
      * 根据标题和特征值尝试搜索模板标题

middleware-automatic-center-server/src/main/java/com/zhiwei/middleware/automatic/server/dubbo/service/impl/AutoMaticServiceImpl.java

@@ -80,11 +80,6 @@ public class AutoMaticServiceImpl implements AutoMaticService {
     }
 
     @Override
-    public List<String> getMupdateByTemplateTitle(String group, String templateTitle) {
-        return templateTitleService.getMupdateByTemplateTitle(group, templateTitle);
-    }
-
-    @Override
     public String tryGetTemplateTitleByMupdate(String group, String title, String mupdate) {
         return templateTitleService.tryGetTemplateTitleByMupdate(group, title, mupdate);
     }

middleware-automatic-center-server/src/main/java/com/zhiwei/middleware/automatic/server/service/TemplateTitleService.java

@@ -38,14 +38,6 @@ public interface TemplateTitleService {
     Map<String, Object> searchTemplateTitle(String key, String project, String searchInfo, List<String> tags, long startTime,
                                            long endTime, int page, int size, String orderField, boolean isAsc);
 
-    /**
-     * 根据模板标题获取数据(仅最新100条)
-     *
-     * @param group 项目
-     * @param templateTitle 模板标题
-     * @return 特征值
-     */
-    List<String> getMupdateByTemplateTitle(String group, String templateTitle);
 
     /**
      * 根据标题和特征值尝试搜索模板标题

middleware-automatic-center-server/src/main/java/com/zhiwei/middleware/automatic/server/service/impl/TemplateTitleServiceImpl.java

@@ -100,21 +100,6 @@ public class TemplateTitleServiceImpl implements TemplateTitleService {
     }
 
     @Override
-    public List<String> getMupdateByTemplateTitle(String group, String templateTitle) {
-        try {
-            TemplateTitleVo templateTitleVo = getTemplateTitleByProjectLive(group).get(templateTitle);
-            if (null == templateTitleVo || TemplateStatus.已重置 == templateTitleVo.getStatus()) {
-                return null;
-            }
-            List<TemplateRecord> templateId = templateRecordDao.findTemplateRecord(new Query(Criteria.where("templateId").is(templateTitleVo.getId())));
-            return templateId.stream().map(TemplateRecord::getMupdate).collect(Collectors.toList());
-        } catch (Exception e) {
-            log.error("查看模板标题特征值失败:", e);
-            return null;
-        }
-    }
-
-    @Override
     public String tryGetTemplateTitleByMupdate(String group, String title, String mupdate) {
         Map<String, TemplateTitleVo> templateTitleVos = getTemplateTitleByProjectLive(group);
         List<Map<String, Object>> filterTitles = new ArrayList<>();
@@ -194,12 +179,12 @@ public class TemplateTitleServiceImpl implements TemplateTitleService {
         if (Objects.nonNull(startTime) && Objects.nonNull(endTime)) {
             criteria.and("createAt").gte(startTime).lt(endTime);
         }
-        Query query = new Query(criteria)
-                .skip(skip).limit(pageSize).with(Sort.by(Sort.Direction.DESC, "_id"));
+        Query query = new Query(criteria);
         long count = templateRecordDao.count(query);
         if (count == 0) {
             return new PageVO<>(skip, pageSize, (int) count, Collections.emptyList());
         }
+        query.skip(skip).limit(pageSize).with(Sort.by(Sort.Direction.DESC, "_id"));
         return new PageVO<>(page, pageSize, (int) count, templateRecordDao.findTemplateRecord(query).stream().map(TemplateRecord::toJson).collect(Collectors.toList()));
     }