Merge branch 'feature' into 'release'

2023年07/10 避免失效后 重新聚合后id一致

See merge request !84

middleware-automatic-center-client/pom.xml

@@ -98,6 +98,7 @@
             <groupId>com.zhiwei.base</groupId>
             <artifactId>base-objects-application</artifactId>
             <version>${base.version}</version>
+            <scope>provided</scope>
         </dependency>
 
 

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

@@ -32,7 +32,8 @@ public class TemplateTitleVo implements Serializable {
         } catch (NoSuchAlgorithmException e) {
             e.printStackTrace();
         }
-        String info = this.templateTitle + group;
+        // 避免失效后 重新聚合后id一致
+        String info = this.templateTitle + group + System.currentTimeMillis();
         byte[] hash = sMd5Digest.digest(info.getBytes());
         BigInteger numValue = new BigInteger(1, hash);
         this.id = numValue.toString(16);

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

@@ -300,9 +300,6 @@ public class TaskServiceCommon extends BaseTaskTypePair<TaskServiceCommon.TaskCo
         // 相似度最高的模板信息
         Map<String, Object> similarMap = new HashMap<>();
         for (TemplateTitleVo templateTitleVo : titleVoMap.values()) {
-            if (Objects.isNull(templateTitleVo.getId())) {
-                templateTitleVo.buildId(group);
-            }
             // 过滤掉以重置的模板
             if (templateTitleVo.getStatus() == TemplateStatus.已重置 || Tools.isEmpty(templateTitleVo.getMtag())) {
                 continue;

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

@@ -203,9 +203,6 @@ public class TaskServiceTemplate extends BaseTaskTypePair<TaskServiceTemplate.Ta
                 .filter(e -> {
                     String title = e.getKey();
                     TemplateTitleVo templateTitleVo = e.getValue();
-                    if (Objects.isNull(templateTitleVo.getId())) {
-                        templateTitleVo.buildId(group);
-                    }
                     long updateTime = templateTitleVo.getUpdateTime().getTime();
                     // 移除1天有效期外的数据
                     if (System.currentTimeMillis() - updateTime > ONE_DAY * 1000) {