优化执行结果根据失败关键字筛选

优化告警日志监控看板概览功能
2025-11-14 18:48:27 +08:00
parent d9bd70860c
commit 1adc72032a
25 changed files with 752 additions and 178 deletions
@@ -84,6 +84,8 @@ public class RmDeploymentPolicy extends BaseEntity
    private Boolean resourceGroupIdNull;
    /** 部署设备 */
    private String deployDevice;
+    /** 业务脚本id */
+    private Long scriptId;
    /** 业务脚本名称 */
    private String scriptName;
    /** 业务脚本文件地址 */
@@ -4,7 +4,8 @@ import lombok.Getter;

@Getter
 public enum AlarmTypeEnum {
-    服务器下线("1", "服务器下线");
+    服务器下线("1", "服务器下线"),
+    交换机下线("2", "交换机下线");
    private final String code;
    private final String msg;
    AlarmTypeEnum(String code, String msg){
@@ -103,10 +103,14 @@ public class RmDeploymentPolicyServiceImpl implements IRmDeploymentPolicyService
                        }
                    });
                }
-                policy.setSucessNum(successList.size());
-                policy.setSucessClientIds(successList);
-                policy.setFailNum(failList.size());
-                policy.setFailClientIds(failList);
+                // 对三个list分别去重
+                List<String> successListDict = successList.stream().distinct().collect(Collectors.toList());
+                List<String> failListDict = failList.stream().distinct().collect(Collectors.toList());
+                offOnlineList = offOnlineList.stream().distinct().collect(Collectors.toList());
+                policy.setSucessNum(successListDict.size());
+                policy.setSucessClientIds(successListDict);
+                policy.setFailNum(failListDict.size());
+                policy.setFailClientIds(failListDict);
                policy.setOfflineNum(offOnlineList.size());
                policy.setOfflineClientIds(offOnlineList);
            }
@@ -161,6 +165,18 @@ public class RmDeploymentPolicyServiceImpl implements IRmDeploymentPolicyService
    {
        rmDeploymentPolicy.setCreateTime(DateUtils.getNowDate());
        rmDeploymentPolicy.setCreateBy(SecurityUtils.getUsername());
+        // 部署设备去重
+        String clientIds = rmDeploymentPolicy.getDeployDevice();
+        String[] clientIdArr = clientIds.split("\n");
+        // 去重并保持顺序
+        String distinctClientIds = Arrays.stream(clientIdArr)
+                .map(String::trim)  // 去除前后空格
+                .filter(s -> !s.isEmpty())  // 过滤空行
+                .distinct()  // 去重
+                .collect(Collectors.joining("\n"));  // 用换行符重新拼接
+        // 设置回原对象
+        rmDeploymentPolicy.setDeployDevice(distinctClientIds);
+
        return rmDeploymentPolicyMapper.insertRmDeploymentPolicy(rmDeploymentPolicy);
    }