管道灾源

generated/com/miniframe/generate/comm/system/A_D00004.java

@@ -22,18 +22,18 @@ public class A_D00004 extends BaseMapModel implements Serializable {
 	public int getPid() {
 		return this.pid;
 	}
-	String sType;//灾情源类型
+	String stype;//灾情源类型
 	/**
 	 *灾情源类型
 	 */
-	public void setSType(String sType) {
-		this.sType=sType;
+	public void setStype(String stype) {
+		this.stype=stype;
 	}
 	/**
 	 *灾情源类型
 	 */
-	public String getSType() {
-		return this.sType;
+	public String getStype() {
+		return this.stype;
 	}
 	int aid;//事故id
 	/**

generated/com/miniframe/generate/comm/system/D_D00000_ROWS_RECODE.java

@@ -87,95 +87,17 @@ public class D_D00000_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getDesc() {
 		return this.desc;
 	}
-	String waterlevel;//水位
+	String ntype;//类型
 	/**
-	 *水位
+	 *类型
 	 */
-	public void setWaterlevel(String waterlevel) {
-		this.waterlevel=waterlevel;
+	public void setNtype(String ntype) {
+		this.ntype=ntype;
 	}
 	/**
-	 *水位
+	 *类型
 	 */
-	public String getWaterlevel() {
-		return this.waterlevel;
-	}
-	String so2;//二氧化硫浓度
-	/**
-	 *二氧化硫浓度
-	 */
-	public void setSo2(String so2) {
-		this.so2=so2;
-	}
-	/**
-	 *二氧化硫浓度
-	 */
-	public String getSo2() {
-		return this.so2;
-	}
-	String co2;//二氧化碳浓度
-	/**
-	 *二氧化碳浓度
-	 */
-	public void setCo2(String co2) {
-		this.co2=co2;
-	}
-	/**
-	 *二氧化碳浓度
-	 */
-	public String getCo2() {
-		return this.co2;
-	}
-	String temperature;//温度
-	/**
-	 *温度
-	 */
-	public void setTemperature(String temperature) {
-		this.temperature=temperature;
-	}
-	/**
-	 *温度
-	 */
-	public String getTemperature() {
-		return this.temperature;
-	}
-	String scalar1;//标量1
-	/**
-	 *标量1
-	 */
-	public void setScalar1(String scalar1) {
-		this.scalar1=scalar1;
-	}
-	/**
-	 *标量1
-	 */
-	public String getScalar1() {
-		return this.scalar1;
-	}
-	String scalar2;//标量2
-	/**
-	 *标量2
-	 */
-	public void setScalar2(String scalar2) {
-		this.scalar2=scalar2;
-	}
-	/**
-	 *标量2
-	 */
-	public String getScalar2() {
-		return this.scalar2;
-	}
-	String scalar3;//标量3
-	/**
-	 *标量3
-	 */
-	public void setScalar3(String scalar3) {
-		this.scalar3=scalar3;
-	}
-	/**
-	 *标量3
-	 */
-	public String getScalar3() {
-		return this.scalar3;
+	public String getNtype() {
+		return this.ntype;
 	}
 }

generated/validateform/a_d00004Form.xml

@@ -7,8 +7,8 @@
 <field property="pid" depends="required">
     <arg0 key="a_d00004.pid"/>
 </field>
-<field property="sType" depends="minlength,maxlength">
-    <arg0 key="a_d00004.sType"/>
+<field property="stype" depends="minlength,maxlength">
+    <arg0 key="a_d00004.stype"/>
     <arg1 name="minlength" key="${var:minlength}"/>
     <var>
       <var-name>minlength</var-name>

generated/validateform/d_d00000_rows_recodeForm.xml

@@ -69,86 +69,8 @@
       <var-value>128</var-value>
     </var>
 </field>
-<field property="waterlevel" depends="minlength,maxlength">
-    <arg0 key="d_d00000_rows_recode.waterlevel"/>
-    <arg1 name="minlength" key="${var:minlength}"/>
-    <var>
-      <var-name>minlength</var-name>
-      <var-value>1</var-value>
-    </var>
-    <arg1 name="maxlength" key="${var:maxlength}"/>
-    <var>
-      <var-name>maxlength</var-name>
-      <var-value>128</var-value>
-    </var>
-</field>
-<field property="so2" depends="minlength,maxlength">
-    <arg0 key="d_d00000_rows_recode.so2"/>
-    <arg1 name="minlength" key="${var:minlength}"/>
-    <var>
-      <var-name>minlength</var-name>
-      <var-value>1</var-value>
-    </var>
-    <arg1 name="maxlength" key="${var:maxlength}"/>
-    <var>
-      <var-name>maxlength</var-name>
-      <var-value>128</var-value>
-    </var>
-</field>
-<field property="co2" depends="minlength,maxlength">
-    <arg0 key="d_d00000_rows_recode.co2"/>
-    <arg1 name="minlength" key="${var:minlength}"/>
-    <var>
-      <var-name>minlength</var-name>
-      <var-value>1</var-value>
-    </var>
-    <arg1 name="maxlength" key="${var:maxlength}"/>
-    <var>
-      <var-name>maxlength</var-name>
-      <var-value>128</var-value>
-    </var>
-</field>
-<field property="temperature" depends="minlength,maxlength">
-    <arg0 key="d_d00000_rows_recode.temperature"/>
-    <arg1 name="minlength" key="${var:minlength}"/>
-    <var>
-      <var-name>minlength</var-name>
-      <var-value>1</var-value>
-    </var>
-    <arg1 name="maxlength" key="${var:maxlength}"/>
-    <var>
-      <var-name>maxlength</var-name>
-      <var-value>128</var-value>
-    </var>
-</field>
-<field property="scalar1" depends="minlength,maxlength">
-    <arg0 key="d_d00000_rows_recode.scalar1"/>
-    <arg1 name="minlength" key="${var:minlength}"/>
-    <var>
-      <var-name>minlength</var-name>
-      <var-value>1</var-value>
-    </var>
-    <arg1 name="maxlength" key="${var:maxlength}"/>
-    <var>
-      <var-name>maxlength</var-name>
-      <var-value>128</var-value>
-    </var>
-</field>
-<field property="scalar2" depends="minlength,maxlength">
-    <arg0 key="d_d00000_rows_recode.scalar2"/>
-    <arg1 name="minlength" key="${var:minlength}"/>
-    <var>
-      <var-name>minlength</var-name>
-      <var-value>1</var-value>
-    </var>
-    <arg1 name="maxlength" key="${var:maxlength}"/>
-    <var>
-      <var-name>maxlength</var-name>
-      <var-value>128</var-value>
-    </var>
-</field>
-<field property="scalar3" depends="minlength,maxlength">
-    <arg0 key="d_d00000_rows_recode.scalar3"/>
+<field property="ntype" depends="minlength,maxlength">
+    <arg0 key="d_d00000_rows_recode.ntype"/>
     <arg1 name="minlength" key="${var:minlength}"/>
     <var>
       <var-name>minlength</var-name>

generated/validator/resources_a_d00004Form_validator.properties

@@ -1,5 +1,5 @@
 a_d00004.pid = \u7BA1\u9053id
-a_d00004.sType = \u707E\u60C5\u6E90\u7C7B\u578B
+a_d00004.stype = \u707E\u60C5\u6E90\u7C7B\u578B
 a_d00004.aid = \u4E8B\u6545id
 a_d00004.site = \u4F4D\u7F6E
 a_d00004Form = true

generated/validator/resources_a_d00004Form_validator_zh_CN.properties

@@ -1,5 +1,5 @@
 a_d00004.pid = \u7BA1\u9053id
-a_d00004.sType = \u707E\u60C5\u6E90\u7C7B\u578B
+a_d00004.stype = \u707E\u60C5\u6E90\u7C7B\u578B
 a_d00004.aid = \u4E8B\u6545id
 a_d00004.site = \u4F4D\u7F6E
 a_d00004Form = true

generated/validator/resources_d_d00000_rows_recodeForm_validator.properties

@@ -4,11 +4,5 @@ d_d00000_rows_recode.x = x
 d_d00000_rows_recode.y = y
 d_d00000_rows_recode.z = z
 d_d00000_rows_recode.desc = \u63CF\u8FF0
-d_d00000_rows_recode.waterlevel = \u6C34\u4F4D
-d_d00000_rows_recode.so2 = \u4E8C\u6C27\u5316\u786B\u6D53\u5EA6
-d_d00000_rows_recode.co2 = \u4E8C\u6C27\u5316\u78B3\u6D53\u5EA6
-d_d00000_rows_recode.temperature = \u6E29\u5EA6
-d_d00000_rows_recode.scalar1 = \u6807\u91CF1
-d_d00000_rows_recode.scalar2 = \u6807\u91CF2
-d_d00000_rows_recode.scalar3 = \u6807\u91CF3
+d_d00000_rows_recode.ntype = \u7C7B\u578B
 d_d00000_rows_recodeForm = true

generated/validator/resources_d_d00000_rows_recodeForm_validator_zh_CN.properties

@@ -4,11 +4,5 @@ d_d00000_rows_recode.x = x
 d_d00000_rows_recode.y = y
 d_d00000_rows_recode.z = z
 d_d00000_rows_recode.desc = \u63CF\u8FF0
-d_d00000_rows_recode.waterlevel = \u6C34\u4F4D
-d_d00000_rows_recode.so2 = \u4E8C\u6C27\u5316\u786B\u6D53\u5EA6
-d_d00000_rows_recode.co2 = \u4E8C\u6C27\u5316\u78B3\u6D53\u5EA6
-d_d00000_rows_recode.temperature = \u6E29\u5EA6
-d_d00000_rows_recode.scalar1 = \u6807\u91CF1
-d_d00000_rows_recode.scalar2 = \u6807\u91CF2
-d_d00000_rows_recode.scalar3 = \u6807\u91CF3
+d_d00000_rows_recode.ntype = \u7C7B\u578B
 d_d00000_rows_recodeForm = true

modelsrc/com/miniframe/model/system/DNode.java

@@ -20,23 +20,6 @@ public class DNode extends MiniserviceBaseModel implements Serializable {
     @Column(name = "n_desc")
     private String nDesc;
 
-    /**
-     * 水位
-     */
-    private Float waterlevel;
-
-    private Float so2;
-
-    private Float co2;
-
-    private Float temperature;
-
-    private Float scalar1;
-
-    private Float scalar2;
-
-    private Float scalar3;
-
     /**
      * 节点类型
      */
@@ -128,108 +111,6 @@ public class DNode extends MiniserviceBaseModel implements Serializable {
         this.nDesc = nDesc == null ? null : nDesc.trim();
     }
 
-    /**
-     * 获取水位
-     *
-     * @return waterlevel - 水位
-     */
-    public Float getWaterlevel() {
-        return waterlevel;
-    }
-
-    /**
-     * 设置水位
-     *
-     * @param waterlevel 水位
-     */
-    public void setWaterlevel(Float waterlevel) {
-        this.waterlevel = waterlevel;
-    }
-
-    /**
-     * @return so2
-     */
-    public Float getSo2() {
-        return so2;
-    }
-
-    /**
-     * @param so2
-     */
-    public void setSo2(Float so2) {
-        this.so2 = so2;
-    }
-
-    /**
-     * @return co2
-     */
-    public Float getCo2() {
-        return co2;
-    }
-
-    /**
-     * @param co2
-     */
-    public void setCo2(Float co2) {
-        this.co2 = co2;
-    }
-
-    /**
-     * @return temperature
-     */
-    public Float getTemperature() {
-        return temperature;
-    }
-
-    /**
-     * @param temperature
-     */
-    public void setTemperature(Float temperature) {
-        this.temperature = temperature;
-    }
-
-    /**
-     * @return scalar1
-     */
-    public Float getScalar1() {
-        return scalar1;
-    }
-
-    /**
-     * @param scalar1
-     */
-    public void setScalar1(Float scalar1) {
-        this.scalar1 = scalar1;
-    }
-
-    /**
-     * @return scalar2
-     */
-    public Float getScalar2() {
-        return scalar2;
-    }
-
-    /**
-     * @param scalar2
-     */
-    public void setScalar2(Float scalar2) {
-        this.scalar2 = scalar2;
-    }
-
-    /**
-     * @return scalar3
-     */
-    public Float getScalar3() {
-        return scalar3;
-    }
-
-    /**
-     * @param scalar3
-     */
-    public void setScalar3(Float scalar3) {
-        this.scalar3 = scalar3;
-    }
-
     /**
      * 获取节点类型
      *

modelsrc/com/miniframe/model/system/DNodeSQLBuilder.java

@@ -484,426 +484,6 @@ public class DNodeSQLBuilder {
             return (Criteria) this;
         }
 
-        public Criteria andWaterlevelIsNull() {
-            addCriterion("waterlevel is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andWaterlevelIsNotNull() {
-            addCriterion("waterlevel is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andWaterlevelEqualTo(Float value) {
-            addCriterion("waterlevel =", value, "waterlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andWaterlevelNotEqualTo(Float value) {
-            addCriterion("waterlevel <>", value, "waterlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andWaterlevelGreaterThan(Float value) {
-            addCriterion("waterlevel >", value, "waterlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andWaterlevelGreaterThanOrEqualTo(Float value) {
-            addCriterion("waterlevel >=", value, "waterlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andWaterlevelLessThan(Float value) {
-            addCriterion("waterlevel <", value, "waterlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andWaterlevelLessThanOrEqualTo(Float value) {
-            addCriterion("waterlevel <=", value, "waterlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andWaterlevelIn(List<Float> values) {
-            addCriterion("waterlevel in", values, "waterlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andWaterlevelNotIn(List<Float> values) {
-            addCriterion("waterlevel not in", values, "waterlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andWaterlevelBetween(Float value1, Float value2) {
-            addCriterion("waterlevel between", value1, value2, "waterlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andWaterlevelNotBetween(Float value1, Float value2) {
-            addCriterion("waterlevel not between", value1, value2, "waterlevel");
-            return (Criteria) this;
-        }
-
-        public Criteria andSo2IsNull() {
-            addCriterion("so2 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSo2IsNotNull() {
-            addCriterion("so2 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSo2EqualTo(Float value) {
-            addCriterion("so2 =", value, "so2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSo2NotEqualTo(Float value) {
-            addCriterion("so2 <>", value, "so2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSo2GreaterThan(Float value) {
-            addCriterion("so2 >", value, "so2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSo2GreaterThanOrEqualTo(Float value) {
-            addCriterion("so2 >=", value, "so2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSo2LessThan(Float value) {
-            addCriterion("so2 <", value, "so2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSo2LessThanOrEqualTo(Float value) {
-            addCriterion("so2 <=", value, "so2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSo2In(List<Float> values) {
-            addCriterion("so2 in", values, "so2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSo2NotIn(List<Float> values) {
-            addCriterion("so2 not in", values, "so2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSo2Between(Float value1, Float value2) {
-            addCriterion("so2 between", value1, value2, "so2");
-            return (Criteria) this;
-        }
-
-        public Criteria andSo2NotBetween(Float value1, Float value2) {
-            addCriterion("so2 not between", value1, value2, "so2");
-            return (Criteria) this;
-        }
-
-        public Criteria andCo2IsNull() {
-            addCriterion("co2 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCo2IsNotNull() {
-            addCriterion("co2 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCo2EqualTo(Float value) {
-            addCriterion("co2 =", value, "co2");
-            return (Criteria) this;
-        }
-
-        public Criteria andCo2NotEqualTo(Float value) {
-            addCriterion("co2 <>", value, "co2");
-            return (Criteria) this;
-        }
-
-        public Criteria andCo2GreaterThan(Float value) {
-            addCriterion("co2 >", value, "co2");
-            return (Criteria) this;
-        }
-
-        public Criteria andCo2GreaterThanOrEqualTo(Float value) {
-            addCriterion("co2 >=", value, "co2");
-            return (Criteria) this;
-        }
-
-        public Criteria andCo2LessThan(Float value) {
-            addCriterion("co2 <", value, "co2");
-            return (Criteria) this;
-        }
-
-        public Criteria andCo2LessThanOrEqualTo(Float value) {
-            addCriterion("co2 <=", value, "co2");
-            return (Criteria) this;
-        }
-
-        public Criteria andCo2In(List<Float> values) {
-            addCriterion("co2 in", values, "co2");
-            return (Criteria) this;
-        }
-
-        public Criteria andCo2NotIn(List<Float> values) {
-            addCriterion("co2 not in", values, "co2");
-            return (Criteria) this;
-        }
-
-        public Criteria andCo2Between(Float value1, Float value2) {
-            addCriterion("co2 between", value1, value2, "co2");
-            return (Criteria) this;
-        }
-
-        public Criteria andCo2NotBetween(Float value1, Float value2) {
-            addCriterion("co2 not between", value1, value2, "co2");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureIsNull() {
-            addCriterion("temperature is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureIsNotNull() {
-            addCriterion("temperature is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureEqualTo(Float value) {
-            addCriterion("temperature =", value, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureNotEqualTo(Float value) {
-            addCriterion("temperature <>", value, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureGreaterThan(Float value) {
-            addCriterion("temperature >", value, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureGreaterThanOrEqualTo(Float value) {
-            addCriterion("temperature >=", value, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureLessThan(Float value) {
-            addCriterion("temperature <", value, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureLessThanOrEqualTo(Float value) {
-            addCriterion("temperature <=", value, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureIn(List<Float> values) {
-            addCriterion("temperature in", values, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureNotIn(List<Float> values) {
-            addCriterion("temperature not in", values, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureBetween(Float value1, Float value2) {
-            addCriterion("temperature between", value1, value2, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andTemperatureNotBetween(Float value1, Float value2) {
-            addCriterion("temperature not between", value1, value2, "temperature");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar1IsNull() {
-            addCriterion("scalar1 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar1IsNotNull() {
-            addCriterion("scalar1 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar1EqualTo(Float value) {
-            addCriterion("scalar1 =", value, "scalar1");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar1NotEqualTo(Float value) {
-            addCriterion("scalar1 <>", value, "scalar1");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar1GreaterThan(Float value) {
-            addCriterion("scalar1 >", value, "scalar1");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar1GreaterThanOrEqualTo(Float value) {
-            addCriterion("scalar1 >=", value, "scalar1");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar1LessThan(Float value) {
-            addCriterion("scalar1 <", value, "scalar1");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar1LessThanOrEqualTo(Float value) {
-            addCriterion("scalar1 <=", value, "scalar1");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar1In(List<Float> values) {
-            addCriterion("scalar1 in", values, "scalar1");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar1NotIn(List<Float> values) {
-            addCriterion("scalar1 not in", values, "scalar1");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar1Between(Float value1, Float value2) {
-            addCriterion("scalar1 between", value1, value2, "scalar1");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar1NotBetween(Float value1, Float value2) {
-            addCriterion("scalar1 not between", value1, value2, "scalar1");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar2IsNull() {
-            addCriterion("scalar2 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar2IsNotNull() {
-            addCriterion("scalar2 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar2EqualTo(Float value) {
-            addCriterion("scalar2 =", value, "scalar2");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar2NotEqualTo(Float value) {
-            addCriterion("scalar2 <>", value, "scalar2");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar2GreaterThan(Float value) {
-            addCriterion("scalar2 >", value, "scalar2");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar2GreaterThanOrEqualTo(Float value) {
-            addCriterion("scalar2 >=", value, "scalar2");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar2LessThan(Float value) {
-            addCriterion("scalar2 <", value, "scalar2");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar2LessThanOrEqualTo(Float value) {
-            addCriterion("scalar2 <=", value, "scalar2");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar2In(List<Float> values) {
-            addCriterion("scalar2 in", values, "scalar2");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar2NotIn(List<Float> values) {
-            addCriterion("scalar2 not in", values, "scalar2");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar2Between(Float value1, Float value2) {
-            addCriterion("scalar2 between", value1, value2, "scalar2");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar2NotBetween(Float value1, Float value2) {
-            addCriterion("scalar2 not between", value1, value2, "scalar2");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar3IsNull() {
-            addCriterion("scalar3 is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar3IsNotNull() {
-            addCriterion("scalar3 is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar3EqualTo(Float value) {
-            addCriterion("scalar3 =", value, "scalar3");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar3NotEqualTo(Float value) {
-            addCriterion("scalar3 <>", value, "scalar3");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar3GreaterThan(Float value) {
-            addCriterion("scalar3 >", value, "scalar3");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar3GreaterThanOrEqualTo(Float value) {
-            addCriterion("scalar3 >=", value, "scalar3");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar3LessThan(Float value) {
-            addCriterion("scalar3 <", value, "scalar3");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar3LessThanOrEqualTo(Float value) {
-            addCriterion("scalar3 <=", value, "scalar3");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar3In(List<Float> values) {
-            addCriterion("scalar3 in", values, "scalar3");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar3NotIn(List<Float> values) {
-            addCriterion("scalar3 not in", values, "scalar3");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar3Between(Float value1, Float value2) {
-            addCriterion("scalar3 between", value1, value2, "scalar3");
-            return (Criteria) this;
-        }
-
-        public Criteria andScalar3NotBetween(Float value1, Float value2) {
-            addCriterion("scalar3 not between", value1, value2, "scalar3");
-            return (Criteria) this;
-        }
-
         public Criteria andNtypeIsNull() {
             addCriterion("ntype is null");
             return (Criteria) this;

modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml

@@ -5,7 +5,7 @@
     This file is generated by MyBatis Generator.
     This file is the shell of a Mapper Config file - in many cases you will need to add
       to this file before it is usable by MyBatis.
-    This file was generated on Tue Jan 16 09:55:23 CST 2024.
+    This file was generated on Tue Jan 16 16:31:40 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />
@@ -26,5 +26,6 @@
     <mapper resource="com/miniframe/model/system/xml/DSourceValMapper.xml" />
     <mapper resource="com/miniframe/model/system/xml/DAccidentMapper.xml" />
     <mapper resource="com/miniframe/model/system/xml/DBoundaryMapper.xml" />
+    <mapper resource="com/miniframe/model/system/xml/DNodeValMapper.xml" />
   </mappers>
 </configuration>

src/main/java/com/miniframe/bisiness/system/D00000Service.java

@@ -43,26 +43,20 @@ public class D00000Service extends D00000BaseModel implements ExecProcessFlow {
 		for (DNode  dNode: list) {
 			D_D00000_ROWS_RECODE  row = new D_D00000_ROWS_RECODE();
 			row.setId(dNode.getId());
-			row.setCo2(String.valueOf(dNode.getCo2()));
 			row.setDesc(dNode.getnDesc());
-			row.setScalar1(String.valueOf(dNode.getScalar1()));
-			row.setScalar2(String.valueOf(dNode.getScalar3()));
-			row.setScalar3(String.valueOf(dNode.getScalar3()));
-			row.setSo2(String.valueOf(dNode.getSo2()));
 			row.setName(dNode.getName());
 			row.setX(String.valueOf(dNode.getX()));
 			row.setY(String.valueOf(dNode.getY()));
 			row.setZ(String.valueOf(dNode.getZ()));
-			row.setTemperature(String.valueOf(dNode.getTemperature()));
-			row.setWaterlevel(String.valueOf(dNode.getWaterlevel()));
+			row.setNtype(dNode.getNtype());
 			rows.add(row);
-
 		}
 		this.getD_d00000().setRows(rows);
 		this.getD_d00000().setTotal(count.intValue());
 	}
 	
 	/**
+	 *
 	 * 基础系统,“节点数据查询”业务前处理
  	 */
 	public void preTransFlow() throws Exception {

src/main/java/com/miniframe/bisiness/system/D00002Service.java

@@ -6,6 +6,7 @@ import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.system.model.D00002BaseModel;
 import com.miniframe.model.system.DAccident;
 import com.miniframe.model.system.dao.DAccidentMapper;
+import com.miniframe.model.system.dao.DNodeMapper;
 
 /**
  * 基础系统,“事故数据添加”逻辑处理（重新生成不覆盖）。
@@ -25,6 +26,9 @@ public class D00002Service extends D00002BaseModel implements ExecProcessFlow {
 		da.setSource(this.getA_d00002().getSource());
 		da.setType(this.getA_d00002().getType());
 		projectDao.insertSelective(da);
+
+		//初始化 NodeVal
+		DNodeMapper dnm = UtilTools.getBean(DNodeMapper.class);
 	}
 	
 	/**

src/main/java/com/miniframe/bisiness/system/D00004Service.java

@@ -52,7 +52,7 @@ public class D00004Service extends D00004BaseModel implements ExecProcessFlow {
 		ds.setAid(aid);
 		ds.setPid(pid);
 		ds.setPname(dp.getName());
-		ds.setsType(this.getA_d00004().getSType());
+		ds.setsType(this.getA_d00004().getStype());
 		dsm.insertSelective(ds);
 	}
 	

src/main/java/com/miniframe/template/FireInitVo.java

@@ -0,0 +1,39 @@
+package com.miniframe.template;
+
+import com.miniframe.model.system.DNodeVal;
+import com.miniframe.model.system.DSource;
+import com.miniframe.model.system.DSourceVal;
+
+import java.util.List;
+import java.util.Map;
+
+public class FireInitVo {
+
+    public List<DNodeVal> nodeVals;
+    public List<DSource>  dSources;
+    public Map<Integer, DSourceVal> dSourceValMap;
+
+    public List<DNodeVal> getNodeVals() {
+        return nodeVals;
+    }
+
+    public void setNodeVals(List<DNodeVal> nodeVals) {
+        this.nodeVals = nodeVals;
+    }
+
+    public List<DSource> getdSources() {
+        return dSources;
+    }
+
+    public void setdSources(List<DSource> dSources) {
+        this.dSources = dSources;
+    }
+
+    public Map<Integer, DSourceVal> getdSourceValMap() {
+        return dSourceValMap;
+    }
+
+    public void setdSourceValMap(Map<Integer, DSourceVal> dSourceValMap) {
+        this.dSourceValMap = dSourceValMap;
+    }
+}

src/main/java/com/miniframe/template/TemplateGenerator.java

@@ -0,0 +1,74 @@
+package com.miniframe.template;
+import freemarker.template.*;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
+
+public class TemplateGenerator {
+
+    public static void createFireControl() throws IOException, TemplateException {
+        Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
+        // 设置模板所在目录
+        cfg.setClassForTemplateLoading(TemplateGenerator.class, "/templates");
+        // 获取模板对象
+        Template template = cfg.getTemplate("fireControl.ftl");
+        // 定义数据模型（Map）
+        Map<String, Object> dataModel = new HashMap<>();
+        //几何文件路径
+        dataModel.put("geoFilePath", "/home/disaster/fire/Geometry");
+        //fireinit 文件路径
+        dataModel.put("initFilePath", "/home/disaster/fire/Fire1.init");
+        //fireInteractionPath 阀门文件路径
+        dataModel.put("fireInteractionPath", "/home/disaster/fire/Fire.interaction");
+        //midPath
+        dataModel.put("midPath", "/home/disaster/fire/mid");
+        //outPath
+        dataModel.put("outPath", "/home/disaster/fire/out");
+        //fireSourceNum  灾源数量
+        dataModel.put("fireSourceNum", 2);
+        // 将数据模型传入模板进行处理
+        StringWriter writer = new StringWriter();
+        template.process(dataModel, writer);
+        // 输出结果到控制台或保存为文件
+        System.out.println(writer.toString());
+    }
+    public static void createFireRunsh() throws IOException, TemplateException {
+        Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
+        // 设置模板所在目录
+        cfg.setClassForTemplateLoading(TemplateGenerator.class, "/templates");
+        // 获取模板对象
+        Template template = cfg.getTemplate("fireRunsh.ftl");
+        // 定义数据模型（Map）
+        Map<String, Object> dataModel = new HashMap<>();
+        //几何文件路径
+        dataModel.put("firecontrolPath", "/home/disaster/fire/Fire.control");
+        // 将数据模型传入模板进行处理
+        StringWriter writer = new StringWriter();
+        template.process(dataModel, writer);
+        // 输出结果到控制台或保存为文件
+        System.out.println(writer.toString());
+    }
+
+    public static void createFireInit(String aid) throws IOException, TemplateException {
+        Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
+        // 设置模板所在目录
+        cfg.setClassForTemplateLoading(TemplateGenerator.class, "/templates");
+        // 获取模板对象
+        Template template = cfg.getTemplate("fireRunsh.ftl");
+        // 定义数据模型（Map）
+        Map<String, Object> dataModel = new HashMap<>();
+        //几何文件路径
+        dataModel.put("firecontrolPath", "/home/disaster/fire/Fire.control");
+        // 将数据模型传入模板进行处理
+        StringWriter writer = new StringWriter();
+        template.process(dataModel, writer);
+        // 输出结果到控制台或保存为文件
+        System.out.println(writer.toString());
+    }
+    public static void main(String[] args) throws Exception {
+        TemplateGenerator.createFireControl();
+        TemplateGenerator.createFireRunsh();
+    }
+}

src/main/java/com/miniframe/tools/TemplateGenerator.java

@@ -1,31 +0,0 @@
-package com.miniframe.tools;
-import freemarker.template.*;
-
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Map;
-
-public class TemplateGenerator {
-    public static void main(String[] args) throws Exception {
-        // 创建配置对象
-        Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
-
-        // 设置模板所在目录
-        cfg.setClassForTemplateLoading(TemplateGenerator.class, "/templates");
-
-        // 获取模板对象
-        Template template = cfg.getTemplate("example.ftl");
-
-        // 定义数据模型（Map）
-        Map<String, Object> dataModel = new HashMap<>();
-        dataModel.put("name", "John Doe");
-        dataModel.put("age", 25);
-
-        // 将数据模型传入模板进行处理
-        StringWriter writer = new StringWriter();
-        template.process(dataModel, writer);
-
-        // 输出结果到控制台或保存为文件
-        System.out.println(writer.toString());
-    }
-}

src/main/resources/templates/fireControl.ftl

@@ -0,0 +1,16 @@
+geoFile : ${geoFilePath}
+initFile :  ${initFilePath}
+interaction file name : ${fireInteractionPath}
+midPath : ${midPath}
+outPath : ${outPath}
+totaltime: 10800
+dt: 0.1
+dx: 10.0
+report step: 60
+interactionstep : 1200
+Boundary number :3
+FireSource number:${fireSourceNum}
+Number Con:2
+Con name: SO2 CO2
+Heat diffusion coefficient:0.1
+Mass diffusion coefficient:0.1 0.2

src/main/resources/templates/fireInit.ftl

@@ -0,0 +1,53 @@
+#nodes
+<
+nodes1	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes2	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes3	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes4	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes5	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes6	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes7	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes8	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes9	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes10	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes11	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes12	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes13	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes14	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes15	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes16	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes17	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes18	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes19	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes20	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes21	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes22	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes23	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes24	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes25	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes26	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes27	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes28	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes29	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes30	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes31	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes32	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes33	 ,inlet   ,0.0 ,300 ,0.0 ,0.0
+nodes34	 ,mid     ,0.0 ,300 ,0.0 ,0.0
+nodes35	 ,outlet  ,0.0 ,300 ,0.0 ,0.0
+nodes36	 ,outlet  ,0.0 ,300 ,0.0 ,0.0
+#end
+#boundaries Inlet
+nodes33 ,massflow ,10,300,0.0,0.0
+nodes35 ,Pressure ,10,300,0.0,0.0
+nodes36 ,pressure ,10,300,0.0,0.0
+#end
+#Fires
+Fire pipes22 0.5 2
+0    373 0.1  0.1
+1800 373 0.1  0.1
+Fire pipes15 0.1 3
+0         373 0.1 0.1
+1800      373 0.1 0.1
+2400      373 0.1 0.1
+#end

src/main/resources/templates/fireRunsh.ftl

@@ -0,0 +1,4 @@
+cd /home/disaster
+export LD_LIBRARY_PATH=./bin:$LD_LIBRARY_PATH
+./Fire ${firecontrolPath}
+./Fire ${firecontrolPath} restart

系统设计/实体Bean/system(实体列表).csv

@@ -17,4 +17,5 @@
 15,D_SOURCE,灾源点数据,,
 16,D_SOURCE_VAL,灾源观测数据,,
 17,D_ACCIDENT,灾情事故信息,,
-18,D_BOUNDARY,边界数据,,
+18,D_BOUNDARY,边界数据,,
+13,D_NODE_VAL,节点观测数据,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D00000_D(节点数据查询).csv

@@ -7,10 +7,4 @@
 2.4,y,y,string,,,,1,128,,,,,,
 2.5,z,z,string,,,,1,128,,,,,,
 2.6,desc,描述,string,,,,1,128,,,,,,
-2.7,waterlevel,水位,string,,,,1,128,,,,,,
-2.8,so2,二氧化硫浓度,string,,,,1,128,,,,,,
-2.9,co2,二氧化碳浓度,string,,,,1,128,,,,,,
-2.10,temperature,温度,string,,,,1,128,,,,,,
-2.11,scalar1,标量1,string,,,,1,128,,,,,,
-2.12,scalar2,标量2,string,,,,1,128,,,,,,
-2.13,scalar3,标量3,string,,,,1,128,,,,,,
+2.7,ntype,类型,string,,,,1,128,,,,,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D00004_A(灾情点源数据添加).csv

@@ -1,5 +1,5 @@
 序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
 1,pid,管道id,int,,,是,,,,,,,,
-2,sType,灾情源类型,string,,,,1,128,,,,,,
+2,stype,灾情源类型,string,,,,1,128,,,,,,
 3,aid,事故id,int,,,是,,,,,,,,
 4,site,位置,double,,,,,,,,,,,