romanov73/git-extractor
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

64-model-rule #65

Merged
romanov73 merged 2 commits from #64-model-rule into master 2022-10-13 15:34:05 +04:00
Conversation 0 Commits 2 Files Changed 4 +108 -31
4 changed files with 108 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1621e151d9 - Show all commits

23
src/main/java/ru/ulstu/extractor/model/AntecedentValue.java Normal file
View File

@ -0,0 +1,23 @@
package ru.ulstu.extractor.model;
import javax.persistence.Entity;
@Entity
public class AntecedentValue extends BaseEntity {
private String antecedentValue;
public AntecedentValue() {
}
public AntecedentValue(String antecedentValue) {
this.antecedentValue = antecedentValue;
}
public String getAntecedentValue() {
return antecedentValue;
}
public void setAntecedentValue(String antecedentValue) {
this.antecedentValue = antecedentValue;
}
}

68
src/main/java/ru/ulstu/extractor/model/Rule.java
View File

@ -1,67 +1,73 @@
package ru.ulstu.extractor.model;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
@Entity
public class Rule extends BaseEntity {
private String measure1;
@ManyToOne
private AntecedentValue firstAntecedentValue;
private String timeSeries1;
@ManyToOne
private TimeSeries firstAntecedent;
private String measure2;
@ManyToOne
private AntecedentValue secondAntecedentValue;
private String timeSeries2;
@ManyToOne
private TimeSeries secondAntecedent;
private String action;
private String consequent;
public Rule() {
}
public Rule(String measure1, String timeSeries1, String measure2, String timeSeries2, String action) {
this.measure1 = measure1;
this.timeSeries1 = timeSeries1;
this.measure2 = measure2;
this.timeSeries2 = timeSeries2;
this.action = action;
public Rule(Integer id, Integer version, AntecedentValue firstAntecedentValue, TimeSeries firstAntecedent, AntecedentValue secondAntecedentValue, TimeSeries secondAntecedent, String consequent) {
super(id, version);
this.firstAntecedentValue = firstAntecedentValue;
this.firstAntecedent = firstAntecedent;
this.secondAntecedentValue = secondAntecedentValue;
this.secondAntecedent = secondAntecedent;
this.consequent = consequent;
}
public String getMeasure1() {
return measure1;
public AntecedentValue getFirstValue() {
return firstAntecedentValue;
}
public String getTimeSeries1() {
return timeSeries1;
public void setFirstValue(AntecedentValue firstAntecedentValue) {
this.firstAntecedentValue = firstAntecedentValue;
}
public String getMeasure2() {
return measure2;
public TimeSeries getFirstAntecedent() {
return firstAntecedent;
}
public String getTimeSeries2() {
return timeSeries2;
public void setFirstAntecedent(TimeSeries firstAntecedent) {
this.firstAntecedent = firstAntecedent;
}
public void setMeasure1(String measure1) {
this.measure1 = measure1;
public AntecedentValue getSecondValue() {
return secondAntecedentValue;
}
public void setTimeSeries1(String timeSeries1) {
this.timeSeries1 = timeSeries1;
public void setSecondValue(AntecedentValue secondAntecedentValue) {
this.secondAntecedentValue = secondAntecedentValue;
}
public void setMeasure2(String measure2) {
this.measure2 = measure2;
public TimeSeries getSecondAntecedent() {
return secondAntecedent;
}
public void setTimeSeries2(String timeSeries2) {
this.timeSeries2 = timeSeries2;
public void setSecondAntecedent(TimeSeries secondAntecedent) {
this.secondAntecedent = secondAntecedent;
}
public String getAction() {
return action;
public String getConsequent() {
return consequent;
}
public void setAction(String action) {
this.action = action;
public void setConsequent(String consequent) {
this.consequent = consequent;
}
}

47
src/main/resources/db/changelog-20221012_170000-schema.xml Normal file
View File

@ -0,0 +1,47 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
<changeSet author="barmina" id="20221012-170000-1">
<createTable tableName="antecedent_value">
<column name="id" type="integer">
<constraints nullable="false"/>
</column>
<column name="version" type="integer"/>
<column name="antecedent_value" type="text">
<constraints nullable="false"/>
</column>
</createTable>
<addPrimaryKey columnNames="id" constraintName="pk_antecedent_value" tableName="antecedent_value"/>
<createTable tableName="rule">
<column name="id" type="integer">
<constraints nullable="false"/>
</column>
<column name="version" type="integer"/>
<column name="first_antecedent_value_id" type="integer"/>
<column name="first_antecedent_id" type="integer"/>
<column name="second_antecedent_value_id" type="integer"/>
<column name="second_antecedent_id" type="integer"/>
<column name="consequent" type="text">
<constraints nullable="false"/>
</column>
</createTable>
<addPrimaryKey columnNames="id" constraintName="pk_rule" tableName="rule"/>
<addForeignKeyConstraint baseTableName="rule" baseColumnNames="first_antecedent_value_id"
constraintName="fk_first_antecedent_value"
referencedTableName="antecedent_value"
referencedColumnNames="id"/>
<addForeignKeyConstraint baseTableName="rule" baseColumnNames="first_antecedent_id"
constraintName="fk_first_time_series"
referencedTableName="time_series"
referencedColumnNames="id"/>
<addForeignKeyConstraint baseTableName="rule" baseColumnNames="second_antecedent_value_id"
constraintName="fk_second_antecedent_value"
referencedTableName="antecedent_value"
referencedColumnNames="id"/>
<addForeignKeyConstraint baseTableName="rule" baseColumnNames="second_antecedent_id"
constraintName="fk_second_time_series"
referencedTableName="time_series"
referencedColumnNames="id"/>
</changeSet>
</databaseChangeLog>

1
src/main/resources/db/changelog-master.xml
View File

@ -14,4 +14,5 @@
<include file="db/changelog-20210412_100000-schema.xml"/>
<include file="db/changelog-20220422_120000-schema.xml"/>
<include file="db/changelog-20220621_120000-schema.xml"/>
<include file="db/changelog-20221012_170000-schema.xml"/>
</databaseChangeLog>