Browse Source

粗糙系数名称 添加

huangxingxing 9 months ago
parent
commit
808a93c075

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

@@ -191,4 +191,17 @@ public class A_D10002 extends BaseMapModel implements Serializable {
 	public String getBfid() {
 	public String getBfid() {
 		return this.bfid;
 		return this.bfid;
 	}
 	}
+	String roughCoeName;//粗糙系数名称
+	/**
+	 *粗糙系数名称
+	 */
+	public void setRoughCoeName(String roughCoeName) {
+		this.roughCoeName=roughCoeName;
+	}
+	/**
+	 *粗糙系数名称
+	 */
+	public String getRoughCoeName() {
+		return this.roughCoeName;
+	}
 }
 }

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

@@ -217,4 +217,17 @@ public class D_D00001_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getBfname() {
 	public String getBfname() {
 		return this.bfname;
 		return this.bfname;
 	}
 	}
+	String roughCoeName;//粗糙系数名称
+	/**
+	 *粗糙系数名称
+	 */
+	public void setRoughCoeName(String roughCoeName) {
+		this.roughCoeName=roughCoeName;
+	}
+	/**
+	 *粗糙系数名称
+	 */
+	public String getRoughCoeName() {
+		return this.roughCoeName;
+	}
 }
 }

+ 13 - 0
generated/validateform/a_d10002Form.xml

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

+ 1 - 0
generated/validator/resources_a_d10002Form_validator.properties

@@ -12,4 +12,5 @@ a_d10002.sectionPara5 = \u622A\u9762\u53C2\u65705
 a_d10002.code = \u7F16\u53F7
 a_d10002.code = \u7F16\u53F7
 a_d10002.gfid = \u7F51\u683C\u6587\u4EF6ID
 a_d10002.gfid = \u7F51\u683C\u6587\u4EF6ID
 a_d10002.bfid = \u8FB9\u754C\u6587\u4EF6ID
 a_d10002.bfid = \u8FB9\u754C\u6587\u4EF6ID
+a_d10002.roughCoeName = \u7C97\u7CD9\u7CFB\u6570\u540D\u79F0
 a_d10002Form = true
 a_d10002Form = true

+ 1 - 0
generated/validator/resources_a_d10002Form_validator_zh_CN.properties

@@ -12,4 +12,5 @@ a_d10002.sectionPara5 = \u622A\u9762\u53C2\u65705
 a_d10002.code = \u7F16\u53F7
 a_d10002.code = \u7F16\u53F7
 a_d10002.gfid = \u7F51\u683C\u6587\u4EF6ID
 a_d10002.gfid = \u7F51\u683C\u6587\u4EF6ID
 a_d10002.bfid = \u8FB9\u754C\u6587\u4EF6ID
 a_d10002.bfid = \u8FB9\u754C\u6587\u4EF6ID
+a_d10002.roughCoeName = \u7C97\u7CD9\u7CFB\u6570\u540D\u79F0
 a_d10002Form = true
 a_d10002Form = true

+ 1 - 0
generated/validator/resources_d_d00001_rows_recodeForm_validator.properties

@@ -14,4 +14,5 @@ d_d00001_rows_recode.gfid = \u7F51\u683C\u6587\u4EF6ID
 d_d00001_rows_recode.bfid = \u8FB9\u754C\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.gfname = \u7F51\u683C\u6587\u4EF6\u540D\u79F0
 d_d00001_rows_recode.bfname = \u8FB9\u754C\u6587\u4EF6\u540D\u79F0
 d_d00001_rows_recode.bfname = \u8FB9\u754C\u6587\u4EF6\u540D\u79F0
+d_d00001_rows_recode.roughCoeName = \u7C97\u7CD9\u7CFB\u6570\u540D\u79F0
 d_d00001_rows_recodeForm = true
 d_d00001_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d00001_rows_recodeForm_validator_zh_CN.properties

@@ -14,4 +14,5 @@ d_d00001_rows_recode.gfid = \u7F51\u683C\u6587\u4EF6ID
 d_d00001_rows_recode.bfid = \u8FB9\u754C\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.gfname = \u7F51\u683C\u6587\u4EF6\u540D\u79F0
 d_d00001_rows_recode.bfname = \u8FB9\u754C\u6587\u4EF6\u540D\u79F0
 d_d00001_rows_recode.bfname = \u8FB9\u754C\u6587\u4EF6\u540D\u79F0
+d_d00001_rows_recode.roughCoeName = \u7C97\u7CD9\u7CFB\u6570\u540D\u79F0
 d_d00001_rows_recodeForm = true
 d_d00001_rows_recodeForm = true

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

@@ -88,6 +88,12 @@ public class DPipe extends MiniserviceBaseModel implements Serializable {
      */
      */
     private String bfname;
     private String bfname;
 
 
+    /**
+     * 粗糙名称
+     */
+    @Column(name = "rough_coe_name")
+    private String roughCoeName;
+
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     /**
     /**
@@ -369,4 +375,22 @@ public class DPipe extends MiniserviceBaseModel implements Serializable {
     public void setBfname(String bfname) {
     public void setBfname(String bfname) {
         this.bfname = bfname == null ? null : bfname.trim();
         this.bfname = bfname == null ? null : bfname.trim();
     }
     }
+
+    /**
+     * 获取粗糙名称
+     *
+     * @return rough_coe_name - 粗糙名称
+     */
+    public String getRoughCoeName() {
+        return roughCoeName;
+    }
+
+    /**
+     * 设置粗糙名称
+     *
+     * @param roughCoeName 粗糙名称
+     */
+    public void setRoughCoeName(String roughCoeName) {
+        this.roughCoeName = roughCoeName == null ? null : roughCoeName.trim();
+    }
 }
 }

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

@@ -1133,6 +1133,76 @@ public class DPipeSQLBuilder {
             addCriterion("bfname not between", value1, value2, "bfname");
             addCriterion("bfname not between", value1, value2, "bfname");
             return (Criteria) this;
             return (Criteria) this;
         }
         }
