求解保存 巷道选择

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

@@ -165,4 +165,30 @@ public class A_D10002 extends BaseMapModel implements Serializable {
 	public String getCode() {
 		return this.code;
 	}
+	String gfid;//网格文件ID
+	/**
+	 *网格文件ID
+	 */
+	public void setGfid(String gfid) {
+		this.gfid=gfid;
+	}
+	/**
+	 *网格文件ID
+	 */
+	public String getGfid() {
+		return this.gfid;
+	}
+	String bfid;//边界文件ID
+	/**
+	 *边界文件ID
+	 */
+	public void setBfid(String bfid) {
+		this.bfid=bfid;
+	}
+	/**
+	 *边界文件ID
+	 */
+	public String getBfid() {
+		return this.bfid;
+	}
 }

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

@@ -22,32 +22,6 @@ public class A_D10021 extends BaseMapModel implements Serializable {
 	public int getGid() {
 		return this.gid;
 	}
-	String gfid;//网格文件ID
-	/**
-	 *网格文件ID
-	 */
-	public void setGfid(String gfid) {
-		this.gfid=gfid;
-	}
-	/**
-	 *网格文件ID
-	 */
-	public String getGfid() {
-		return this.gfid;
-	}
-	String bfid;//边界文件ID
-	/**
-	 *边界文件ID
-	 */
-	public void setBfid(String bfid) {
-		this.bfid=bfid;
-	}
-	/**
-	 *边界文件ID
-	 */
-	public String getBfid() {
-		return this.bfid;
-	}
 	int aid;//事故
 	/**
 	 *事故
@@ -61,4 +35,17 @@ public class A_D10021 extends BaseMapModel implements Serializable {
 	public int getAid() {
 		return this.aid;
 	}
+	int pid;//巷道ID
+	/**
+	 *巷道ID
+	 */
+	public void setPid(int pid) {
+		this.pid=pid;
+	}
+	/**
+	 *巷道ID
+	 */
+	public int getPid() {
+		return this.pid;
+	}
 }

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

@@ -165,4 +165,56 @@ public class D_D00001_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getCode() {
 		return this.code;
 	}
+	String gfid;//网格文件ID
+	/**
+	 *网格文件ID
+	 */
+	public void setGfid(String gfid) {
+		this.gfid=gfid;
+	}
+	/**
+	 *网格文件ID
+	 */
+	public String getGfid() {
+		return this.gfid;
+	}
+	String bfid;//边界文件ID
+	/**
+	 *边界文件ID
+	 */
+	public void setBfid(String bfid) {
+		this.bfid=bfid;
+	}
+	/**
+	 *边界文件ID
+	 */
+	public String getBfid() {
+		return this.bfid;
+	}
+	String gfname;//网格文件名称
+	/**
+	 *网格文件名称
+	 */
+	public void setGfname(String gfname) {
+		this.gfname=gfname;
+	}
+	/**
+	 *网格文件名称
+	 */
+	public String getGfname() {
+		return this.gfname;
+	}
+	String bfname;//边界文件名称
+	/**
+	 *边界文件名称
+	 */
+	public void setBfname(String bfname) {
+		this.bfname=bfname;
+	}
+	/**
+	 *边界文件名称
+	 */
+	public String getBfname() {
+		return this.bfname;
+	}
 }

generated/validateform/a_d10002Form.xml

@@ -101,19 +101,6 @@
       <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>

generated/validateform/a_d10021Form.xml

@@ -4,15 +4,12 @@
 <form-validation>
 <formset>
 <form name="a_d10021Form">
-<field property="gfid" depends="required">
-    <arg0 key="a_d10021.gfid"/>
-</field>
-<field property="bfid" depends="required">
-    <arg0 key="a_d10021.bfid"/>
-</field>
 <field property="aid" depends="required">
     <arg0 key="a_d10021.aid"/>
 </field>
+<field property="pid" depends="required">
+    <arg0 key="a_d10021.pid"/>
+</field>
 </form>
 </formset>
 </form-validation>

generated/validator/resources_a_d10002Form_validator.properties

@@ -10,4 +10,6 @@ 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_d10002.gfid = \u7F51\u683C\u6587\u4EF6ID
+a_d10002.bfid = \u8FB9\u754C\u6587\u4EF6ID
 a_d10002Form = true

generated/validator/resources_a_d10002Form_validator_zh_CN.properties

@@ -10,4 +10,6 @@ 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_d10002.gfid = \u7F51\u683C\u6587\u4EF6ID
+a_d10002.bfid = \u8FB9\u754C\u6587\u4EF6ID
 a_d10002Form = true

generated/validator/resources_a_d10021Form_validator.properties

@@ -1,5 +1,4 @@
 a_d10021.gid = \u74E6\u65AF\u707E\u60C5\u6E90id
-a_d10021.gfid = \u7F51\u683C\u6587\u4EF6ID
-a_d10021.bfid = \u8FB9\u754C\u6587\u4EF6ID
 a_d10021.aid = \u4E8B\u6545
+a_d10021.pid = \u5DF7\u9053ID
 a_d10021Form = true

generated/validator/resources_a_d10021Form_validator_zh_CN.properties

@@ -1,5 +1,4 @@
 a_d10021.gid = \u74E6\u65AF\u707E\u60C5\u6E90id
-a_d10021.gfid = \u7F51\u683C\u6587\u4EF6ID
-a_d10021.bfid = \u8FB9\u754C\u6587\u4EF6ID
 a_d10021.aid = \u4E8B\u6545
+a_d10021.pid = \u5DF7\u9053ID
 a_d10021Form = true

generated/validator/resources_d_d00001_rows_recodeForm_validator.properties

@@ -10,4 +10,8 @@ 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_recode.gfid = \u7F51\u683C\u6587\u4EF6ID
+d_d00001_rows_recode.bfid = \u8FB9\u754C\u6587\u4EF6ID
+d_d00001_rows_recode.gfname = \u7F51\u683C\u6587\u4EF6\u540D\u79F0
+d_d00001_rows_recode.bfname = \u8FB9\u754C\u6587\u4EF6\u540D\u79F0
 d_d00001_rows_recodeForm = true

generated/validator/resources_d_d00001_rows_recodeForm_validator_zh_CN.properties

@@ -10,4 +10,8 @@ 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_recode.gfid = \u7F51\u683C\u6587\u4EF6ID
+d_d00001_rows_recode.bfid = \u8FB9\u754C\u6587\u4EF6ID
+d_d00001_rows_recode.gfname = \u7F51\u683C\u6587\u4EF6\u540D\u79F0
+d_d00001_rows_recode.bfname = \u8FB9\u754C\u6587\u4EF6\u540D\u79F0
 d_d00001_rows_recodeForm = true

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

@@ -68,6 +68,26 @@ public class DPipe extends MiniserviceBaseModel implements Serializable {
      */
     private String code;
 
+    /**
+     * 网格文件ID
+     */
+    private String gfid;
+
+    /**
+     * 边界文件ID
+     */
+    private String bfid;
+
+    /**
+     * 网格文件名称
+     */
+    private String gfname;
+
+    /**
+     * 边界文件名称
+     */
+    private String bfname;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -277,4 +297,76 @@ public class DPipe extends MiniserviceBaseModel implements Serializable {
     public void setCode(String code) {
         this.code = code == null ? null : code.trim();
     }
+
+    /**
+     * 获取网格文件ID
+     *
+     * @return gfid - 网格文件ID
+     */
+    public String getGfid() {
+        return gfid;
+    }
+
+    /**
+     * 设置网格文件ID
+     *
+     * @param gfid 网格文件ID
+     */
+    public void setGfid(String gfid) {
+        this.gfid = gfid == null ? null : gfid.trim();
+    }
+
+    /**
+     * 获取边界文件ID
+     *
+     * @return bfid - 边界文件ID
+     */
+    public String getBfid() {
+        return bfid;
+    }
+
+    /**
+     * 设置边界文件ID
+     *
+     * @param bfid 边界文件ID
+     */
+    public void setBfid(String bfid) {
+        this.bfid = bfid == null ? null : bfid.trim();
+    }
+
+    /**
+     * 获取网格文件名称
+     *
+     * @return gfname - 网格文件名称
+     */
+    public String getGfname() {
+        return gfname;
+    }
+
+    /**
+     * 设置网格文件名称
+     *
+     * @param gfname 网格文件名称
+     */
+    public void setGfname(String gfname) {
+        this.gfname = gfname == null ? null : gfname.trim();
+    }
+
+    /**
+     * 获取边界文件名称
+     *
+     * @return bfname - 边界文件名称
+     */
+    public String getBfname() {
+        return bfname;
+    }
+
+    /**
+     * 设置边界文件名称
+     *
+     * @param bfname 边界文件名称
+     */
+    public void setBfname(String bfname) {
+        this.bfname = bfname == null ? null : bfname.trim();
+    }
 }

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

@@ -853,6 +853,286 @@ public class DPipeSQLBuilder {
             addCriterion("code not between", value1, value2, "code");
             return (Criteria) this;
         }
+
+        public Criteria andGfidIsNull() {
+            addCriterion("gfid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfidIsNotNull() {
+            addCriterion("gfid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfidEqualTo(String value) {
+            addCriterion("gfid =", value, "gfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfidNotEqualTo(String value) {
+            addCriterion("gfid <>", value, "gfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfidGreaterThan(String value) {
+            addCriterion("gfid >", value, "gfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfidGreaterThanOrEqualTo(String value) {
+            addCriterion("gfid >=", value, "gfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfidLessThan(String value) {
+            addCriterion("gfid <", value, "gfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfidLessThanOrEqualTo(String value) {
+            addCriterion("gfid <=", value, "gfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfidLike(String value) {
+            addCriterion("gfid like", value, "gfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfidNotLike(String value) {
+            addCriterion("gfid not like", value, "gfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfidIn(List<String> values) {
+            addCriterion("gfid in", values, "gfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfidNotIn(List<String> values) {
+            addCriterion("gfid not in", values, "gfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfidBetween(String value1, String value2) {
+            addCriterion("gfid between", value1, value2, "gfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfidNotBetween(String value1, String value2) {
+            addCriterion("gfid not between", value1, value2, "gfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfidIsNull() {
+            addCriterion("bfid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfidIsNotNull() {
+            addCriterion("bfid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfidEqualTo(String value) {
+            addCriterion("bfid =", value, "bfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfidNotEqualTo(String value) {
+            addCriterion("bfid <>", value, "bfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfidGreaterThan(String value) {
+            addCriterion("bfid >", value, "bfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfidGreaterThanOrEqualTo(String value) {
+            addCriterion("bfid >=", value, "bfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfidLessThan(String value) {
+            addCriterion("bfid <", value, "bfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfidLessThanOrEqualTo(String value) {
+            addCriterion("bfid <=", value, "bfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfidLike(String value) {
+            addCriterion("bfid like", value, "bfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfidNotLike(String value) {
+            addCriterion("bfid not like", value, "bfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfidIn(List<String> values) {
+            addCriterion("bfid in", values, "bfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfidNotIn(List<String> values) {
+            addCriterion("bfid not in", values, "bfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfidBetween(String value1, String value2) {
+            addCriterion("bfid between", value1, value2, "bfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfidNotBetween(String value1, String value2) {
+            addCriterion("bfid not between", value1, value2, "bfid");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfnameIsNull() {
+            addCriterion("gfname is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfnameIsNotNull() {
+            addCriterion("gfname is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfnameEqualTo(String value) {
+            addCriterion("gfname =", value, "gfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfnameNotEqualTo(String value) {
+            addCriterion("gfname <>", value, "gfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfnameGreaterThan(String value) {
+            addCriterion("gfname >", value, "gfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfnameGreaterThanOrEqualTo(String value) {
+            addCriterion("gfname >=", value, "gfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfnameLessThan(String value) {
+            addCriterion("gfname <", value, "gfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfnameLessThanOrEqualTo(String value) {
+            addCriterion("gfname <=", value, "gfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfnameLike(String value) {
+            addCriterion("gfname like", value, "gfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfnameNotLike(String value) {
+            addCriterion("gfname not like", value, "gfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfnameIn(List<String> values) {
+            addCriterion("gfname in", values, "gfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfnameNotIn(List<String> values) {
+            addCriterion("gfname not in", values, "gfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfnameBetween(String value1, String value2) {
+            addCriterion("gfname between", value1, value2, "gfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andGfnameNotBetween(String value1, String value2) {
+            addCriterion("gfname not between", value1, value2, "gfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfnameIsNull() {
+            addCriterion("bfname is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfnameIsNotNull() {
+            addCriterion("bfname is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfnameEqualTo(String value) {
+            addCriterion("bfname =", value, "bfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfnameNotEqualTo(String value) {
+            addCriterion("bfname <>", value, "bfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfnameGreaterThan(String value) {
+            addCriterion("bfname >", value, "bfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfnameGreaterThanOrEqualTo(String value) {
+            addCriterion("bfname >=", value, "bfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfnameLessThan(String value) {
+            addCriterion("bfname <", value, "bfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfnameLessThanOrEqualTo(String value) {
+            addCriterion("bfname <=", value, "bfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfnameLike(String value) {
+            addCriterion("bfname like", value, "bfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfnameNotLike(String value) {
+            addCriterion("bfname not like", value, "bfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfnameIn(List<String> values) {
+            addCriterion("bfname in", values, "bfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfnameNotIn(List<String> values) {
+            addCriterion("bfname not in", values, "bfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfnameBetween(String value1, String value2) {
+            addCriterion("bfname between", value1, value2, "bfname");
+            return (Criteria) this;
+        }
+
+        public Criteria andBfnameNotBetween(String value1, String value2) {
+            addCriterion("bfname not between", value1, value2, "bfname");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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 Sat Apr 20 11:22:36 CST 2024.
+    This file was generated on Tue May 28 09:56:16 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

@@ -54,6 +54,10 @@ public class D00001Service extends D00001BaseModel implements ExecProcessFlow {
 			row.setSectionPara4(String.valueOf(dp.getSectionPara4()));
 			row.setSectionPara5(String.valueOf(dp.getSectionPara5()));
 			row.setCode(dp.getCode());
+			row.setGfid(dp.getGfid());
+			row.setGfname(dp.getGfname());
+			row.setBfid(dp.getBfid());
+			row.setBfname(dp.getBfname());
 			rows.add(row);
 
 		}

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

@@ -8,8 +8,10 @@ import com.miniframe.generate.business.system.model.D10002BaseModel;
 import com.miniframe.model.system.DNode;
 import com.miniframe.model.system.DPipe;
 import com.miniframe.model.system.DPipeSQLBuilder;
+import com.miniframe.model.system.SysFile;
 import com.miniframe.model.system.dao.DNodeMapper;
 import com.miniframe.model.system.dao.DPipeMapper;
+import com.miniframe.model.system.dao.SysFileMapper;
 import tk.mybatis.mapper.util.StringUtil;
 
 /**
@@ -37,6 +39,19 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 		String sectionPara5 =this.getA_d10002().getSectionPara5();
 		String code =this.getA_d10002().getCode();
 
+
+		String gfid = this.getA_d10002().getGfid();
+		String bfid = this.getA_d10002().getBfid();
+		SysFileMapper sysFileMapper = UtilTools.getBean(SysFileMapper.class);
+		SysFile gf = sysFileMapper.selectByPrimaryKey(gfid);
+		if (gf == null) {
+			throw new BusinessException("EB3100020");
+		}
+		SysFile bf = sysFileMapper.selectByPrimaryKey(bfid);
+		if (bf == null) {
+			throw new BusinessException("EB3100021");
+		}
+
 		DNodeMapper nodeMapper =UtilTools.getBean(DNodeMapper.class);
 		DNode sNode = nodeMapper.selectByPrimaryKey(snId);
 		DNode eNode = nodeMapper.selectByPrimaryKey(enId);
@@ -47,7 +62,7 @@ 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,code);
+					sectionType, sectionPara1, sectionPara2, sectionPara3, sectionPara4, sectionPara5,code,gf,bf);
 		}else{//修改
 			DPipe pipe =dPipeDao.selectByPrimaryKey(pid);
 			pdSnIdEnIdNotPid(dPipeDao,snId,enId,pid);
@@ -55,9 +70,12 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 				throw new BusinessException("EB3100002");
 			}
 			updatePipe(dPipeDao, name, snId, enId, roughCoe, sectionType, sectionPara1, sectionPara2, sectionPara3, sectionPara4,
-					sectionPara5, pipe,code);
+					sectionPara5, pipe,code,gf,bf);
 		}
 
+
+
+
 	}
 
 
@@ -76,7 +94,7 @@ 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,String code) {
+							String sectionPara4, String sectionPara5, DPipe pipe,String code,SysFile gf,SysFile bf) {
 		pipe.setName(name);
 		pipe.setSnid(snId);
 		pipe.setEnid(enId);
@@ -88,6 +106,10 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 		pipe.setSectionPara4(Float.valueOf(!StringUtil.isEmpty(sectionPara4)?sectionPara4:"0"));
 		pipe.setSectionPara5(Float.valueOf(!StringUtil.isEmpty(sectionPara5)?sectionPara5:"0"));
 		pipe.setCode(code);
+		pipe.setGfid(gf.getId());
+		pipe.setGfname(gf.getFilename());
+		pipe.setBfid(bf.getId());
+		pipe.setBfname(bf.getFilename());
 		dPipeDao.updateByPrimaryKey(pipe);
 	}
 
@@ -105,7 +127,7 @@ 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,
-	String code) {
+	String code,SysFile gf,SysFile bf) {
 		DPipe pipe =new DPipe();
 		pipe.setName(name);
 		pipe.setSnid(snId);
@@ -118,6 +140,10 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 		pipe.setSectionPara4(Float.valueOf(!StringUtil.isEmpty(sectionPara4)?sectionPara4:"0"));
 		pipe.setSectionPara5(Float.valueOf(!StringUtil.isEmpty(sectionPara5)?sectionPara5:"0"));
 		pipe.setCode(code);
+		pipe.setGfid(gf.getId());
+		pipe.setGfname(gf.getFilename());
+		pipe.setBfid(bf.getId());
+		pipe.setBfname(bf.getFilename());
 		dPipeDao.insertSelective(pipe);
 	}
 

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

@@ -15,10 +15,7 @@ import com.miniframe.generate.business.system.model.D10021BaseModel;
 import com.miniframe.generate.comm.system.D_D10016_CHVALS_RECODE;
 import com.miniframe.generate.comm.system.D_D10016_COCODES_RECODE;
 import com.miniframe.model.system.*;
-import com.miniframe.model.system.dao.DAccidentMapper;
-import com.miniframe.model.system.dao.DGasGatherAreaMapper;
-import com.miniframe.model.system.dao.DGasMapper;
-import com.miniframe.model.system.dao.SysFileMapper;
+import com.miniframe.model.system.dao.*;
 import com.miniframe.tools.XIFileUtils;
 
 import javax.rmi.CORBA.Util;
@@ -35,10 +32,18 @@ public class D10021Service extends D10021BaseModel implements ExecProcessFlow {
      */
     public void transExecute() throws Exception {
         Integer gid = this.getA_d10021().getGid();
-        String gfid = this.getA_d10021().getGfid();
-        String bfid = this.getA_d10021().getBfid();
+//        String gfid = this.getA_d10021().getGfid();
+//        String bfid = this.getA_d10021().getBfid();
+        Integer pid =this.getA_d10021().getPid();
         Integer aid = this.getA_d10021().getAid();
 
+        DPipeMapper pipeMapper =UtilTools.getBean(DPipeMapper.class);
+        DPipe pipe =pipeMapper.selectByPrimaryKey(pid);
+        if (pipe == null) {
+            throw new BusinessException("EB3100020");
+        }
+        String gfid = pipe.getGfid();
+        String bfid = pipe.getBfid();
         SysFileMapper sysFileMapper = UtilTools.getBean(SysFileMapper.class);
         SysFile gf = sysFileMapper.selectByPrimaryKey(gfid);
         if (gf == null) {

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

@@ -12,4 +12,8 @@
 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,,,,,,
+2.12,code,编号,string,,,,1,128,,,,,,
+2.13,gfid,网格文件ID,string,,,,,,,,,,,
+2.14,bfid,边界文件ID,string,,,,,,,,,,,
+2.15,gfname,网格文件名称,string,,,,,,,,,,,
+2.16,bfname,边界文件名称,string,,,,,,,,,,,

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

@@ -10,4 +10,6 @@
 9,sectionPara3,截面参数3,string,,,,1,128,,,,,,
 10,sectionPara4,截面参数4,string,,,,1,128,,,,,,
 11,sectionPara5,截面参数5,string,,,,1,128,,,,,,
-12,code,编号,string,,,是,1,128,,,,,,
+12,code,编号,string,,,,,,,,,,,
+13,gfid,网格文件ID,string,,,,,,,,,,,
+14,bfid,边界文件ID,string,,,,,,,,,,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10021_A(瓦斯灾源添加修改).csv

@@ -1,5 +1,4 @@
 序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
 1,gid,瓦斯灾情源id,int,,,,,,,,,,,
-2,gfid,网格文件ID,string,,,是,,,,,,,,
-3,bfid,边界文件ID,string,,,是,,,,,,,,
-4,aid,事故,int,,,是,,,,,,,,
+2,aid,事故,int,,,是,,,,,,,,
+3,pid,巷道ID,int,,,是,,,,,,,,