监测点编号 名称

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

@@ -61,4 +61,17 @@ public class A_D10005 extends BaseMapModel implements Serializable {
 	public String getChname() {
 		return this.chname;
 	}
+	String chcode;//监测点编号
+	/**
+	 *监测点编号
+	 */
+	public void setChcode(String chcode) {
+		this.chcode=chcode;
+	}
+	/**
+	 *监测点编号
+	 */
+	public String getChcode() {
+		return this.chcode;
+	}
 }

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

@@ -74,4 +74,17 @@ public class D_D10004_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getChname() {
 		return this.chname;
 	}
+	String chcode;//监测点编号
+	/**
+	 *监测点编号
+	 */
+	public void setChcode(String chcode) {
+		this.chcode=chcode;
+	}
+	/**
+	 *监测点编号
+	 */
+	public String getChcode() {
+		return this.chcode;
+	}
 }

generated/validator/resources_a_d10005Form_validator.properties

@@ -2,4 +2,5 @@ a_d10005.cid = \u76D1\u6D4B\u70B9id
 a_d10005.pid = \u7BA1\u9053\u7F16\u53F7
 a_d10005.site = \u4F4D\u7F6E
 a_d10005.chname = \u76D1\u6D4B\u70B9\u540D\u79F0
+a_d10005.chcode = \u76D1\u6D4B\u70B9\u7F16\u53F7
 a_d10005Form = true

generated/validator/resources_a_d10005Form_validator_zh_CN.properties

@@ -2,4 +2,5 @@ a_d10005.cid = \u76D1\u6D4B\u70B9id
 a_d10005.pid = \u7BA1\u9053\u7F16\u53F7
 a_d10005.site = \u4F4D\u7F6E
 a_d10005.chname = \u76D1\u6D4B\u70B9\u540D\u79F0
+a_d10005.chcode = \u76D1\u6D4B\u70B9\u7F16\u53F7
 a_d10005Form = true

generated/validator/resources_d_d10004_rows_recodeForm_validator.properties

@@ -3,4 +3,5 @@ d_d10004_rows_recode.pid = \u7BA1\u9053\u7F16\u53F7
 d_d10004_rows_recode.site = \u4F4D\u7F6E
 d_d10004_rows_recode.pname = \u7BA1\u9053\u540D\u79F0
 d_d10004_rows_recode.chname = \u76D1\u6D4B\u70B9\u540D\u79F0
+d_d10004_rows_recode.chcode = \u76D1\u6D4B\u70B9\u7F16\u53F7
 d_d10004_rows_recodeForm = true

generated/validator/resources_d_d10004_rows_recodeForm_validator_zh_CN.properties

@@ -3,4 +3,5 @@ d_d10004_rows_recode.pid = \u7BA1\u9053\u7F16\u53F7
 d_d10004_rows_recode.site = \u4F4D\u7F6E
 d_d10004_rows_recode.pname = \u7BA1\u9053\u540D\u79F0
 d_d10004_rows_recode.chname = \u76D1\u6D4B\u70B9\u540D\u79F0
+d_d10004_rows_recode.chcode = \u76D1\u6D4B\u70B9\u7F16\u53F7
 d_d10004_rows_recodeForm = true

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

@@ -29,6 +29,11 @@ public class DChecknode extends MiniserviceBaseModel implements Serializable {
      */
     private String chname;
 
+    /**
+     * 监测点编号
+     */
+    private String chcode;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -116,4 +121,22 @@ public class DChecknode extends MiniserviceBaseModel implements Serializable {
     public void setChname(String chname) {
         this.chname = chname == null ? null : chname.trim();
     }
+
+    /**
+     * 获取监测点编号
+     *
+     * @return chcode - 监测点编号
+     */
+    public String getChcode() {
+        return chcode;
+    }
+
+    /**
+     * 设置监测点编号
+     *
+     * @param chcode 监测点编号
+     */
+    public void setChcode(String chcode) {
+        this.chcode = chcode == null ? null : chcode.trim();
+    }
 }

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

@@ -423,6 +423,76 @@ public class DChecknodeSQLBuilder {
             addCriterion("chname not between", value1, value2, "chname");
             return (Criteria) this;
         }
+
+        public Criteria andChcodeIsNull() {
+            addCriterion("chcode is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeIsNotNull() {
+            addCriterion("chcode is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeEqualTo(String value) {
+            addCriterion("chcode =", value, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeNotEqualTo(String value) {
+            addCriterion("chcode <>", value, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeGreaterThan(String value) {
+            addCriterion("chcode >", value, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("chcode >=", value, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeLessThan(String value) {
+            addCriterion("chcode <", value, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeLessThanOrEqualTo(String value) {
+            addCriterion("chcode <=", value, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeLike(String value) {
+            addCriterion("chcode like", value, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeNotLike(String value) {
+            addCriterion("chcode not like", value, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeIn(List<String> values) {
+            addCriterion("chcode in", values, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeNotIn(List<String> values) {
+            addCriterion("chcode not in", values, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeBetween(String value1, String value2) {
+            addCriterion("chcode between", value1, value2, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeNotBetween(String value1, String value2) {
+            addCriterion("chcode not between", value1, value2, "chcode");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -41,6 +41,11 @@ public class DChecknodeVal extends MiniserviceBaseModel implements Serializable
      */
     private Integer step;
 
+    /**
+     * 监测点编号
+     */
+    private String chcode;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -212,4 +217,22 @@ public class DChecknodeVal extends MiniserviceBaseModel implements Serializable
     public void setStep(Integer step) {
         this.step = step;
     }
+
+    /**
+     * 获取监测点编号
+     *
+     * @return chcode - 监测点编号
+     */
+    public String getChcode() {
+        return chcode;
+    }
+
+    /**
+     * 设置监测点编号
+     *
+     * @param chcode 监测点编号
+     */
+    public void setChcode(String chcode) {
+        this.chcode = chcode == null ? null : chcode.trim();
+    }
 }

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

@@ -833,6 +833,76 @@ public class DChecknodeValSQLBuilder {
             addCriterion("step not between", value1, value2, "step");
             return (Criteria) this;
         }
+
+        public Criteria andChcodeIsNull() {
+            addCriterion("chcode is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeIsNotNull() {
+            addCriterion("chcode is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeEqualTo(String value) {
+            addCriterion("chcode =", value, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeNotEqualTo(String value) {
+            addCriterion("chcode <>", value, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeGreaterThan(String value) {
+            addCriterion("chcode >", value, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("chcode >=", value, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeLessThan(String value) {
+            addCriterion("chcode <", value, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeLessThanOrEqualTo(String value) {
+            addCriterion("chcode <=", value, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeLike(String value) {
+            addCriterion("chcode like", value, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeNotLike(String value) {
+            addCriterion("chcode not like", value, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeIn(List<String> values) {
+            addCriterion("chcode in", values, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeNotIn(List<String> values) {
+            addCriterion("chcode not in", values, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeBetween(String value1, String value2) {
+            addCriterion("chcode between", value1, value2, "chcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andChcodeNotBetween(String value1, String value2) {
+            addCriterion("chcode not between", value1, value2, "chcode");
+            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 Tue May 28 09:56:16 CST 2024.
+    This file was generated on Tue Nov 12 15:34:20 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

@@ -294,7 +294,8 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 						chval.setJid(jid);
 						chval.setAid(aid);
 						chval.setStep(step);
-						chval.setChname(t.length>0?t[0]:"0");
+						chval.setChcode(t.length>0?t[0]:"");
+						chval.setChname(getChnameByChcode(chval.getChcode()));
 						chval.setV1(t.length>1?t[1]:"0");
 						chval.setV2(t.length>2?t[2]:"0");
 						chval.setV3(t.length>3?t[3]:"0");
@@ -323,6 +324,20 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 		}
 	}
 
+	public static  String getChnameByChcode(String chcode) throws BusinessException {
+		DChecknodeMapper chMapper = UtilTools.getBean(DChecknodeMapper.class);
+		DChecknodeSQLBuilder sb = new DChecknodeSQLBuilder();
+		DChecknodeSQLBuilder.Criteria sc =sb.createCriteria();
+		sc.andChcodeEqualTo(chcode);
+		List<DChecknode> clist = chMapper.selectByExample(sb);
+		if(clist.isEmpty()){
+			return "";
+		}else{
+			DChecknode dc =clist.get(0);
+			return dc.getChname();
+		}
+	}
+
 	//异步执行
 	@SneakyThrows
 	public void exeWater(Integer aid,Integer jid) throws Exception{

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

@@ -33,6 +33,7 @@ public class D10004Service extends D10004BaseModel implements ExecProcessFlow {
 			row.setSite(CommonUtils.floatTodobule(node.getSite()));
 			row.setPname(node.getPname());
 			row.setChname(node.getChname());
+			row.setChcode(node.getChcode());
 			rows.add(row);
 		}
 		this.getD_d10004().setRows(rows);

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

@@ -27,6 +27,7 @@ public class D10005Service extends D10005BaseModel implements ExecProcessFlow {
 		Integer pid =this.getA_d10005().getPid();
 		double site =this.getA_d10005().getSite();
 		String chname =this.getA_d10005().getChname();
+		String chcode =this.getA_d10005().getChcode();
 		DPipeMapper pipeMapper =UtilTools.getBean(DPipeMapper.class);
 		DPipe pipe = pipeMapper.selectByPrimaryKey(pid);
 		if(pipe==null){
@@ -40,6 +41,7 @@ public class D10005Service extends D10005BaseModel implements ExecProcessFlow {
 			node.setSite((float)site);
 			node.setPname(pname);
 			node.setChname(chname);
+			node.setChcode(chcode);
 			checknodeDao.insertSelective(node);
 		}else{//修改
 			DChecknode node= checknodeDao.selectByPrimaryKey(cid);
@@ -51,6 +53,7 @@ public class D10005Service extends D10005BaseModel implements ExecProcessFlow {
 			node.setSite((float)site);
 			node.setPname(pname);
 			node.setChname(chname);
+			node.setChcode(chcode);
 			checknodeDao.updateByPrimaryKey(node);
 
 		}

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

@@ -304,7 +304,7 @@ public class TemplateGenerator2 {
         if(node ==null){
             throw  new BusinessException("EB3000001");
         }
-        return  node.getName();
+        return  node.getCode();
     }
 
 

src/main/resources/templates/geometry2.ftl

@@ -1,6 +1,6 @@
 nodes number : ${nodenum}
 <#list nodes as node>
-${node.name},${node.x},${node.y},${node.z}
+${node.code},${node.x},${node.y},${node.z}
 </#list>
 pipes number:${pipenum}
 <#list pipes as p>

src/main/resources/templates/monitor.ftl

@@ -1,5 +1,5 @@
 #monitor number:${monnum}
 <#list monitors as m>
-${m.chname},${m.pname},${m.site}
+${m.chcode},${m.pname},${m.site}
 </#list>
 #end

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10004_D(监测点查询).csv

@@ -5,4 +5,5 @@
 2.2,pid,管道编号,int,,,,,,,,,,,
 2.3,site,位置,double,,,,,,,,,,,
 2.4,pname,管道名称,string,,,,,,,,,,,
-2.5,chname,监测点名称,string,,,,,,,,,,,
+2.5,chname,监测点名称,string,,,,,,,,,,,
+2.6,chcode,监测点编号,string,,,,,,,,,,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10005_A(监测点添加修改).csv

@@ -3,3 +3,4 @@
 2,pid,管道编号,int,,,是,,,,,,,,
 3,site,位置,double,,,是,,,,,,,,
 4,chname,监测点名称,string,,,是,,,,,,,,
+5,chcode,监测点编号,string,,,是,,,,,,,,