Преглед на файлове

节点编号 管道编号

huangxingxing преди 1 година
родител
ревизия
462a7cd0ba
променени са 32 файла, в които са добавени 334 реда и са изтрити 15 реда
  1. 13 0
      generated/com/miniframe/generate/comm/system/A_D10000.java
  2. 13 0
      generated/com/miniframe/generate/comm/system/A_D10002.java
  3. 13 0
      generated/com/miniframe/generate/comm/system/D_D00000_ROWS_RECODE.java
  4. 13 0
      generated/com/miniframe/generate/comm/system/D_D00001_ROWS_RECODE.java
  5. 13 0
      generated/validateform/a_d10000Form.xml
  6. 13 0
      generated/validateform/a_d10002Form.xml
  7. 13 0
      generated/validateform/d_d00000_rows_recodeForm.xml
  8. 13 0
      generated/validateform/d_d00001_rows_recodeForm.xml
  9. 1 0
      generated/validator/resources_a_d10000Form_validator.properties
  10. 1 0
      generated/validator/resources_a_d10000Form_validator_zh_CN.properties
  11. 1 0
      generated/validator/resources_a_d10002Form_validator.properties
  12. 1 0
      generated/validator/resources_a_d10002Form_validator_zh_CN.properties
  13. 1 0
      generated/validator/resources_d_d00000_rows_recodeForm_validator.properties
  14. 1 0
      generated/validator/resources_d_d00000_rows_recodeForm_validator_zh_CN.properties
  15. 1 0
      generated/validator/resources_d_d00001_rows_recodeForm_validator.properties
  16. 1 0
      generated/validator/resources_d_d00001_rows_recodeForm_validator_zh_CN.properties
  17. 23 0
      modelsrc/com/miniframe/model/system/DNode.java
  18. 70 0
      modelsrc/com/miniframe/model/system/DNodeSQLBuilder.java
  19. 23 0
      modelsrc/com/miniframe/model/system/DPipe.java
  20. 70 0
      modelsrc/com/miniframe/model/system/DPipeSQLBuilder.java
  21. 1 1
      modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml
  22. 1 0
      src/main/java/com/miniframe/bisiness/system/D00000Service.java
  23. 1 1
      src/main/java/com/miniframe/bisiness/system/D00001Service.java
  24. 1 1
      src/main/java/com/miniframe/bisiness/system/D00004Service.java
  25. 7 4
      src/main/java/com/miniframe/bisiness/system/D10000Service.java
  26. 13 5
      src/main/java/com/miniframe/bisiness/system/D10002Service.java
  27. 1 1
      src/main/java/com/miniframe/bisiness/system/D10005Service.java
  28. 6 1
      src/main/java/com/miniframe/bisiness/system/D10008Service.java
  29. 1 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D00000_D(节点数据查询).csv
  30. 1 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D00001_D(管道数据查询).csv
  31. 1 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10000_A(节点数据添加修改).csv
  32. 2 1
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10002_A(管道数据添加修改).csv

+ 13 - 0
generated/com/miniframe/generate/comm/system/A_D10000.java

@@ -100,4 +100,17 @@ public class A_D10000 extends BaseMapModel implements Serializable {
 	public String getNtype() {
 		return this.ntype;
 	}
+	String code;//编号
+	/**
+	 *编号
+	 */
+	public void setCode(String code) {
+		this.code=code;
+	}
+	/**
+	 *编号
+	 */
+	public String getCode() {
+		return this.code;
+	}
 }

+ 13 - 0
generated/com/miniframe/generate/comm/system/A_D10002.java

@@ -152,4 +152,17 @@ public class A_D10002 extends BaseMapModel implements Serializable {
 	public String getSectionPara5() {
 		return this.sectionPara5;
 	}
+	String code;//编号
+	/**
+	 *编号
+	 */
+	public void setCode(String code) {
+		this.code=code;
+	}
+	/**
+	 *编号
+	 */
+	public String getCode() {
+		return this.code;
+	}
 }

+ 13 - 0
generated/com/miniframe/generate/comm/system/D_D00000_ROWS_RECODE.java

@@ -100,4 +100,17 @@ public class D_D00000_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getNtype() {
 		return this.ntype;
 	}
