Commit 32204611 by 王衍超

修改代码;

parent 96d28b03
...@@ -159,6 +159,7 @@ public class BaseBusinessWarn { ...@@ -159,6 +159,7 @@ public class BaseBusinessWarn {
warnExeRecord.setMin(warnSetting.getMin()); warnExeRecord.setMin(warnSetting.getMin());
warnExeRecord.setMax(warnSetting.getMax()); warnExeRecord.setMax(warnSetting.getMax());
warnExeRecord.setWarnSettingId(warnSetting.getSettingId()); warnExeRecord.setWarnSettingId(warnSetting.getSettingId());
warnExeRecord.setBillType(warnSetting.getBillType());
warnExeRecord.setBillId(warnSetting.getBillId()); warnExeRecord.setBillId(warnSetting.getBillId());
warnExeRecord.setMemo(warnSetting.getMemo()); warnExeRecord.setMemo(warnSetting.getMemo());
return warnExeRecord; return warnExeRecord;
......
...@@ -19,8 +19,9 @@ public class WarnExeRecord { ...@@ -19,8 +19,9 @@ public class WarnExeRecord {
private UUID warnSettingId; private UUID warnSettingId;
private Integer warnState; private Integer warnState;
private UUID billId;
private String billType;
private UUID billId;
private String target; private String target;
private String max; private String max;
private String min; private String min;
...@@ -30,6 +31,12 @@ public class WarnExeRecord { ...@@ -30,6 +31,12 @@ public class WarnExeRecord {
public String getBillType() {
return billType;
}
public void setBillType(String billType) {
this.billType = billType;
}
public String getActualValue() { public String getActualValue() {
return actualValue; return actualValue;
} }
......
...@@ -34,6 +34,9 @@ ...@@ -34,6 +34,9 @@
<annotation id='ea154cb8-f939-4e9f-9793-9673d984161f' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd' name='length' value='100'></annotation> <annotation id='ea154cb8-f939-4e9f-9793-9673d984161f' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd' name='length' value='100'></annotation>
</attribute> </attribute>
<attribute id='cbb5b983-299b-4259-97d9-6470651bb18b' name='billType' columnName='bill_type' title='业务类型' type='string' default='' precision='' isArray='false'>
<annotation id='ea154cb8-f939-4e9f-9793-9673d984161f' attributeId='ffc0a199-4038-4ebf-a94f-a0f12bfc76dd' name='length' value='100'></annotation>
</attribute>
<attribute id='c4154a1b-f727-48cf-9ef0-ad1bee512504' name='billId' columnName='bill_id' title='业务ID' type='uuid' default='' precision='' isArray='false'> <attribute id='c4154a1b-f727-48cf-9ef0-ad1bee512504' name='billId' columnName='bill_id' title='业务ID' type='uuid' default='' precision='' isArray='false'>
<annotation id='00caecc1-35aa-4342-90c8-250f84609fe4' attributeId='55efd3f5-036a-4ac4-83c9-14e22cf5465a' name='length' value='undefined'></annotation> <annotation id='00caecc1-35aa-4342-90c8-250f84609fe4' attributeId='55efd3f5-036a-4ac4-83c9-14e22cf5465a' name='length' value='undefined'></annotation>
</attribute> </attribute>
......
...@@ -165,6 +165,29 @@ ...@@ -165,6 +165,29 @@
<m:attribute> <m:attribute>
<m:annotations> <m:annotations>
<m:annotation> <m:annotation>
<m:type>bcp.type.constraint.StringLength</m:type>
<m:value>100</m:value>
</m:annotation>
<m:annotation>
<m:type>javax.persistence.Column</m:type>
<m:properties>
<m:property>
<m:key>name</m:key>
<m:value>bill_type</m:value>
</m:property>
</m:properties>
</m:annotation>
</m:annotations>
<m:id>cbb5b983-299b-4259-97d9-6470651bb18b</m:id>
<m:name>billType</m:name>
<m:title>业务类型</m:title>
<m:type>string</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations>
<m:annotation>
<m:type>javax.persistence.Column</m:type> <m:type>javax.persistence.Column</m:type>
<m:properties> <m:properties>
<m:property> <m:property>
......
...@@ -35,6 +35,9 @@ ...@@ -35,6 +35,9 @@
<column name="memo" length="1000"></column> <column name="memo" length="1000"></column>
</property> </property>
<property name="billType" type="nstring" not-null="false">
<column name="bill_type" length="100"></column>
</property>
<property name="billId" type="uuid-binary" not-null="false"> <property name="billId" type="uuid-binary" not-null="false">
<column name="bill_id" length="16"></column> <column name="bill_id" length="16"></column>
</property> </property>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment