传感器监测点添加管道名称

definitionsrc/returncode/returncode-business.properties

@@ -76,3 +76,4 @@ EB3100011 = \u7269\u7406\u5C5E\u6027\u4E0D\u5B58\u5728\uFF01
 EB3100012 = \u4EFB\u52A1\u4E0D\u5B58\u5728\uFF01
 EB3100013 = \u7269\u7406\u5C5E\u6027\u4FE1\u606F\u7F3A\u5931\uFF01
 EB3100014 = \u7ED3\u679C\u6587\u4EF6\u4E0D\u5B58\u5728\uFF01
+EB3100015 = \u7BA1\u9053\u4E0D\u5B58\u5728\uFF01

definitionsrc/returncode/returncode-business_zh_CN.properties

@@ -76,3 +76,4 @@ EB3100011 = \u7269\u7406\u5C5E\u6027\u4E0D\u5B58\u5728\uFF01
 EB3100012 = \u4EFB\u52A1\u4E0D\u5B58\u5728\uFF01
 EB3100013 = \u7269\u7406\u5C5E\u6027\u4FE1\u606F\u7F3A\u5931\uFF01
 EB3100014 = \u7ED3\u679C\u6587\u4EF6\u4E0D\u5B58\u5728\uFF01
+EB3100015 = \u7BA1\u9053\u4E0D\u5B58\u5728\uFF01

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

@@ -48,4 +48,17 @@ public class D_D10004_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public double getSite() {
 		return this.site;
 	}
+	String pname;//管道名称
+	/**
+	 *管道名称
+	 */
+	public void setPname(String pname) {
+		this.pname=pname;
+	}
+	/**
+	 *管道名称
+	 */
+	public String getPname() {
+		return this.pname;
+	}
 }

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

@@ -61,4 +61,17 @@ public class D_D10010_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getType() {
 		return this.type;
 	}
+	String pname;//管道名称
+	/**
+	 *管道名称
+	 */
+	public void setPname(String pname) {
+		this.pname=pname;
+	}
+	/**
+	 *管道名称
+	 */
+	public String getPname() {
+		return this.pname;
+	}
 }

generated/validator/resources_d_d10004_rows_recodeForm_validator.properties

@@ -1,4 +1,5 @@
 d_d10004_rows_recode.cid = \u76D1\u6D4B\u70B9id
 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_recodeForm = true

generated/validator/resources_d_d10004_rows_recodeForm_validator_zh_CN.properties

@@ -1,4 +1,5 @@
 d_d10004_rows_recode.cid = \u76D1\u6D4B\u70B9id
 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_recodeForm = true

generated/validator/resources_d_d10010_rows_recodeForm_validator.properties

@@ -2,4 +2,5 @@ d_d10010_rows_recode.seid = \u4F20\u611F\u5668ID
 d_d10010_rows_recode.pid = \u7BA1\u9053\u7F16\u53F7
 d_d10010_rows_recode.site = \u7BA1\u9053\u4F4D\u7F6E
 d_d10010_rows_recode.type = \u4F20\u611F\u5668\u7C7B\u578B
+d_d10010_rows_recode.pname = \u7BA1\u9053\u540D\u79F0
 d_d10010_rows_recodeForm = true

generated/validator/resources_d_d10010_rows_recodeForm_validator_zh_CN.properties

@@ -2,4 +2,5 @@ d_d10010_rows_recode.seid = \u4F20\u611F\u5668ID
 d_d10010_rows_recode.pid = \u7BA1\u9053\u7F16\u53F7
 d_d10010_rows_recode.site = \u7BA1\u9053\u4F4D\u7F6E
 d_d10010_rows_recode.type = \u4F20\u611F\u5668\u7C7B\u578B
+d_d10010_rows_recode.pname = \u7BA1\u9053\u540D\u79F0
 d_d10010_rows_recodeForm = true

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