+	String code;//编号
+	/**
+	 *编号
+	 */
+	public void setCode(String code) {
+		this.code=code;
+	}
+	/**
+	 *编号
+	 */
+	public String getCode() {
+		return this.code;
+	}
 }

+ 13 - 0
generated/com/miniframe/generate/comm/system/D_D00001_ROWS_RECODE.java

@@ -152,4 +152,17 @@ public class D_D00001_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getSectionPara5() {
 		return this.sectionPara5;
 	}
+	String code;//编号
+	/**
+	 *编号
+	 */
+	public void setCode(String code) {
+		this.code=code;
+	}
+	/**
+	 *编号
+	 */
+	public String getCode() {
+		return this.code;
+	}
 }

+ 13 - 0
generated/validateform/a_d10000Form.xml

@@ -82,6 +82,19 @@
       <var-value>128</var-value>
     </var>
 </field>
+<field property="code" depends="required,minlength,maxlength">
+    <arg0 key="a_d10000.code"/>
+    <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>
 </form>
 </formset>
 </form-validation>

+ 13 - 0
generated/validateform/a_d10002Form.xml

@@ -101,6 +101,19 @@
       <var-value>128</var-value>
     </var>
 </field>
+<field property="code" depends="required,minlength,maxlength">
+    <arg0 key="a_d10002.code"/>
+    <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>
 </form>
 </formset>
 </form-validation>

+ 13 - 0
generated/validateform/d_d00000_rows_recodeForm.xml

@@ -82,6 +82,19 @@
       <var-value>128</var-value>
     </var>
 </field>
+<field property="code" depends="minlength,maxlength">
+    <arg0 key="d_d00000_rows_recode.code"/>
+    <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>
 </form>
 </formset>
 </form-validation>

+ 13 - 0
generated/validateform/d_d00001_rows_recodeForm.xml

@@ -95,6 +95,19 @@
       <var-value>128</var-value>
     </var>
 </field>
+<field property="code" depends="minlength,maxlength">
+    <arg0 key="d_d00001_rows_recode.code"/>
+    <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>
 </form>
 </formset>
 </form-validation>

+ 1 - 0
generated/validator/resources_a_d10000Form_validator.properties

@@ -5,4 +5,5 @@ a_d10000.y = y
 a_d10000.z = z
 a_d10000.desc = \u63CF\u8FF0
 a_d10000.ntype = \u7C7B\u578B\u9ED8\u8BA4\u503C
+a_d10000.code = \u7F16\u53F7
 a_d10000Form = true

+ 1 - 0
generated/validator/resources_a_d10000Form_validator_zh_CN.properties

@@ -5,4 +5,5 @@ a_d10000.y = y
 a_d10000.z = z
 a_d10000.desc = \u63CF\u8FF0
 a_d10000.ntype = \u7C7B\u578B\u9ED8\u8BA4\u503C
+a_d10000.code = \u7F16\u53F7
 a_d10000Form = true

+ 1 - 0
generated/validator/resources_a_d10002Form_validator.properties

@@ -9,4 +9,5 @@ a_d10002.sectionPara2 = \u622A\u9762\u53C2\u65702
 a_d10002.sectionPara3 = \u622A\u9762\u53C2\u65703
 a_d10002.sectionPara4 = \u622A\u9762\u53C2\u65704
 a_d10002.sectionPara5 = \u622A\u9762\u53C2\u65705
+a_d10002.code = \u7F16\u53F7
 a_d10002Form = true

+ 1 - 0
generated/validator/resources_a_d10002Form_validator_zh_CN.properties

@@ -9,4 +9,5 @@ a_d10002.sectionPara2 = \u622A\u9762\u53C2\u65702
 a_d10002.sectionPara3 = \u622A\u9762\u53C2\u65703
 a_d10002.sectionPara4 = \u622A\u9762\u53C2\u65704
 a_d10002.sectionPara5 = \u622A\u9762\u53C2\u65705
+a_d10002.code = \u7F16\u53F7
 a_d10002Form = true

+ 1 - 0
generated/validator/resources_d_d00000_rows_recodeForm_validator.properties

@@ -5,4 +5,5 @@ d_d00000_rows_recode.y = y
 d_d00000_rows_recode.z = z
 d_d00000_rows_recode.desc = \u63CF\u8FF0
 d_d00000_rows_recode.ntype = \u7C7B\u578B
+d_d00000_rows_recode.code = \u7F16\u53F7
 d_d00000_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d00000_rows_recodeForm_validator_zh_CN.properties

@@ -5,4 +5,5 @@ d_d00000_rows_recode.y = y
 d_d00000_rows_recode.z = z
 d_d00000_rows_recode.desc = \u63CF\u8FF0
 d_d00000_rows_recode.ntype = \u7C7B\u578B
+d_d00000_rows_recode.code = \u7F16\u53F7
 d_d00000_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d00001_rows_recodeForm_validator.properties

@@ -9,4 +9,5 @@ d_d00001_rows_recode.sectionPara2 = \u622A\u9762\u53C2\u65702
 d_d00001_rows_recode.sectionPara3 = \u622A\u9762\u53C2\u65703
 d_d00001_rows_recode.sectionPara4 = \u622A\u9762\u53C2\u65704
 d_d00001_rows_recode.sectionPara5 = \u622A\u9762\u53C2\u65705
+d_d00001_rows_recode.code = \u7F16\u53F7
 d_d00001_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d00001_rows_recodeForm_validator_zh_CN.properties

@@ -9,4 +9,5 @@ d_d00001_rows_recode.sectionPara2 = \u622A\u9762\u53C2\u65702
 d_d00001_rows_recode.sectionPara3 = \u622A\u9762\u53C2\u65703
 d_d00001_rows_recode.sectionPara4 = \u622A\u9762\u53C2\u65704
 d_d00001_rows_recode.sectionPara5 = \u622A\u9762\u53C2\u65705
+d_d00001_rows_recode.code = \u7F16\u53F7
 d_d00001_rows_recodeForm = true

+ 23 - 0
modelsrc/com/miniframe/model/system/DNode.java

