modify data item

PaasMonitor-common/src/main/java/com/nju/edu/paasMonitorCommon/enums/AlertItem.java

@@ -6,7 +6,8 @@ import java.util.Map;
 public enum AlertItem {
     TOTAL(0, "total"),
     FAIL_RATE(1, "fail rate"),
-    DURATION(2, "duration");
+    DURATION(2, "duration"),
+    VALUE(3, "value");
 
     int val;
     String description;

PaasMonitor-server/src/main/java/com/nju/edu/paasMonitorServer/alert/dao/ConfigDao.java

@@ -30,7 +30,7 @@ public class ConfigDao implements DaoBase<ConfigPO> {
         String sql = SqlBuilder.getBuilder()
                 .insertInto("alert_config")
                 .columns("type", "system_id", "category", "name", "alert_item", "alert_level",
-                        "duration", "frequency", "start_time", "end_time")
+                        "duration", "start_time", "end_time")
                 .build();
         jdbcTemplate.update(connection -> {
             PreparedStatement ps = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
@@ -41,9 +41,8 @@ public class ConfigDao implements DaoBase<ConfigPO> {
             ps.setInt(5, config.getAlertItem());
             ps.setInt(6, config.getAlertLevel());
             ps.setInt(7, config.getDuration());
-            ps.setInt(8, config.getFrequency());
-            ps.setInt(9, config.getStartTime());
-            ps.setInt(10, config.getEndTime());
+            ps.setInt(8, config.getStartTime());
+            ps.setInt(9, config.getEndTime());
             return ps;
         }, holder);
         return Objects.requireNonNull(holder.getKey()).longValue();
@@ -64,12 +63,12 @@ public class ConfigDao implements DaoBase<ConfigPO> {
         String sql = SqlBuilder.getBuilder()
                 .update("alert_config")
                 .set("type", "system_id", "category", "name", "alert_item", "alert_level",
-                        "duration", "frequency", "start_time", "end_time")
+                        "duration", "start_time", "end_time")
                 .where("id=?")
                 .build();
         Object[] args = new Object[]{
                 config.getType(), config.getSystemId(), config.getCategory(), config.getName(),
-                config.getAlertItem(), config.getAlertLevel(), config.getDuration(), config.getFrequency(),
+                config.getAlertItem(), config.getAlertLevel(), config.getDuration(),
                 config.getStartTime(), config.getEndTime(), config.getId()
         };
         jdbcTemplate.update(sql, args);

PaasMonitor-server/src/main/java/com/nju/edu/paasMonitorServer/alert/dao/SubConditionDao.java

@@ -23,11 +23,12 @@ public class SubConditionDao implements DaoBase<SubConditionPO> {
     public void addSubCondition(long cid, List<AddSubConditionVO> conditions) {
         String sql = SqlBuilder.getBuilder()
                 .insertInto("sub_condition")
-                .columns("cid", "type", "value")
+                .columns("cid", "type", "value", "frequency")
                 .build();
         for (AddSubConditionVO addSubConditionVO : conditions) {
             Object[] args = new Object[]{
-                    cid, addSubConditionVO.getType(), addSubConditionVO.getValue()
+                    cid, addSubConditionVO.getType(), addSubConditionVO.getValue(),
+                    addSubConditionVO.getFrequency()
             };
             jdbcTemplate.update(sql, args);
         }
@@ -58,11 +59,12 @@ public class SubConditionDao implements DaoBase<SubConditionPO> {
     public void updateSubCondition(SubCondition subCondition) {
         String sql = SqlBuilder.getBuilder()
                 .update("sub_condition")
-                .set("type", "value")
+                .set("type", "value", "frequency")
                 .where("id=?")
                 .build();
         Object[] args = new Object[]{
-                subCondition.getType(), subCondition.getValue(), subCondition.getId()
+                subCondition.getType(), subCondition.getValue(),
+                subCondition.getFrequency(), subCondition.getId(),
         };
         jdbcTemplate.update(sql, args);
     }

PaasMonitor-server/src/main/java/com/nju/edu/paasMonitorServer/alert/entity/po/ConfigPO.java

@@ -15,7 +15,6 @@ public class ConfigPO {
     int alertItem;
     int alertLevel;
     int duration;
-    int frequency;
     int startTime;
     int endTime;
 
@@ -23,6 +22,6 @@ public class ConfigPO {
 
     public Config toVO() {
         return new Config(id, type, systemId, category, name, alertItem,
-                alertLevel, duration, frequency, startTime, endTime, null);
+                alertLevel, duration, startTime, endTime, null);
     }
 }

PaasMonitor-server/src/main/java/com/nju/edu/paasMonitorServer/alert/entity/po/SubConditionPO.java

@@ -13,10 +13,12 @@ public class SubConditionPO {
     long cid;
     int type;
     BigDecimal value;
+    int frequency;
 
-    public SubConditionPO(){}
+    public SubConditionPO() {
+    }
 
     public SubCondition toVO() {
-        return new SubCondition(id, cid, type, value.doubleValue());
+        return new SubCondition(id, cid, type, value.doubleValue(), frequency);
     }
 }

PaasMonitor-server/src/main/java/com/nju/edu/paasMonitorServer/alert/entity/vo/AddConfigVO.java

@@ -17,7 +17,6 @@ public class AddConfigVO {
     int alertItem;
     int alertLevel;
     int duration;
-    int frequency;
     int startTime;
     int endTime;
     List<AddSubConditionVO> subConditions;

PaasMonitor-server/src/main/java/com/nju/edu/paasMonitorServer/alert/entity/vo/AddSubConditionVO.java

@@ -10,4 +10,5 @@ import lombok.ToString;
 public class AddSubConditionVO {
     int type;
     double value;
+    int frequency;
 }

PaasMonitor-server/src/main/java/com/nju/edu/paasMonitorServer/alert/entity/vo/Config.java

@@ -17,13 +17,12 @@ public class Config {
     int alertItem;
     int alertLevel;
     int duration;
-    int frequency;
     int startTime;
     int endTime;
     List<SubCondition> subConditions;
 
     public ConfigPO toPO() {
         return new ConfigPO(id, type, systemId, category, name, alertItem,
-                alertLevel, duration, frequency, startTime, endTime);
+                alertLevel, duration, startTime, endTime);
     }
 }

PaasMonitor-server/src/main/java/com/nju/edu/paasMonitorServer/alert/entity/vo/SubCondition.java

@@ -13,8 +13,9 @@ public class SubCondition {
     long cid;
     int type;
     double value;
+    int frequency;
 
     public SubConditionPO toPO() {
-        return new SubConditionPO(id, cid, type, new BigDecimal(value));
+        return new SubConditionPO(id, cid, type, new BigDecimal(value), frequency);
     }
 }

PaasMonitor-server/src/main/java/com/nju/edu/paasMonitorServer/alert/entity/vo/UpdateConfigVO.java

@@ -14,7 +14,6 @@ public class UpdateConfigVO {
     int alertItem;
     int alertLevel;
     int duration;
-    int frequency;
     int startTime;
     int endTime;
 }

PaasMonitor-server/src/main/java/com/nju/edu/paasMonitorServer/alert/process/watcher/Watcher.java

@@ -0,0 +1,4 @@
+package com.nju.edu.paasMonitorServer.alert.process.watcher;
+
+public class Watcher {
+}

PaasMonitor-server/src/main/java/com/nju/edu/paasMonitorServer/alert/service/impl/ConfigServiceImpl.java

@@ -36,7 +36,7 @@ public class ConfigServiceImpl implements ConfigService {
                 .collect(Collectors.toList());
         return new Config(cid, config.getType(), config.getSystemId(), config.getCategory(),
                 config.getName(), config.getAlertItem(), config.getAlertLevel(), config.getDuration(),
-                config.getFrequency(), config.getStartTime(), config.getEndTime(), subConditions);
+                config.getStartTime(), config.getEndTime(), subConditions);
     }
 
     @Override

PaasMonitor-server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -40,6 +40,7 @@ D:\SEEC\PaasMonitor\PaasMonitor-server\src\main\java\com\nju\edu\paasMonitorServ
 D:\SEEC\PaasMonitor\PaasMonitor-server\src\main\java\com\nju\edu\paasMonitorServer\entity\po\ReportPO.java
 D:\SEEC\PaasMonitor\PaasMonitor-server\src\main\java\com\nju\edu\paasMonitorServer\alert\entity\vo\AddConfigVO.java
 D:\SEEC\PaasMonitor\PaasMonitor-server\src\main\java\com\nju\edu\paasMonitorServer\service\MessageService.java
+D:\SEEC\PaasMonitor\PaasMonitor-server\src\main\java\com\nju\edu\paasMonitorServer\alert\process\watcher\Watcher.java
 D:\SEEC\PaasMonitor\PaasMonitor-server\src\main\java\com\nju\edu\paasMonitorServer\entity\vo\item\event\EventSystemLevel.java
 D:\SEEC\PaasMonitor\PaasMonitor-server\src\main\java\com\nju\edu\paasMonitorServer\dao\MetricDao.java
 D:\SEEC\PaasMonitor\PaasMonitor-server\src\main\java\com\nju\edu\paasMonitorServer\alert\entity\vo\UpdateConfigVO.java

sql/paasMonitor.sql

@@ -70,10 +70,9 @@ CREATE TABLE `alert_config`
     `name`        VARCHAR(50)         NOT NULL,
     `alert_item`  TINYINT(4)          NOT NULL,
     `alert_level` TINYINT(4) UNSIGNED NOT NULL,
-    `duration`    INT(4) UNSIGNED NOT NULL,
-    `frequency`   INT(4) UNSIGNED NOT NULL,
-    `start_time`  INT(4) UNSIGNED NOT NULL,
-    `end_time`    INT(4) UNSIGNED NOT NULL,
+    `duration`    INT(4) UNSIGNED     NOT NULL,
+    `start_time`  INT(4) UNSIGNED     NOT NULL,
+    `end_time`    INT(4) UNSIGNED     NOT NULL,
     INDEX `idx_alert_call_sid_c_n` (`type`, `system_id`, `category`, `name`)
 ) ENGINE = innoDB
   DEFAULT CHARSET = utf8mb4;
@@ -81,10 +80,11 @@ CREATE TABLE `alert_config`
 DROP TABLE IF EXISTS `sub_condition`;
 CREATE TABLE `sub_condition`
 (
-    `id`    BIGINT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY,
-    `cid`   BIGINT(10) UNSIGNED NOT NULL,
-    `type`  TINYINT(4) UNSIGNED NOT NULL,
-    `value` DECIMAL(10, 2)      NOT NULL,
+    `id`        BIGINT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY,
+    `cid`       BIGINT(10) UNSIGNED NOT NULL,
+    `type`      TINYINT(4) UNSIGNED NOT NULL,
+    `value`     DECIMAL(10, 2)      NOT NULL,
+    `frequency` INT(4)              NOT NULL DEFAULT 0,
     INDEX `idx_sc_cid` (`cid`)
 ) ENGINE = innoDB
   DEFAULT CHARSET = utf8mb4;