管道灾源

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

@@ -9,18 +9,18 @@ import java.io.Serializable;
  */
 public class A_D00004 extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
-	int nid;//节点id
+	int pid;//管道id
 	/**
-	 *节点id
+	 *管道id
 	 */
-	public void setNid(int nid) {
-		this.nid=nid;
+	public void setPid(int pid) {
+		this.pid=pid;
 	}
 	/**
-	 *节点id
+	 *管道id
 	 */
-	public int getNid() {
-		return this.nid;
+	public int getPid() {
+		return this.pid;
 	}
 	String sType;//灾情源类型
 	/**
@@ -48,4 +48,17 @@ public class A_D00004 extends BaseMapModel implements Serializable {
 	public int getAid() {
 		return this.aid;
 	}
+	double site;//位置
+	/**
+	 *位置
+	 */
+	public void setSite(double site) {
+		this.site=site;
+	}
+	/**
+	 *位置
+	 */
+	public double getSite() {
+		return this.site;
+	}
 }

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

@@ -22,31 +22,31 @@ public class D_D00005_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public int getId() {
 		return this.id;
 	}
-	String nname;//节点名称
+	String pname;//管道名称
 	/**
-	 *节点名称
+	 *管道名称
 	 */
-	public void setNname(String nname) {
-		this.nname=nname;
+	public void setPname(String pname) {
+		this.pname=pname;
 	}
 	/**
-	 *节点名称
+	 *管道名称
 	 */
-	public String getNname() {
-		return this.nname;
+	public String getPname() {
+		return this.pname;
 	}
-	int nid;//节点编号
+	int pid;//管道编号
 	/**
-	 *节点编号
+	 *管道编号
 	 */
-	public void setNid(int nid) {
-		this.nid=nid;
+	public void setPid(int pid) {
+		this.pid=pid;
 	}
 	/**
-	 *节点编号
+	 *管道编号
 	 */
-	public int getNid() {
-		return this.nid;
+	public int getPid() {
+		return this.pid;
 	}
 	String sType;//灾情类型
 	/**
@@ -74,4 +74,17 @@ public class D_D00005_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public int getAid() {
 		return this.aid;
 	}
+	double site;//位置
+	/**
+	 *位置
+	 */
+	public void setSite(double site) {
+		this.site=site;
+	}
+	/**
+	 *位置
+	 */
+	public double getSite() {
+		return this.site;
+	}
 }

generated/validateform/a_d00004Form.xml

@@ -4,8 +4,8 @@
 <form-validation>
 <formset>
 <form name="a_d00004Form">
-<field property="nid" depends="required">
-    <arg0 key="a_d00004.nid"/>
+<field property="pid" depends="required">
+    <arg0 key="a_d00004.pid"/>
 </field>
 <field property="sType" depends="minlength,maxlength">
     <arg0 key="a_d00004.sType"/>

generated/validateform/d_d00005_rows_recodeForm.xml

@@ -4,8 +4,8 @@
 <form-validation>
 <formset>
 <form name="d_d00005_rows_recodeForm">
-<field property="nname" depends="minlength,maxlength">
-    <arg0 key="d_d00005_rows_recode.nname"/>
+<field property="pname" depends="minlength,maxlength">
+    <arg0 key="d_d00005_rows_recode.pname"/>
     <arg1 name="minlength" key="${var:minlength}"/>
     <var>
       <var-name>minlength</var-name>

generated/validator/resources_a_d00004Form_validator.properties

@@ -1,4 +1,5 @@
-a_d00004.nid = \u8282\u70B9id
+a_d00004.pid = \u7BA1\u9053id
 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,4 +1,5 @@
-a_d00004.nid = \u8282\u70B9id
+a_d00004.pid = \u7BA1\u9053id
 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_d00005_rows_recodeForm_validator.properties

@@ -1,6 +1,7 @@
 d_d00005_rows_recode.id = \u7F16\u53F7
-d_d00005_rows_recode.nname = \u8282\u70B9\u540D\u79F0
-d_d00005_rows_recode.nid = \u8282\u70B9\u7F16\u53F7
+d_d00005_rows_recode.pname = \u7BA1\u9053\u540D\u79F0
+d_d00005_rows_recode.pid = \u7BA1\u9053\u7F16\u53F7
 d_d00005_rows_recode.sType = \u707E\u60C5\u7C7B\u578B
 d_d00005_rows_recode.aid = \u4E8B\u6545id
+d_d00005_rows_recode.site = \u4F4D\u7F6E
 d_d00005_rows_recodeForm = true

generated/validator/resources_d_d00005_rows_recodeForm_validator_zh_CN.properties

@@ -1,6 +1,7 @@
 d_d00005_rows_recode.id = \u7F16\u53F7
-d_d00005_rows_recode.nname = \u8282\u70B9\u540D\u79F0
-d_d00005_rows_recode.nid = \u8282\u70B9\u7F16\u53F7
+d_d00005_rows_recode.pname = \u7BA1\u9053\u540D\u79F0
+d_d00005_rows_recode.pid = \u7BA1\u9053\u7F16\u53F7
 d_d00005_rows_recode.sType = \u707E\u60C5\u7C7B\u578B
 d_d00005_rows_recode.aid = \u4E8B\u6545id
+d_d00005_rows_recode.site = \u4F4D\u7F6E
 d_d00005_rows_recodeForm = true

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

@@ -0,0 +1,139 @@
+package com.miniframe.model.system;
+
+import com.miniframe.system.MiniserviceBaseModel;
+import java.io.Serializable;
+import javax.persistence.*;
+
+@Table(name = "d_boundary")
+public class DBoundary extends MiniserviceBaseModel implements Serializable {
+    @Id
+    private Integer id;
+
+    private Integer nid;
+
+    private String nname;
+
+    private String type;
+
+    private Float val1;
+
+    private Float val2;
+
+    private Float val3;
+
+    private Float val4;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * @return nid
+     */
+    public Integer getNid() {
+        return nid;
+    }
+
+    /**
+     * @param nid
+     */
+    public void setNid(Integer nid) {
+        this.nid = nid;
+    }
+
+    /**
+     * @return nname
+     */
+    public String getNname() {
+        return nname;
+    }
+
+    /**
+     * @param nname
+     */
+    public void setNname(String nname) {
+        this.nname = nname == null ? null : nname.trim();
+    }
+
+    /**
+     * @return type
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * @param type
+     */
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    /**
+     * @return val1
+     */
+    public Float getVal1() {
+        return val1;
+    }
+
+    /**
+     * @param val1
+     */
+    public void setVal1(Float val1) {
+        this.val1 = val1;
+    }
+
+    /**
+     * @return val2
+     */
+    public Float getVal2() {
+        return val2;
+    }
+
+    /**
+     * @param val2
+     */
+    public void setVal2(Float val2) {
+        this.val2 = val2;
+    }
+
+    /**
+     * @return val3
+     */
+    public Float getVal3() {
+        return val3;
+    }
+
+    /**
+     * @param val3
+     */
+    public void setVal3(Float val3) {
+        this.val3 = val3;
+    }
+
+    /**
+     * @return val4
+     */
+    public Float getVal4() {
+        return val4;
+    }
+
+    /**
+     * @param val4
+     */
+    public void setVal4(Float val4) {
+        this.val4 = val4;
+    }
+}

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

@@ -0,0 +1,700 @@
+package com.miniframe.model.system;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DBoundarySQLBuilder {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public DBoundarySQLBuilder() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andNidIsNull() {
+            addCriterion("nid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNidIsNotNull() {
+            addCriterion("nid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNidEqualTo(Integer value) {
+            addCriterion("nid =", value, "nid");
+            return (Criteria) this;
+        }
+
+        public Criteria andNidNotEqualTo(Integer value) {
+            addCriterion("nid <>", value, "nid");
+            return (Criteria) this;
+        }
+
+        public Criteria andNidGreaterThan(Integer value) {
+            addCriterion("nid >", value, "nid");
+            return (Criteria) this;
+        }
+
+        public Criteria andNidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("nid >=", value, "nid");
+            return (Criteria) this;
+        }
+
+        public Criteria andNidLessThan(Integer value) {
+            addCriterion("nid <", value, "nid");
+            return (Criteria) this;
+        }
+
+        public Criteria andNidLessThanOrEqualTo(Integer value) {
+            addCriterion("nid <=", value, "nid");
+            return (Criteria) this;
+        }
+
+        public Criteria andNidIn(List<Integer> values) {
+            addCriterion("nid in", values, "nid");
+            return (Criteria) this;
+        }
+
+        public Criteria andNidNotIn(List<Integer> values) {
+            addCriterion("nid not in", values, "nid");
+            return (Criteria) this;
+        }
+
+        public Criteria andNidBetween(Integer value1, Integer value2) {
+            addCriterion("nid between", value1, value2, "nid");
+            return (Criteria) this;
+        }
+
+        public Criteria andNidNotBetween(Integer value1, Integer value2) {
+            addCriterion("nid not between", value1, value2, "nid");
+            return (Criteria) this;
+        }
+
+        public Criteria andNnameIsNull() {
+            addCriterion("nname is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNnameIsNotNull() {
+            addCriterion("nname is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNnameEqualTo(String value) {
+            addCriterion("nname =", value, "nname");
+            return (Criteria) this;
+        }
+
+        public Criteria andNnameNotEqualTo(String value) {
+            addCriterion("nname <>", value, "nname");
+            return (Criteria) this;
+        }
+
+        public Criteria andNnameGreaterThan(String value) {
+            addCriterion("nname >", value, "nname");
+            return (Criteria) this;
+        }
+
+        public Criteria andNnameGreaterThanOrEqualTo(String value) {
+            addCriterion("nname >=", value, "nname");
+            return (Criteria) this;
+        }
+
+        public Criteria andNnameLessThan(String value) {
+            addCriterion("nname <", value, "nname");
+            return (Criteria) this;
+        }
+
+        public Criteria andNnameLessThanOrEqualTo(String value) {
+            addCriterion("nname <=", value, "nname");
+            return (Criteria) this;
+        }
+
+        public Criteria andNnameLike(String value) {
+            addCriterion("nname like", value, "nname");
+            return (Criteria) this;
+        }
+
+        public Criteria andNnameNotLike(String value) {
+            addCriterion("nname not like", value, "nname");
+            return (Criteria) this;
+        }
+
+        public Criteria andNnameIn(List<String> values) {
+            addCriterion("nname in", values, "nname");
+            return (Criteria) this;
+        }
+
+        public Criteria andNnameNotIn(List<String> values) {
+            addCriterion("nname not in", values, "nname");
+            return (Criteria) this;
+        }
+
+        public Criteria andNnameBetween(String value1, String value2) {
+            addCriterion("nname between", value1, value2, "nname");
+            return (Criteria) this;
+        }
+
+        public Criteria andNnameNotBetween(String value1, String value2) {
+            addCriterion("nname not between", value1, value2, "nname");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(String value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(String value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(String value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(String value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(String value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLike(String value) {
+            addCriterion("type like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotLike(String value) {
+            addCriterion("type not like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<String> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<String> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(String value1, String value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(String value1, String value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal1IsNull() {
+            addCriterion("val1 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal1IsNotNull() {
+            addCriterion("val1 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal1EqualTo(Float value) {
+            addCriterion("val1 =", value, "val1");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal1NotEqualTo(Float value) {
+            addCriterion("val1 <>", value, "val1");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal1GreaterThan(Float value) {
+            addCriterion("val1 >", value, "val1");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal1GreaterThanOrEqualTo(Float value) {
+            addCriterion("val1 >=", value, "val1");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal1LessThan(Float value) {
+            addCriterion("val1 <", value, "val1");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal1LessThanOrEqualTo(Float value) {
+            addCriterion("val1 <=", value, "val1");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal1In(List<Float> values) {
+            addCriterion("val1 in", values, "val1");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal1NotIn(List<Float> values) {
+            addCriterion("val1 not in", values, "val1");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal1Between(Float value1, Float value2) {
+            addCriterion("val1 between", value1, value2, "val1");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal1NotBetween(Float value1, Float value2) {
+            addCriterion("val1 not between", value1, value2, "val1");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal2IsNull() {
+            addCriterion("val2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal2IsNotNull() {
+            addCriterion("val2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal2EqualTo(Float value) {
+            addCriterion("val2 =", value, "val2");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal2NotEqualTo(Float value) {
+            addCriterion("val2 <>", value, "val2");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal2GreaterThan(Float value) {
+            addCriterion("val2 >", value, "val2");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal2GreaterThanOrEqualTo(Float value) {
+            addCriterion("val2 >=", value, "val2");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal2LessThan(Float value) {
+            addCriterion("val2 <", value, "val2");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal2LessThanOrEqualTo(Float value) {
+            addCriterion("val2 <=", value, "val2");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal2In(List<Float> values) {
+            addCriterion("val2 in", values, "val2");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal2NotIn(List<Float> values) {
+            addCriterion("val2 not in", values, "val2");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal2Between(Float value1, Float value2) {
+            addCriterion("val2 between", value1, value2, "val2");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal2NotBetween(Float value1, Float value2) {
+            addCriterion("val2 not between", value1, value2, "val2");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal3IsNull() {
+            addCriterion("val3 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal3IsNotNull() {
+            addCriterion("val3 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal3EqualTo(Float value) {
+            addCriterion("val3 =", value, "val3");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal3NotEqualTo(Float value) {
+            addCriterion("val3 <>", value, "val3");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal3GreaterThan(Float value) {
+            addCriterion("val3 >", value, "val3");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal3GreaterThanOrEqualTo(Float value) {
+            addCriterion("val3 >=", value, "val3");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal3LessThan(Float value) {
+            addCriterion("val3 <", value, "val3");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal3LessThanOrEqualTo(Float value) {
+            addCriterion("val3 <=", value, "val3");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal3In(List<Float> values) {
+            addCriterion("val3 in", values, "val3");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal3NotIn(List<Float> values) {
+            addCriterion("val3 not in", values, "val3");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal3Between(Float value1, Float value2) {
+            addCriterion("val3 between", value1, value2, "val3");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal3NotBetween(Float value1, Float value2) {
+            addCriterion("val3 not between", value1, value2, "val3");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal4IsNull() {
+            addCriterion("val4 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal4IsNotNull() {
+            addCriterion("val4 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal4EqualTo(Float value) {
+            addCriterion("val4 =", value, "val4");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal4NotEqualTo(Float value) {
+            addCriterion("val4 <>", value, "val4");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal4GreaterThan(Float value) {
+            addCriterion("val4 >", value, "val4");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal4GreaterThanOrEqualTo(Float value) {
+            addCriterion("val4 >=", value, "val4");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal4LessThan(Float value) {
+            addCriterion("val4 <", value, "val4");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal4LessThanOrEqualTo(Float value) {
+            addCriterion("val4 <=", value, "val4");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal4In(List<Float> values) {
+            addCriterion("val4 in", values, "val4");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal4NotIn(List<Float> values) {
+            addCriterion("val4 not in", values, "val4");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal4Between(Float value1, Float value2) {
+            addCriterion("val4 between", value1, value2, "val4");
+            return (Criteria) this;
+        }
+
+        public Criteria andVal4NotBetween(Float value1, Float value2) {
+            addCriterion("val4 not between", value1, value2, "val4");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -37,6 +37,11 @@ public class DNode extends MiniserviceBaseModel implements Serializable {
 
     private Float scalar3;
 
+    /**
+     * 节点类型
+     */
+    private String ntype;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -224,4 +229,22 @@ public class DNode extends MiniserviceBaseModel implements Serializable {
     public void setScalar3(Float scalar3) {
         this.scalar3 = scalar3;
     }
+
+    /**
+     * 获取节点类型
+     *
+     * @return ntype - 节点类型
+     */
+    public String getNtype() {
+        return ntype;
+    }
+
+    /**
+     * 设置节点类型
+     *
+     * @param ntype 节点类型
+     */
+    public void setNtype(String ntype) {
+        this.ntype = ntype == null ? null : ntype.trim();
+    }
 }

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

@@ -903,6 +903,76 @@ public class DNodeSQLBuilder {
             addCriterion("scalar3 not between", value1, value2, "scalar3");
             return (Criteria) this;
         }
+
+        public Criteria andNtypeIsNull() {
+            addCriterion("ntype is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNtypeIsNotNull() {
+            addCriterion("ntype is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNtypeEqualTo(String value) {
+            addCriterion("ntype =", value, "ntype");
+            return (Criteria) this;
+        }
+
+        public Criteria andNtypeNotEqualTo(String value) {
+            addCriterion("ntype <>", value, "ntype");
+            return (Criteria) this;
+        }
+
+        public Criteria andNtypeGreaterThan(String value) {
+            addCriterion("ntype >", value, "ntype");
+            return (Criteria) this;
+        }
+
+        public Criteria andNtypeGreaterThanOrEqualTo(String value) {
+            addCriterion("ntype >=", value, "ntype");
+            return (Criteria) this;
+        }
+
+        public Criteria andNtypeLessThan(String value) {
+            addCriterion("ntype <", value, "ntype");
+            return (Criteria) this;
+        }
+
+        public Criteria andNtypeLessThanOrEqualTo(String value) {
+            addCriterion("ntype <=", value, "ntype");
+            return (Criteria) this;
+        }
+
+        public Criteria andNtypeLike(String value) {
+            addCriterion("ntype like", value, "ntype");
+            return (Criteria) this;
+        }
+
+        public Criteria andNtypeNotLike(String value) {
+            addCriterion("ntype not like", value, "ntype");
+            return (Criteria) this;
+        }
+
+        public Criteria andNtypeIn(List<String> values) {
+            addCriterion("ntype in", values, "ntype");
+            return (Criteria) this;
+        }
+
+        public Criteria andNtypeNotIn(List<String> values) {
+            addCriterion("ntype not in", values, "ntype");
+            return (Criteria) this;
+        }
+
+        public Criteria andNtypeBetween(String value1, String value2) {
+            addCriterion("ntype between", value1, value2, "ntype");
+            return (Criteria) this;
+        }
+
+        public Criteria andNtypeNotBetween(String value1, String value2) {
+            addCriterion("ntype not between", value1, value2, "ntype");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -10,14 +10,14 @@ public class DSource extends MiniserviceBaseModel implements Serializable {
     private Integer id;
 
     /**
-     * 节点ID
+     * 管道ID
      */
-    private Integer nid;
+    private Integer pid;
 
     /**
-     * 节点名称
+     * 管道名称
      */
-    private String nname;
+    private String pname;
 
     /**
      * 类型  Fire-火灾源  Water-水灾源
@@ -30,6 +30,11 @@ public class DSource extends MiniserviceBaseModel implements Serializable {
      */
     private Integer aid;
 
+    /**
+     * 位置
+     */
+    private Float site;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -47,39 +52,39 @@ public class DSource extends MiniserviceBaseModel implements Serializable {
     }
 
     /**
-     * 获取节点ID
+     * 获取管道ID
      *
-     * @return nid - 节点ID
+     * @return pid - 管道ID
      */
-    public Integer getNid() {
-        return nid;
+    public Integer getPid() {
+        return pid;
     }
 
     /**
-     * 设置节点ID
+     * 设置管道ID
      *
-     * @param nid 节点ID
+     * @param pid 管道ID
      */
-    public void setNid(Integer nid) {
-        this.nid = nid;
+    public void setPid(Integer pid) {
+        this.pid = pid;
     }
 
     /**
-     * 获取节点名称
+     * 获取管道名称
      *
-     * @return nname - 节点名称
+     * @return pname - 管道名称
      */
-    public String getNname() {
-        return nname;
+    public String getPname() {
+        return pname;
     }
 
     /**
-     * 设置节点名称
+     * 设置管道名称
      *
-     * @param nname 节点名称
+     * @param pname 管道名称
      */
-    public void setNname(String nname) {
-        this.nname = nname == null ? null : nname.trim();
+    public void setPname(String pname) {
+        this.pname = pname == null ? null : pname.trim();
     }
 
     /**
@@ -117,4 +122,22 @@ public class DSource extends MiniserviceBaseModel implements Serializable {
     public void setAid(Integer aid) {
         this.aid = aid;
     }
+
+    /**
+     * 获取位置
+     *
+     * @return site - 位置
+     */
+    public Float getSite() {
+        return site;
+    }
+
+    /**
+     * 设置位置
+     *
+     * @param site 位置
+     */
+    public void setSite(Float site) {
+        this.site = site;
+    }
 }

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

@@ -164,133 +164,133 @@ public class DSourceSQLBuilder {
             return (Criteria) this;
         }
 
-        public Criteria andNidIsNull() {
-            addCriterion("nid is null");
+        public Criteria andPidIsNull() {
+            addCriterion("pid is null");
             return (Criteria) this;
         }
 
-        public Criteria andNidIsNotNull() {
-            addCriterion("nid is not null");
+        public Criteria andPidIsNotNull() {
+            addCriterion("pid is not null");
             return (Criteria) this;
         }
 
-        public Criteria andNidEqualTo(Integer value) {
-            addCriterion("nid =", value, "nid");
+        public Criteria andPidEqualTo(Integer value) {
+            addCriterion("pid =", value, "pid");
             return (Criteria) this;
         }
 
-        public Criteria andNidNotEqualTo(Integer value) {
-            addCriterion("nid <>", value, "nid");
+        public Criteria andPidNotEqualTo(Integer value) {
+            addCriterion("pid <>", value, "pid");
             return (Criteria) this;
         }
 
-        public Criteria andNidGreaterThan(Integer value) {
-            addCriterion("nid >", value, "nid");
+        public Criteria andPidGreaterThan(Integer value) {
+            addCriterion("pid >", value, "pid");
             return (Criteria) this;
         }
 
-        public Criteria andNidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("nid >=", value, "nid");
+        public Criteria andPidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pid >=", value, "pid");
             return (Criteria) this;
         }
 
-        public Criteria andNidLessThan(Integer value) {
-            addCriterion("nid <", value, "nid");
+        public Criteria andPidLessThan(Integer value) {
+            addCriterion("pid <", value, "pid");
             return (Criteria) this;
         }
 
-        public Criteria andNidLessThanOrEqualTo(Integer value) {
-            addCriterion("nid <=", value, "nid");
+        public Criteria andPidLessThanOrEqualTo(Integer value) {
+            addCriterion("pid <=", value, "pid");
             return (Criteria) this;
         }
 
-        public Criteria andNidIn(List<Integer> values) {
-            addCriterion("nid in", values, "nid");
+        public Criteria andPidIn(List<Integer> values) {
+            addCriterion("pid in", values, "pid");
             return (Criteria) this;
         }
 
-        public Criteria andNidNotIn(List<Integer> values) {
-            addCriterion("nid not in", values, "nid");
+        public Criteria andPidNotIn(List<Integer> values) {
+            addCriterion("pid not in", values, "pid");
             return (Criteria) this;
         }
 
-        public Criteria andNidBetween(Integer value1, Integer value2) {
-            addCriterion("nid between", value1, value2, "nid");
+        public Criteria andPidBetween(Integer value1, Integer value2) {
+            addCriterion("pid between", value1, value2, "pid");
             return (Criteria) this;
         }
 
-        public Criteria andNidNotBetween(Integer value1, Integer value2) {
-            addCriterion("nid not between", value1, value2, "nid");
+        public Criteria andPidNotBetween(Integer value1, Integer value2) {
+            addCriterion("pid not between", value1, value2, "pid");
             return (Criteria) this;
         }
 
-        public Criteria andNnameIsNull() {
-            addCriterion("nname is null");
+        public Criteria andPnameIsNull() {
+            addCriterion("pname is null");
             return (Criteria) this;
         }
 
-        public Criteria andNnameIsNotNull() {
-            addCriterion("nname is not null");
+        public Criteria andPnameIsNotNull() {
+            addCriterion("pname is not null");
             return (Criteria) this;
         }
 
-        public Criteria andNnameEqualTo(String value) {
-            addCriterion("nname =", value, "nname");
+        public Criteria andPnameEqualTo(String value) {
+            addCriterion("pname =", value, "pname");
             return (Criteria) this;
         }
 
-        public Criteria andNnameNotEqualTo(String value) {
-            addCriterion("nname <>", value, "nname");
+        public Criteria andPnameNotEqualTo(String value) {
+            addCriterion("pname <>", value, "pname");
             return (Criteria) this;
         }
 
-        public Criteria andNnameGreaterThan(String value) {
-            addCriterion("nname >", value, "nname");
+        public Criteria andPnameGreaterThan(String value) {
+            addCriterion("pname >", value, "pname");
             return (Criteria) this;
         }
 
-        public Criteria andNnameGreaterThanOrEqualTo(String value) {
-            addCriterion("nname >=", value, "nname");
+        public Criteria andPnameGreaterThanOrEqualTo(String value) {
+            addCriterion("pname >=", value, "pname");
             return (Criteria) this;
         }
 
-        public Criteria andNnameLessThan(String value) {
-            addCriterion("nname <", value, "nname");
+        public Criteria andPnameLessThan(String value) {
+            addCriterion("pname <", value, "pname");
             return (Criteria) this;
         }
 
-        public Criteria andNnameLessThanOrEqualTo(String value) {
-            addCriterion("nname <=", value, "nname");
+        public Criteria andPnameLessThanOrEqualTo(String value) {
+            addCriterion("pname <=", value, "pname");
             return (Criteria) this;
         }
 
-        public Criteria andNnameLike(String value) {
-            addCriterion("nname like", value, "nname");
+        public Criteria andPnameLike(String value) {
+            addCriterion("pname like", value, "pname");
             return (Criteria) this;
         }
 
-        public Criteria andNnameNotLike(String value) {
-            addCriterion("nname not like", value, "nname");
+        public Criteria andPnameNotLike(String value) {
+            addCriterion("pname not like", value, "pname");
             return (Criteria) this;
         }
 
-        public Criteria andNnameIn(List<String> values) {
-            addCriterion("nname in", values, "nname");
+        public Criteria andPnameIn(List<String> values) {
+            addCriterion("pname in", values, "pname");
             return (Criteria) this;
         }
 
-        public Criteria andNnameNotIn(List<String> values) {
-            addCriterion("nname not in", values, "nname");
+        public Criteria andPnameNotIn(List<String> values) {
+            addCriterion("pname not in", values, "pname");
             return (Criteria) this;
         }
 
-        public Criteria andNnameBetween(String value1, String value2) {
-            addCriterion("nname between", value1, value2, "nname");
+        public Criteria andPnameBetween(String value1, String value2) {
+            addCriterion("pname between", value1, value2, "pname");
             return (Criteria) this;
         }
 
-        public Criteria andNnameNotBetween(String value1, String value2) {
-            addCriterion("nname not between", value1, value2, "nname");
+        public Criteria andPnameNotBetween(String value1, String value2) {
+            addCriterion("pname not between", value1, value2, "pname");
             return (Criteria) this;
         }
 
@@ -423,6 +423,66 @@ public class DSourceSQLBuilder {
             addCriterion("aid not between", value1, value2, "aid");
             return (Criteria) this;
         }
+
+        public Criteria andSiteIsNull() {
+            addCriterion("site is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIsNotNull() {
+            addCriterion("site is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteEqualTo(Float value) {
+            addCriterion("site =", value, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteNotEqualTo(Float value) {
+            addCriterion("site <>", value, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteGreaterThan(Float value) {
+            addCriterion("site >", value, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteGreaterThanOrEqualTo(Float value) {
+            addCriterion("site >=", value, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLessThan(Float value) {
+            addCriterion("site <", value, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteLessThanOrEqualTo(Float value) {
+            addCriterion("site <=", value, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIn(List<Float> values) {
+            addCriterion("site in", values, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteNotIn(List<Float> values) {
+            addCriterion("site not in", values, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteBetween(Float value1, Float value2) {
+            addCriterion("site between", value1, value2, "site");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteNotBetween(Float value1, Float value2) {
+            addCriterion("site not between", value1, value2, "site");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

modelsrc/com/miniframe/model/system/dao/DBoundaryMapper.java

@@ -0,0 +1,10 @@
+package com.miniframe.model.system.dao;
+
+import com.miniframe.model.system.DBoundary;
+import com.miniframe.model.system.DBoundarySQLBuilder;
+import com.miniframe.spring.db.MFBaseMapper;
+import com.miniframe.system.MiniserviceBaseDao;
+
+public interface DBoundaryMapper extends MiniserviceBaseDao, MFBaseMapper<DBoundary> {
+    long countByExample(DBoundarySQLBuilder example);
+}

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 Mon Jan 15 10:24:09 CST 2024.
+    This file was generated on Mon Jan 15 16:08:00 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />
@@ -25,5 +25,6 @@
     <mapper resource="com/miniframe/model/system/xml/DSourceMapper.xml" />
     <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" />
   </mappers>
 </configuration>

modelsrc/com/miniframe/model/system/xml/DBoundaryMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miniframe.model.system.dao.DBoundaryMapper">
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <select id="countByExample" parameterType="com.miniframe.model.system.DBoundarySQLBuilder" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    select count(*) from d_boundary
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <cache>
+    <!--
+      WARNING - @mbg.generated
+    -->
+  </cache>
+</mapper>

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

@@ -8,6 +8,7 @@ import com.miniframe.generate.business.system.model.D00004BaseModel;
 import com.miniframe.model.system.*;
 import com.miniframe.model.system.dao.DAccidentMapper;
 import com.miniframe.model.system.dao.DNodeMapper;
+import com.miniframe.model.system.dao.DPipeMapper;
 import com.miniframe.model.system.dao.DSourceMapper;
 import tk.mybatis.mapper.util.StringUtil;
 
@@ -22,7 +23,7 @@ public class D00004Service extends D00004BaseModel implements ExecProcessFlow {
 	 * 基础系统,“灾情点源数据添加”业务核心处理
  	 */
 	public void transExecute() throws Exception {
-		Integer nid =this.getA_d00004().getNid();
+		Integer pid =this.getA_d00004().getPid();
 		Integer aid = this.getA_d00004().getAid();
 
 		DAccidentMapper dam= UtilTools.getBean(DAccidentMapper.class);
@@ -31,9 +32,9 @@ public class D00004Service extends D00004BaseModel implements ExecProcessFlow {
 			throw new BusinessException("EB3000002");
 		}
 
-		DNodeMapper dnm=UtilTools.getBean(DNodeMapper.class);
-		DNode dn =dnm.selectByPrimaryKey(nid);
-		if(dn==null){
+		DPipeMapper pnm=UtilTools.getBean(DPipeMapper.class);
+		DPipe dp =pnm.selectByPrimaryKey(pid);
+		if(dp==null){
 			throw new BusinessException("EB3000001");
 		}
 
@@ -41,7 +42,7 @@ public class D00004Service extends D00004BaseModel implements ExecProcessFlow {
 		DSourceSQLBuilder sb =new DSourceSQLBuilder();
 		DSourceSQLBuilder.Criteria sc=sb.createCriteria();
 		sc.andAidEqualTo(aid);
-		sc.andNidEqualTo(nid);
+		sc.andPidEqualTo(pid);
 
 		Long count = dsm.countByExample(sb);
 		if(count>0){
@@ -49,8 +50,8 @@ public class D00004Service extends D00004BaseModel implements ExecProcessFlow {
 		}
 		DSource ds =new DSource();
 		ds.setAid(aid);
-		ds.setNid(nid);
-		ds.setNname(dn.getName());
+		ds.setPid(pid);
+		ds.setPname(dp.getName());
 		ds.setsType(this.getA_d00004().getSType());
 		dsm.insertSelective(ds);
 	}

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

@@ -36,8 +36,8 @@ public class D00005Service extends D00005BaseModel implements ExecProcessFlow {
 			D_D00005_ROWS_RECODE row = new D_D00005_ROWS_RECODE();
 			row.setId(ds.getId());
 			row.setAid(ds.getAid());
-			row.setNid(ds.getNid());
-			row.setNname(ds.getNname());
+			row.setPid(ds.getPid());
+			row.setPname(ds.getPname());
 			row.setSType(ds.getsType());
 			rows.add(row);
 		}

src/main/java/com/miniframe/dbtransfer/DBoundaryDbTransfer.java

@@ -0,0 +1,23 @@
+package com.miniframe.dbtransfer;
+
+import com.miniframe.core.DbTransfer;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import com.miniframe.model.system.DBoundary;
+
+/**
+ * 实体列表,“D_BOUNDARY”数据库数据转化逻辑处理（重新生成不覆盖）。
+ */
+public class DBoundaryDbTransfer extends DbTransfer implements Serializable {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+
+	@Override
+	public List transfer(final List l,Map map) throws Exception{
+		List<DBoundary> list=l;
+		return list;
+	};
+
+}

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

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

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

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

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

@@ -1,7 +1,8 @@
 序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
 2,rows,数据,list,,,,0,,,,,,,
 2.1,id,编号,int,,,,,,,,,,,
-2.2,nname,节点名称,string,,,,1,2048,,,,,,
-2.3,nid,节点编号,int,,,,,,,,,,,
+2.2,pname,管道名称,string,,,,1,2048,,,,,,
+2.3,pid,管道编号,int,,,,,,,,,,,
 2.4,sType,灾情类型,string,,,,,,,,,,,
 2.5,aid,事故id,int,,,,,,,,,,,
+2.6,site,位置,double,,,,,,,,,,,