+
+        public Criteria andRoughCoeNameIsNull() {
+            addCriterion("rough_coe_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoughCoeNameIsNotNull() {
+            addCriterion("rough_coe_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoughCoeNameEqualTo(String value) {
+            addCriterion("rough_coe_name =", value, "roughCoeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoughCoeNameNotEqualTo(String value) {
+            addCriterion("rough_coe_name <>", value, "roughCoeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoughCoeNameGreaterThan(String value) {
+            addCriterion("rough_coe_name >", value, "roughCoeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoughCoeNameGreaterThanOrEqualTo(String value) {
+            addCriterion("rough_coe_name >=", value, "roughCoeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoughCoeNameLessThan(String value) {
+            addCriterion("rough_coe_name <", value, "roughCoeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoughCoeNameLessThanOrEqualTo(String value) {
+            addCriterion("rough_coe_name <=", value, "roughCoeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoughCoeNameLike(String value) {
+            addCriterion("rough_coe_name like", value, "roughCoeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoughCoeNameNotLike(String value) {
+            addCriterion("rough_coe_name not like", value, "roughCoeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoughCoeNameIn(List<String> values) {
+            addCriterion("rough_coe_name in", values, "roughCoeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoughCoeNameNotIn(List<String> values) {
+            addCriterion("rough_coe_name not in", values, "roughCoeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoughCoeNameBetween(String value1, String value2) {
+            addCriterion("rough_coe_name between", value1, value2, "roughCoeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andRoughCoeNameNotBetween(String value1, String value2) {
+            addCriterion("rough_coe_name not between", value1, value2, "roughCoeName");
+            return (Criteria) this;
+        }
     }
     }
 
 
     public static class Criteria extends GeneratedCriteria {
     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 generated by MyBatis Generator.
     This file is the shell of a Mapper Config file - in many cases you will need to add
     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.
       to this file before it is usable by MyBatis.
-    This file was generated on Wed Dec 11 19:04:02 CST 2024.
+    This file was generated on Thu Dec 12 15:52:34 CST 2024.
   -->
   -->
   <mappers>
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

@@ -58,6 +58,7 @@ public class D00001Service extends D00001BaseModel implements ExecProcessFlow {
 			row.setGfname(dp.getGfname());
 			row.setGfname(dp.getGfname());
 			row.setBfid(dp.getBfid());
 			row.setBfid(dp.getBfid());
 			row.setBfname(dp.getBfname());
 			row.setBfname(dp.getBfname());
+			row.setRoughCoeName(dp.getRoughCoeName());
 			rows.add(row);
 			rows.add(row);
 
 
 		}
 		}

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

@@ -37,6 +37,7 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 		String sectionPara3 =this.getA_d10002().getSectionPara3();
 		String sectionPara3 =this.getA_d10002().getSectionPara3();
 		String sectionPara4 =this.getA_d10002().getSectionPara4();
 		String sectionPara4 =this.getA_d10002().getSectionPara4();
 		String sectionPara5 =this.getA_d10002().getSectionPara5();
 		String sectionPara5 =this.getA_d10002().getSectionPara5();
+		String roughCoeName=this.getA_d10002().getRoughCoeName();
 		String code =this.getA_d10002().getCode();
 		String code =this.getA_d10002().getCode();
 
 
 
 
@@ -62,7 +63,7 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 		if(pid ==null || pid<=0){//添加
 		if(pid ==null || pid<=0){//添加
 			pdSnIdEnId(dPipeDao,snId,enId);
 			pdSnIdEnId(dPipeDao,snId,enId);
 			savePipe(dPipeDao, name, snId, enId, roughCoe,
 			savePipe(dPipeDao, name, snId, enId, roughCoe,
-					sectionType, sectionPara1, sectionPara2, sectionPara3, sectionPara4, sectionPara5,code,gf,bf);
+					sectionType, sectionPara1, sectionPara2, sectionPara3, sectionPara4, sectionPara5,code,roughCoeName,gf,bf);
 		}else{//修改
 		}else{//修改
 			DPipe pipe =dPipeDao.selectByPrimaryKey(pid);
 			DPipe pipe =dPipeDao.selectByPrimaryKey(pid);
 			pdSnIdEnIdNotPid(dPipeDao,snId,enId,pid);
 			pdSnIdEnIdNotPid(dPipeDao,snId,enId,pid);
@@ -70,7 +71,7 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 				throw new BusinessException("EB3100002");
 				throw new BusinessException("EB3100002");
 			}
 			}
 			updatePipe(dPipeDao, name, snId, enId, roughCoe, sectionType, sectionPara1, sectionPara2, sectionPara3, sectionPara4,
 			updatePipe(dPipeDao, name, snId, enId, roughCoe, sectionType, sectionPara1, sectionPara2, sectionPara3, sectionPara4,
-					sectionPara5, pipe,code,gf,bf);
+					sectionPara5,roughCoeName, pipe,code,gf,bf);
 		}
 		}
 
 
 
 
@@ -94,7 +95,7 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 
 
 	private void updatePipe(DPipeMapper dPipeDao, String name, Integer snId, Integer enId, String roughCoe,
 	private void updatePipe(DPipeMapper dPipeDao, String name, Integer snId, Integer enId, String roughCoe,
 							String sectionType, String sectionPara1, String sectionPara2, String sectionPara3,
 							String sectionType, String sectionPara1, String sectionPara2, String sectionPara3,
-							String sectionPara4, String sectionPara5, DPipe pipe,String code,SysFile gf,SysFile bf) {
+							String sectionPara4, String sectionPara5,String roughCoeName, DPipe pipe,String code,SysFile gf,SysFile bf) {
 		pipe.setName(name);
 		pipe.setName(name);
 		pipe.setSnid(snId);
 		pipe.setSnid(snId);
 		pipe.setEnid(enId);
 		pipe.setEnid(enId);
@@ -110,6 +111,7 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 		pipe.setGfname(gf.getFilename());
 		pipe.setGfname(gf.getFilename());
 		pipe.setBfid(bf.getId());
 		pipe.setBfid(bf.getId());
 		pipe.setBfname(bf.getFilename());
 		pipe.setBfname(bf.getFilename());
+		pipe.setRoughCoeName(roughCoeName);
 		dPipeDao.updateByPrimaryKey(pipe);
 		dPipeDao.updateByPrimaryKey(pipe);
 	}
 	}
 
 
@@ -127,7 +129,7 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 
 
 	private void savePipe(DPipeMapper dPipeDao, String name, Integer snId, Integer enId, String roughCoe, String sectionType,
 	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 sectionPara1, String sectionPara2, String sectionPara3, String sectionPara4, String sectionPara5,
-	String code,SysFile gf,SysFile bf) {
+	String code,String roughCoeName ,SysFile gf,SysFile bf) {
 		DPipe pipe =new DPipe();
 		DPipe pipe =new DPipe();
 		pipe.setName(name);
 		pipe.setName(name);
 		pipe.setSnid(snId);
 		pipe.setSnid(snId);
@@ -144,6 +146,7 @@ public class D10002Service extends D10002BaseModel implements ExecProcessFlow {
 		pipe.setGfname(gf.getFilename());
 		pipe.setGfname(gf.getFilename());
 		pipe.setBfid(bf.getId());
 		pipe.setBfid(bf.getId());
 		pipe.setBfname(bf.getFilename());
 		pipe.setBfname(bf.getFilename());
+		pipe.setRoughCoeName(roughCoeName);
 		dPipeDao.insertSelective(pipe);
 		dPipeDao.insertSelective(pipe);
 	}
 	}
 
 

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

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

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

@@ -16,4 +16,5 @@
 2.13,gfid,网格文件ID,string,,,,,,,,,,,
 2.13,gfid,网格文件ID,string,,,,,,,,,,,
 2.14,bfid,边界文件ID,string,,,,,,,,,,,
 2.14,bfid,边界文件ID,string,,,,,,,,,,,
 2.15,gfname,网格文件名称,string,,,,,,,,,,,
 2.15,gfname,网格文件名称,string,,,,,,,,,,,
-2.16,bfname,边界文件名称,string,,,,,,,,,,,
+2.16,bfname,边界文件名称,string,,,,,,,,,,,
+2.17,roughCoeName,粗糙系数名称,string,,,,,,,,,,,

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

@@ -12,4 +12,5 @@
 11,sectionPara5,截面参数5,string,,,,1,128,,,,,,
 11,sectionPara5,截面参数5,string,,,,1,128,,,,,,
 12,code,编号,string,,,,,,,,,,,
 12,code,编号,string,,,,,,,,,,,
 13,gfid,网格文件ID,string,,,,,,,,,,,
 13,gfid,网格文件ID,string,,,,,,,,,,,
-14,bfid,边界文件ID,string,,,,,,,,,,,
+14,bfid,边界文件ID,string,,,,,,,,,,,
+15,roughCoeName,粗糙系数名称,string,,,,1,100,,,,,,