添加监测点名称

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

@@ -48,4 +48,17 @@ public class A_D10005 extends BaseMapModel implements Serializable {
 	public double getSite() {
 		return this.site;
 	}
+	String chname;//监测点名称
+	/**
+	 *监测点名称
+	 */
+	public void setChname(String chname) {
+		this.chname=chname;
+	}
+	/**
+	 *监测点名称
+	 */
+	public String getChname() {
+		return this.chname;
+	}
 }

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

@@ -61,4 +61,17 @@ public class D_D10004_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getPname() {
 		return this.pname;
 	}
+	String chname;//监测点名称
+	/**
+	 *监测点名称
+	 */
+	public void setChname(String chname) {
+		this.chname=chname;
+	}
+	/**
+	 *监测点名称
+	 */
+	public String getChname() {
+		return this.chname;
+	}
 }

generated/validateform/a_d10005Form.xml

@@ -13,6 +13,9 @@
 <field property="site" depends="required">
     <arg0 key="a_d10005.site"/>
 </field>
+<field property="chname" depends="required">
+    <arg0 key="a_d10005.chname"/>
+</field>
 </form>
 </formset>
 </form-validation>

generated/validator/resources_a_d10005Form_validator.properties

@@ -1,4 +1,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_d10005Form = true

generated/validator/resources_a_d10005Form_validator_zh_CN.properties

@@ -1,4 +1,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_d10005Form = true

generated/validator/resources_d_d10004_rows_recodeForm_validator.properties

@@ -2,4 +2,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_recode.chname = \u76D1\u6D4B\u70B9\u540D\u79F0
 d_d10004_rows_recodeForm = true

generated/validator/resources_d_d10004_rows_recodeForm_validator_zh_CN.properties

@@ -2,4 +2,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_recode.chname = \u76D1\u6D4B\u70B9\u540D\u79F0
 d_d10004_rows_recodeForm = true

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

@@ -24,6 +24,11 @@ public class DChecknode extends MiniserviceBaseModel implements Serializable {
      */
     private String pname;
 
+    /**
+     * 监测点名称
+     */
+    private String chname;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -93,4 +98,22 @@ public class DChecknode extends MiniserviceBaseModel implements Serializable {
     public void setPname(String pname) {
         this.pname = pname == null ? null : pname.trim();
     }
+
+    /**
+     * 获取监测点名称
+     *
+     * @return chname - 监测点名称
+     */
+    public String getChname() {
+        return chname;
+    }
+
+    /**
+     * 设置监测点名称
+     *
+     * @param chname 监测点名称
+     */
+    public void setChname(String chname) {
+        this.chname = chname == null ? null : chname.trim();
+    }
 }

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

@@ -353,6 +353,76 @@ public class DChecknodeSQLBuilder {
             addCriterion("pname not between", value1, value2, "pname");
             return (Criteria) this;
         }
+
+        public Criteria andChnameIsNull() {
+            addCriterion("chname is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChnameIsNotNull() {
+            addCriterion("chname is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChnameEqualTo(String value) {
+            addCriterion("chname =", value, "chname");
+            return (Criteria) this;
+        }
+
+        public Criteria andChnameNotEqualTo(String value) {
+            addCriterion("chname <>", value, "chname");
+            return (Criteria) this;
+        }
+
+        public Criteria andChnameGreaterThan(String value) {
+            addCriterion("chname >", value, "chname");
+            return (Criteria) this;
+        }
+
+        public Criteria andChnameGreaterThanOrEqualTo(String value) {
+            addCriterion("chname >=", value, "chname");
+            return (Criteria) this;
+        }
+
+        public Criteria andChnameLessThan(String value) {
+            addCriterion("chname <", value, "chname");
+            return (Criteria) this;
+        }
+
+        public Criteria andChnameLessThanOrEqualTo(String value) {
+            addCriterion("chname <=", value, "chname");
+            return (Criteria) this;
+        }
+
+        public Criteria andChnameLike(String value) {
+            addCriterion("chname like", value, "chname");
+            return (Criteria) this;
+        }
+
+        public Criteria andChnameNotLike(String value) {
+            addCriterion("chname not like", value, "chname");
+            return (Criteria) this;
+        }
+
+        public Criteria andChnameIn(List<String> values) {
+            addCriterion("chname in", values, "chname");
+            return (Criteria) this;
+        }
+
+        public Criteria andChnameNotIn(List<String> values) {
+            addCriterion("chname not in", values, "chname");
+            return (Criteria) this;
+        }
+
+        public Criteria andChnameBetween(String value1, String value2) {
+            addCriterion("chname between", value1, value2, "chname");
+            return (Criteria) this;
+        }
+
+        public Criteria andChnameNotBetween(String value1, String value2) {
+            addCriterion("chname not between", value1, value2, "chname");
+            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 Thu Mar 07 16:05:39 CST 2024.
+    This file was generated on Mon Mar 11 11:57:17 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

@@ -78,11 +78,12 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 		changeAccident(accidentDao, accident, jid);
 		//创建日志
 		LogService.createLog(accident);
-
 		//获取传感器数据
 		//TODO:  需要从第三方获取
 		initDNodeVal(aid);
 
+
+
 		if(accident.getStype().equals("Fire")){
 			TemplateGenerator.createFireControl(aid,jid,totaltime,dt,dx,reportstep,interactionstep,cocodes);
 			LogService.addLog(accident,"fireControl.ftl配置生成——————————————————成功");

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

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

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

@@ -26,6 +26,7 @@ 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();
+		String chname =this.getA_d10005().getChname();
 		DPipeMapper pipeMapper =UtilTools.getBean(DPipeMapper.class);
 		DPipe pipe = pipeMapper.selectByPrimaryKey(pid);
 		if(pipe==null){
@@ -38,6 +39,7 @@ public class D10005Service extends D10005BaseModel implements ExecProcessFlow {
 			node.setPid(pid);
 			node.setSite((float)site);
 			node.setPname(pname);
+			node.setChname(chname);
 			checknodeDao.insertSelective(node);
 		}else{//修改
 			DChecknode node= checknodeDao.selectByPrimaryKey(cid);
@@ -48,6 +50,7 @@ public class D10005Service extends D10005BaseModel implements ExecProcessFlow {
 			node.setPid(pid);
 			node.setSite((float)site);
 			node.setPname(pname);
+			node.setChname(chname);
 			checknodeDao.updateByPrimaryKey(node);
 
 		}

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

@@ -20,6 +20,8 @@ import java.util.Map;
 public class TemplateGenerator {
     public static final String BPATH="/cephfs/disaster";
 
+
+
     public static void createWaterControl(Integer aid,Integer jid,String totaltime,String dt,String dx,String reportstep,String interactionstep) throws IOException, TemplateException {
         Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
         // 设置模板所在目录

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

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

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

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