@@ -25,6 +25,11 @@ public class DNode extends MiniserviceBaseModel implements Serializable {
      */
     private String ntype;
 
+    /**
+     * 节点编号
+     */
+    private String code;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -128,4 +133,22 @@ public class DNode extends MiniserviceBaseModel implements Serializable {
     public void setNtype(String ntype) {
         this.ntype = ntype == null ? null : ntype.trim();
     }
+
+    /**
+     * 获取节点编号
+     *
+     * @return code - 节点编号
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * 设置节点编号
+     *
+     * @param code 节点编号
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
 }

+ 70 - 0
modelsrc/com/miniframe/model/system/DNodeSQLBuilder.java

@@ -583,6 +583,76 @@ public class DNodeSQLBuilder {
             addCriterion("ntype not between", value1, value2, "ntype");
             return (Criteria) this;
         }
+
+        public Criteria andCodeIsNull() {
+            addCriterion("code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNotNull() {
+            addCriterion("code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEqualTo(String value) {
+            addCriterion("code =", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotEqualTo(String value) {
+            addCriterion("code <>", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThan(String value) {
+            addCriterion("code >", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("code >=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThan(String value) {
+            addCriterion("code <", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThanOrEqualTo(String value) {
+            addCriterion("code <=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLike(String value) {
+            addCriterion("code like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotLike(String value) {
+            addCriterion("code not like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("code in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotIn(List<String> values) {
+            addCriterion("code not in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeBetween(String value1, String value2) {
+            addCriterion("code between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotBetween(String value1, String value2) {
+            addCriterion("code not between", value1, value2, "code");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 23 - 0
modelsrc/com/miniframe/model/system/DPipe.java

@@ -63,6 +63,11 @@ public class DPipe extends MiniserviceBaseModel implements Serializable {
     @Column(name = "section_para5")
     private Float sectionPara5;
 
+    /**
+     * 管道编号
+     */
+    private String code;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -254,4 +259,22 @@ public class DPipe extends MiniserviceBaseModel implements Serializable {
     public void setSectionPara5(Float sectionPara5) {
         this.sectionPara5 = sectionPara5;
     }
+
+    /**
+     * 获取管道编号
+     *
+     * @return code - 管道编号
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * 设置管道编号
+     *
+     * @param code 管道编号
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
 }

+ 70 - 0
modelsrc/com/miniframe/model/system/DPipeSQLBuilder.java

@@ -783,6 +783,76 @@ public class DPipeSQLBuilder {
             addCriterion("section_para5 not between", value1, value2, "sectionPara5");
             return (Criteria) this;
         }
+
+        public Criteria andCodeIsNull() {
+            addCriterion("code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNotNull() {
+            addCriterion("code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEqualTo(String value) {
+            addCriterion("code =", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotEqualTo(String value) {
+            addCriterion("code <>", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThan(String value) {
+            addCriterion("code >", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("code >=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThan(String value) {
+            addCriterion("code <", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThanOrEqualTo(String value) {
+            addCriterion("code <=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLike(String value) {
+            addCriterion("code like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotLike(String value) {
+            addCriterion("code not like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("code in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotIn(List<String> values) {
+            addCriterion("code not in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeBetween(String value1, String value2) {
+            addCriterion("code between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotBetween(String value1, String value2) {
+            addCriterion("code not between", value1, value2, "code");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 1 - 1
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 Thu Apr 18 16:25:02 CST 2024.
+    This file was generated on Thu Apr 18 16:55:11 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

+ 1 - 0
src/main/java/com/miniframe/bisiness/system/D00000Service.java

@@ -49,6 +49,7 @@ public class D00000Service extends D00000BaseModel implements ExecProcessFlow {
 			row.setY(String.valueOf(dNode.getY()));
 			row.setZ(String.valueOf(dNode.getZ()));
 			row.setNtype(dNode.getNtype());
+			row.setCode(dNode.getCode());
 			rows.add(row);
 		}
 		this.getD_d00000().setRows(rows);

+ 1 - 1
src/main/java/com/miniframe/bisiness/system/D00001Service.java

@@ -53,7 +53,7 @@ public class D00001Service extends D00001BaseModel implements ExecProcessFlow {
 			row.setSectionPara3(String.valueOf(dp.getSectionPara3()));
 			row.setSectionPara4(String.valueOf(dp.getSectionPara4()));
 			row.setSectionPara5(String.valueOf(dp.getSectionPara5()));
-
+			row.setCode(dp.getCode());
 			rows.add(row);
 
 		}

+ 1 - 1
src/main/java/com/miniframe/bisiness/system/D00004Service.java

@@ -51,7 +51,7 @@ public class D00004Service extends D00004BaseModel implements ExecProcessFlow {
 		DSource ds =new DSource();
 		ds.setAid(aid);
 		ds.setPid(pid);
-		ds.setPname(dp.getName());
+		ds.setPname(dp.getCode());
 		ds.setSite((float)this.getA_d00004().getSite());
 		dsm.insertSelective(ds);
 	}

+ 7 - 4
src/main/java/com/miniframe/bisiness/system/D10000Service.java

@@ -29,28 +29,30 @@ public class D10000Service extends D10000BaseModel implements ExecProcessFlow {
 		String name =this.getA_d10000().getName();
 		String ntype =this.getA_d10000().getNtype();
 		String desc =this.getA_d10000().getDesc();
+		String code =this.getA_d10000().getCode();
 
 		if(nid ==null || nid<=0){//添加
 			pdXYZ(dNodeDao, x, y, z);
-			saveNode(dNodeDao, x, y, z, name, ntype, desc);
+			saveNode(dNodeDao, x, y, z, name, ntype, desc,code);
 		}else{//修改
 			DNode node =findById(dNodeDao, nid);
 			pdXYZExId(dNodeDao,x,y,z,nid);
-			updateNode(dNodeDao, x, y, z, name, ntype, desc, node);
+			updateNode(dNodeDao, x, y, z, name, ntype, desc, node,code);
 		}
 	}
 
-	private void updateNode(DNodeMapper dNodeDao, String x, String y, String z, String name, String ntype, String desc, DNode node) {
+	private void updateNode(DNodeMapper dNodeDao, String x, String y, String z, String name, String ntype, String desc, DNode node,String code) {
 		node.setName(name);
 		node.setnDesc(desc);
 		node.setNtype(ntype);
 		node.setX(x);
 		node.setY(y);
 		node.setZ(z);
+		node.setCode(code);
 		dNodeDao.updateByPrimaryKey(node);
 	}
 
-	private void saveNode(DNodeMapper dNodeDao, String x, String y, String z, String name, String ntype, String desc) {
+	private void saveNode(DNodeMapper dNodeDao, String x, String y, String z, String name, String ntype, String desc,String code) {
 		DNode node =new DNode();
 		node.setName(name);
 		node.setnDesc(desc);
@@ -58,6 +60,7 @@ public class D10000Service extends D10000BaseModel implements ExecProcessFlow {
 		node.setX(x);
 		node.setY(y);
 		node.setZ(z);
+		node.setCode(code);
 		dNodeDao.insertSelective(node);
 	}
 

+ 13 - 5
src/main/java/com/miniframe/bisiness/system/D10002Service.java

@@ -35,7 +35,7 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 		String sectionPara3 =this.getA_d10002().getSectionPara3();
 		String sectionPara4 =this.getA_d10002().getSectionPara4();
 		String sectionPara5 =this.getA_d10002().getSectionPara5();
-
+		String code =this.getA_d10002().getCode();
 
 		DNodeMapper nodeMapper =UtilTools.getBean(DNodeMapper.class);
 		DNode sNode = nodeMapper.selectByPrimaryKey(snId);
@@ -46,14 +46,16 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 
 		if(pid ==null || pid<=0){//添加
 			pdSnIdEnId(dPipeDao,snId,enId);
-			savePipe(dPipeDao, name, snId, enId, roughCoe, sectionType, sectionPara1, sectionPara2, sectionPara3, sectionPara4, sectionPara5);
+			savePipe(dPipeDao, name, snId, enId, roughCoe,
+					sectionType, sectionPara1, sectionPara2, sectionPara3, sectionPara4, sectionPara5,code);
 		}else{//修改
 			DPipe pipe =dPipeDao.selectByPrimaryKey(pid);
 			pdSnIdEnIdNotPid(dPipeDao,snId,enId,pid);
 			if(pipe==null){
 				throw new BusinessException("EB3100002");
 			}
-			updatePipe(dPipeDao, name, snId, enId, roughCoe, sectionType, sectionPara1, sectionPara2, sectionPara3, sectionPara4, sectionPara5, pipe);
+			updatePipe(dPipeDao, name, snId, enId, roughCoe, sectionType, sectionPara1, sectionPara2, sectionPara3, sectionPara4,
+					sectionPara5, pipe,code);
 		}
 
 	}
@@ -72,7 +74,9 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 	}
 
 
-	private void updatePipe(DPipeMapper dPipeDao, String name, Integer snId, Integer enId, String roughCoe, String sectionType, String sectionPara1, String sectionPara2, String sectionPara3, String sectionPara4, String sectionPara5, DPipe pipe) {
+	private void updatePipe(DPipeMapper dPipeDao, String name, Integer snId, Integer enId, String roughCoe,
+							String sectionType, String sectionPara1, String sectionPara2, String sectionPara3,
+							String sectionPara4, String sectionPara5, DPipe pipe,String code) {
 		pipe.setName(name);
 		pipe.setSnid(snId);
 		pipe.setEnid(enId);
@@ -83,6 +87,7 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 		pipe.setSectionPara3(Float.valueOf(!StringUtil.isEmpty(sectionPara3)?sectionPara3:"0"));
 		pipe.setSectionPara4(Float.valueOf(!StringUtil.isEmpty(sectionPara4)?sectionPara4:"0"));
 		pipe.setSectionPara5(Float.valueOf(!StringUtil.isEmpty(sectionPara5)?sectionPara5:"0"));
+		pipe.setCode(code);
 		dPipeDao.updateByPrimaryKey(pipe);
 	}
 
@@ -98,7 +103,9 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 		}
 	}
 
-	private void savePipe(DPipeMapper dPipeDao, String name, Integer snId, Integer enId, String roughCoe, String sectionType, String sectionPara1, String sectionPara2, String sectionPara3, String sectionPara4, String sectionPara5) {
+	private void savePipe(DPipeMapper dPipeDao, String name, Integer snId, Integer enId, String roughCoe, String sectionType,
+						  String sectionPara1, String sectionPara2, String sectionPara3, String sectionPara4, String sectionPara5,
+	String code) {
 		DPipe pipe =new DPipe();
 		pipe.setName(name);
 		pipe.setSnid(snId);
@@ -110,6 +117,7 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 		pipe.setSectionPara3(Float.valueOf(!StringUtil.isEmpty(sectionPara3)?sectionPara3:"0"));
 		pipe.setSectionPara4(Float.valueOf(!StringUtil.isEmpty(sectionPara4)?sectionPara4:"0"));
 		pipe.setSectionPara5(Float.valueOf(!StringUtil.isEmpty(sectionPara5)?sectionPara5:"0"));
+		pipe.setCode(code);
 		dPipeDao.insertSelective(pipe);
 	}
 

+ 1 - 1
src/main/java/com/miniframe/bisiness/system/D10005Service.java

@@ -32,7 +32,7 @@ public class D10005Service extends D10005BaseModel implements ExecProcessFlow {
 		if(pipe==null){
 			throw new BusinessException("EB3100015");
 		}
-		String pname =pipe.getName();
+		String pname =pipe.getCode();
 		if(cid ==null||cid<=0 ){//添加
 			pdPidSite(checknodeDao, pid, (float) site);
 			DChecknode node =new DChecknode();

+ 6 - 1
src/main/java/com/miniframe/bisiness/system/D10008Service.java

@@ -7,7 +7,9 @@ import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.system.model.D10008BaseModel;
 import com.miniframe.model.system.DBoundary;
 import com.miniframe.model.system.DBoundarySQLBuilder;
+import com.miniframe.model.system.DNode;
 import com.miniframe.model.system.dao.DBoundaryMapper;
+import com.miniframe.model.system.dao.DNodeMapper;
 import tk.mybatis.mapper.util.StringUtil;
 
 /**
@@ -24,7 +26,10 @@ public class D10008Service extends D10008BaseModel implements ExecProcessFlow {
 		Integer bid =this.getA_d10008().getBid();
 		Integer nid =this.getA_d10008().getNid();
 		Integer aid =this.getA_d10008().getAid();
-		String nname =this.getA_d10008().getNname();
+//		String nname =this.getA_d10008().getNname();
+		DNodeMapper nodeMapper = UtilTools.getBean(DNodeMapper.class);
+		DNode node =nodeMapper.selectByPrimaryKey(nid);
+		String nname=node.getCode();
 		String type =this.getA_d10008().getType();
 		String flow=this.getA_d10008().getFlow();
 		String pressure=this.getA_d10008().getPressure();

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

@@ -8,3 +8,4 @@
 2.5,z,z,string,,,,1,128,,,,,,
 2.6,desc,描述,string,,,,1,128,,,,,,
 2.7,ntype,类型,string,,,,1,128,,,,,,
+2.8,code,编号,string,,,,1,128,,,,,,

+ 1 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D00001_D(管道数据查询).csv

@@ -12,3 +12,4 @@
 2.9,sectionPara3,截面参数3,string,,,,1,128,,,,,,
 2.10,sectionPara4,截面参数4,string,,,,1,128,,,,,,
 2.11,sectionPara5,截面参数5,string,,,,1,128,,,,,,
+2.12,code,编号,string,,,,1,128,,,,,,

+ 1 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10000_A(节点数据添加修改).csv

@@ -6,3 +6,4 @@
 5,z,z,string,,,是,1,128,,,,,,
 6,desc,描述,string,,,,1,128,,,,,,
 7,ntype,类型默认值,string,,,是,1,128,,,,,,
+8,code,编号,string,,,是,1,128,,,,,,

+ 2 - 1
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10002_A(管道数据添加修改).csv

@@ -9,4 +9,5 @@
 8,sectionPara2,截面参数2,string,,,,1,128,,,,,,
 9,sectionPara3,截面参数3,string,,,,1,128,,,,,,
 10,sectionPara4,截面参数4,string,,,,1,128,,,,,,
-11,sectionPara5,截面参数5,string,,,,1,128,,,,,,
+11,sectionPara5,截面参数5,string,,,,1,128,,,,,,
+12,code,编号,string,,,是,1,128,,,,,,