@@ -19,6 +19,11 @@ public class DChecknode extends MiniserviceBaseModel implements Serializable {
      */
     private Float site;
 
+    /**
+     * 管道名称
+     */
+    private String pname;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -70,4 +75,22 @@ public class DChecknode extends MiniserviceBaseModel implements Serializable {
     public void setSite(Float site) {
         this.site = site;
     }
+
+    /**
+     * 获取管道名称
+     *
+     * @return pname - 管道名称
+     */
+    public String getPname() {
+        return pname;
+    }
+
+    /**
+     * 设置管道名称
+     *
+     * @param pname 管道名称
+     */
+    public void setPname(String pname) {
+        this.pname = pname == null ? null : pname.trim();
+    }
 }

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

@@ -283,6 +283,76 @@ public class DChecknodeSQLBuilder {
             addCriterion("site not between", value1, value2, "site");
             return (Criteria) this;
         }
+
+        public Criteria andPnameIsNull() {
+            addCriterion("pname is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameIsNotNull() {
+            addCriterion("pname is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameEqualTo(String value) {
+            addCriterion("pname =", value, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameNotEqualTo(String value) {
+            addCriterion("pname <>", value, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameGreaterThan(String value) {
+            addCriterion("pname >", value, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameGreaterThanOrEqualTo(String value) {
+            addCriterion("pname >=", value, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameLessThan(String value) {
+            addCriterion("pname <", value, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameLessThanOrEqualTo(String value) {
+            addCriterion("pname <=", value, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameLike(String value) {
+            addCriterion("pname like", value, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameNotLike(String value) {
+            addCriterion("pname not like", value, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameIn(List<String> values) {
+            addCriterion("pname in", values, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameNotIn(List<String> values) {
+            addCriterion("pname not in", values, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameBetween(String value1, String value2) {
+            addCriterion("pname between", value1, value2, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameNotBetween(String value1, String value2) {
+            addCriterion("pname not between", value1, value2, "pname");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -24,6 +24,11 @@ public class DSensor extends MiniserviceBaseModel implements Serializable {
      */
     private String type;
 
+    /**
+     * 管道名称
+     */
+    private String pname;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -93,4 +98,22 @@ public class DSensor extends MiniserviceBaseModel implements Serializable {
     public void setType(String type) {
         this.type = type == null ? null : type.trim();
     }
+
+    /**
+     * 获取管道名称
+     *
+     * @return pname - 管道名称
+     */
+    public String getPname() {
+        return pname;
+    }
+
+    /**
+     * 设置管道名称
+     *
+     * @param pname 管道名称
+     */
+    public void setPname(String pname) {
+        this.pname = pname == null ? null : pname.trim();
+    }
 }

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

@@ -353,6 +353,76 @@ public class DSensorSQLBuilder {
             addCriterion("type not between", value1, value2, "type");
             return (Criteria) this;
         }
+
+        public Criteria andPnameIsNull() {
+            addCriterion("pname is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameIsNotNull() {
+            addCriterion("pname is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameEqualTo(String value) {
+            addCriterion("pname =", value, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameNotEqualTo(String value) {
+            addCriterion("pname <>", value, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameGreaterThan(String value) {
+            addCriterion("pname >", value, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameGreaterThanOrEqualTo(String value) {
+            addCriterion("pname >=", value, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameLessThan(String value) {
+            addCriterion("pname <", value, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameLessThanOrEqualTo(String value) {
+            addCriterion("pname <=", value, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameLike(String value) {
+            addCriterion("pname like", value, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameNotLike(String value) {
+            addCriterion("pname not like", value, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameIn(List<String> values) {
+            addCriterion("pname in", values, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameNotIn(List<String> values) {
+            addCriterion("pname not in", values, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameBetween(String value1, String value2) {
+            addCriterion("pname between", value1, value2, "pname");
+            return (Criteria) this;
+        }
+
+        public Criteria andPnameNotBetween(String value1, String value2) {
+            addCriterion("pname not between", value1, value2, "pname");
+            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 Mar 02 11:47:42 CST 2024.
+    This file was generated on Thu Mar 07 11:41:49 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

@@ -31,6 +31,7 @@ public class D10004Service extends D10004BaseModel implements ExecProcessFlow {
 			row.setCid(node.getId());
 			row.setPid(node.getPid());
 			row.setSite(CommonUtils.floatTodobule(node.getSite()));
+			row.setPname(node.getPname());
 			rows.add(row);
 		}
 		this.getD_d10004().setRows(rows);

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

@@ -7,7 +7,9 @@ import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.system.model.D10005BaseModel;
 import com.miniframe.model.system.DChecknode;
 import com.miniframe.model.system.DChecknodeSQLBuilder;
+import com.miniframe.model.system.DPipe;
 import com.miniframe.model.system.dao.DChecknodeMapper;
+import com.miniframe.model.system.dao.DPipeMapper;
 
 /**
  * 基础系统,“监测点添加修改”逻辑处理（重新生成不覆盖）。
@@ -24,11 +26,18 @@ public class D10005Service extends D10005BaseModel implements ExecProcessFlow {
 		Integer cid =this.getA_d10005().getCid();
 		Integer pid =this.getA_d10005().getPid();
 		double site =this.getA_d10005().getSite();
+		DPipeMapper pipeMapper =UtilTools.getBean(DPipeMapper.class);
+		DPipe pipe = pipeMapper.selectByPrimaryKey(pid);
+		if(pipe==null){
+			throw new BusinessException("EB3100015");
+		}
+		String pname =pipe.getName();
 		if(cid ==null||cid<=0 ){//添加
 			pdPidSite(checknodeDao, pid, (float) site);
 			DChecknode node =new DChecknode();
 			node.setPid(pid);
 			node.setSite((float)site);
+			node.setPname(pname);
 			checknodeDao.insertSelective(node);
 		}else{//修改
 			DChecknode node= checknodeDao.selectByPrimaryKey(cid);
@@ -38,6 +47,7 @@ public class D10005Service extends D10005BaseModel implements ExecProcessFlow {
 			pdPidSiteExCid(checknodeDao, pid, (float) site,cid);
 			node.setPid(pid);
 			node.setSite((float)site);
+			node.setPname(pname);
 			checknodeDao.updateByPrimaryKey(node);
 
 		}

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

@@ -39,6 +39,7 @@ public class D10010Service extends D10010BaseModel implements ExecProcessFlow {
 			row.setPid(s.getPid());
 			row.setSite(CommonUtils.floatTodobule(s.getSite()));
 			row.setType(s.getType());
+			row.setPname(s.getPname());
 			rows.add(row);
 		}
 		this.getD_d10010().setRows(rows);

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

@@ -5,8 +5,10 @@ import com.miniframe.core.ExecProcessFlow;
 import com.miniframe.core.exception.BusinessException;
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.system.model.D10011BaseModel;
+import com.miniframe.model.system.DPipe;
 import com.miniframe.model.system.DSensor;
 import com.miniframe.model.system.DSensorSQLBuilder;
+import com.miniframe.model.system.dao.DPipeMapper;
 import com.miniframe.model.system.dao.DSensorMapper;
 
 /**
@@ -24,6 +26,12 @@ public class D10011Service extends D10011BaseModel implements ExecProcessFlow {
 		Integer pid =this.getA_d10011().getPid();
 		double site =this.getA_d10011().getSite();
 		String type =this.getA_d10011().getType();
+		DPipeMapper  pipeMapper =UtilTools.getBean(DPipeMapper.class);
+		DPipe pipe = pipeMapper.selectByPrimaryKey(pid);
+		if(pipe==null){
+			throw new BusinessException("EB3100015");
+		}
+		String pname =pipe.getName();
 		DSensorMapper sensorMapper = UtilTools.getBean(DSensorMapper.class);
 		if(seid==null||seid<=0){//添加
 			pdPidSiteType(pid, (float) site, type, sensorMapper);
@@ -31,6 +39,7 @@ public class D10011Service extends D10011BaseModel implements ExecProcessFlow {
 			s.setPid(pid);
 			s.setSite((float)site);
 			s.setType(type);
+			s.setPname(pname);
 			sensorMapper.insertSelective(s);
 		}else{
 			DSensor s = sensorMapper.selectByPrimaryKey(seid);
@@ -41,6 +50,7 @@ public class D10011Service extends D10011BaseModel implements ExecProcessFlow {
 			s.setPid(pid);
 			s.setSite((float)site);
 			s.setType(type);
+			s.setPname(pname);
 			sensorMapper.updateByPrimaryKey(s);
 		}
 	}

系统设计/数据定义/返 回 码/business(业务系统).csv

@@ -84,4 +84,5 @@
 3100011,EB3100011,物理属性不存在！,
 3100012,EB3100012,任务不存在！,
 3100013,EB3100013,物理属性信息缺失！,
-3100014,EB3100014,结果文件不存在！,
+3100014,EB3100014,结果文件不存在！,
+3100015,EB3100015,管道不存在！,

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

@@ -4,3 +4,4 @@
 2.1,cid,监测点id,int,,,,,,,,,,,
 2.2,pid,管道编号,int,,,,,,,,,,,
 2.3,site,位置,double,,,,,,,,,,,
+2.4,pname,管道名称,string,,,,,,,,,,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10010_D(传感器数据查询).csv

@@ -5,4 +5,4 @@
 2.2,pid,管道编号,int,,,,,,,,,,,
 2.3,site,管道位置,double,,,,,,,,,,,
 2.4,type,传感器类型,string,,,,,,,,,,,
-
+2.5,pname,管道名称,string,,,,,,,,,,,