diff --git a/.gitignore b/.gitignore index 617967e..ff2141e 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ webapp/node_modules/ .settings .classpath .factorypath +/radar-kafka-demo/target/ diff --git a/radar-dal/src/main/java/com/pgmmers/radar/vo/model/RuleVO.java b/radar-dal/src/main/java/com/pgmmers/radar/vo/model/RuleVO.java index 40a561a..736ec17 100644 --- a/radar-dal/src/main/java/com/pgmmers/radar/vo/model/RuleVO.java +++ b/radar-dal/src/main/java/com/pgmmers/radar/vo/model/RuleVO.java @@ -46,6 +46,11 @@ public class RuleVO implements Serializable{ private Integer rate; + /** + * 最大得分值. + */ + private Integer max; + @JsonProperty private JsonNode ruleDefinition; @@ -197,6 +202,12 @@ public class RuleVO implements Serializable{ public void setLabel(String label) { this.label = label; } - - + + public Integer getMax() { + return max; + } + + public void setMax(Integer max) { + this.max = max; + } } diff --git a/radar-dao/pom.xml b/radar-dao/pom.xml index 52b08e6..54ae187 100644 --- a/radar-dao/pom.xml +++ b/radar-dao/pom.xml @@ -44,7 +44,7 @@ org.mybatis.generator mybatis-generator-maven-plugin - 1.3.6 + 1.3.7 ${basedir}/src/main/resources/generator/generatorConfig.xml diff --git a/radar-dao/src/main/java/com/pgmmers/radar/model/PreItemPO.java b/radar-dao/src/main/java/com/pgmmers/radar/model/PreItemPO.java index e5c9186..23251d9 100644 --- a/radar-dao/src/main/java/com/pgmmers/radar/model/PreItemPO.java +++ b/radar-dao/src/main/java/com/pgmmers/radar/model/PreItemPO.java @@ -49,6 +49,9 @@ public class PreItemPO { @Column(name = "PLUGIN") private String plugin; + /** + * 响应字段配置信息 + */ @Column(name = "CONFIG_JSON") private String configJson; @@ -204,14 +207,18 @@ public class PreItemPO { } /** - * @return CONFIG_JSON + * 获取响应字段配置信息 + * + * @return CONFIG_JSON - 响应字段配置信息 */ public String getConfigJson() { return configJson; } /** - * @param configJson + * 设置响应字段配置信息 + * + * @param configJson 响应字段配置信息 */ public void setConfigJson(String configJson) { this.configJson = configJson; diff --git a/radar-dao/src/main/java/com/pgmmers/radar/model/RulePO.java b/radar-dao/src/main/java/com/pgmmers/radar/model/RulePO.java index 12f3ed1..3cc187d 100644 --- a/radar-dao/src/main/java/com/pgmmers/radar/model/RulePO.java +++ b/radar-dao/src/main/java/com/pgmmers/radar/model/RulePO.java @@ -70,6 +70,12 @@ public class RulePO { @Column(name = "RATE") private Integer rate; + /** + * 最大值 + */ + @Column(name = "MAX") + private Integer max; + /** * 状态 */ @@ -279,6 +285,24 @@ public class RulePO { this.rate = rate; } + /** + * 获取最大值 + * + * @return MAX - 最大值 + */ + public Integer getMax() { + return max; + } + + /** + * 设置最大值 + * + * @param max 最大值 + */ + public void setMax(Integer max) { + this.max = max; + } + /** * 获取状态 * diff --git a/radar-dao/src/main/java/com/pgmmers/radar/model/UserPO.java b/radar-dao/src/main/java/com/pgmmers/radar/model/UserPO.java index 0c004f8..e0d5892 100644 --- a/radar-dao/src/main/java/com/pgmmers/radar/model/UserPO.java +++ b/radar-dao/src/main/java/com/pgmmers/radar/model/UserPO.java @@ -5,6 +5,9 @@ import javax.persistence.*; @Table(name = "users") public class UserPO { + /** + * 主键 + */ @Id @Column(name = "ID") @GeneratedValue(generator = "JDBC") @@ -41,14 +44,18 @@ public class UserPO { private Date updateTime; /** - * @return ID + * 获取主键 + * + * @return ID - 主键 */ public Long getId() { return id; } /** - * @param id + * 设置主键 + * + * @param id 主键 */ public void setId(Long id) { this.id = id; diff --git a/radar-dao/src/main/resources/config.properties b/radar-dao/src/main/resources/config.properties index 084b976..f2c529b 100644 --- a/radar-dao/src/main/resources/config.properties +++ b/radar-dao/src/main/resources/config.properties @@ -1,4 +1,4 @@ -jdbc.driverClass=com.mysql.jdbc.Driver +jdbc.driverClass=com.mysql.cj.jdbc.Driver jdbc.url=jdbc:mysql://localhost:3306/radar?characterEncoding=UTF-8&useSSL=false jdbc.user=root jdbc.password=456132 \ No newline at end of file diff --git a/radar-dao/src/main/resources/generator/generatorConfig.xml b/radar-dao/src/main/resources/generator/generatorConfig.xml index fd5230b..97902b9 100644 --- a/radar-dao/src/main/resources/generator/generatorConfig.xml +++ b/radar-dao/src/main/resources/generator/generatorConfig.xml @@ -25,6 +25,8 @@ connectionURL="${jdbc.url}" userId="${jdbc.user}" password="${jdbc.password}"> + + - +
diff --git a/radar-dao/src/main/resources/mapping/RuleMapper.xml b/radar-dao/src/main/resources/mapping/RuleMapper.xml index e380db2..c36f438 100644 --- a/radar-dao/src/main/resources/mapping/RuleMapper.xml +++ b/radar-dao/src/main/resources/mapping/RuleMapper.xml @@ -16,6 +16,7 @@ + diff --git a/sql/radar-1.0.8.sql b/sql/radar-1.0.8.sql new file mode 100644 index 0000000..205e142 --- /dev/null +++ b/sql/radar-1.0.8.sql @@ -0,0 +1,2 @@ +ALTER TABLE `engine_rule` + ADD COLUMN `MAX` int(11) NOT NULL DEFAULT 0 COMMENT '最大得分值' AFTER `RATE`; \ No newline at end of file