将灾情类型放置到事故中

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

@@ -61,4 +61,17 @@ public class A_D00002 extends BaseMapModel implements Serializable {
 	public String getSid() {
 		return this.sid;
 	}
+	String stype;//灾情类型
+	/**
+	 *灾情类型
+	 */
+	public void setStype(String stype) {
+		this.stype=stype;
+	}
+	/**
+	 *灾情类型
+	 */
+	public String getStype() {
+		return this.stype;
+	}
 }

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

@@ -74,6 +74,19 @@ public class A_D00003 extends BaseMapModel implements Serializable {
 	public String getSid() {
 		return this.sid;
 	}
+	String stype;//灾情类型
+	/**
+	 *灾情类型
+	 */
+	public void setStype(String stype) {
+		this.stype=stype;
+	}
+	/**
+	 *灾情类型
+	 */
+	public String getStype() {
+		return this.stype;
+	}
 	String searchtag;//查询条件
 	/**
 	 *查询条件

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

@@ -22,19 +22,6 @@ public class A_D00004 extends BaseMapModel implements Serializable {
 	public int getPid() {
 		return this.pid;
 	}
-	String stype;//灾情源类型
-	/**
-	 *灾情源类型
-	 */
-	public void setStype(String stype) {
-		this.stype=stype;
-	}
-	/**
-	 *灾情源类型
-	 */
-	public String getStype() {
-		return this.stype;
-	}
 	int aid;//事故id
 	/**
 	 *事故id

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

@@ -22,17 +22,4 @@ public class A_D00005 extends BaseMapModel implements Serializable {
 	public int getAid() {
 		return this.aid;
 	}
-	String stype;//灾情类型
-	/**
-	 *灾情类型
-	 */
-	public void setStype(String stype) {
-		this.stype=stype;
-	}
-	/**
-	 *灾情类型
-	 */
-	public String getStype() {
-		return this.stype;
-	}
 }

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

@@ -74,4 +74,17 @@ public class D_D00003_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getSid() {
 		return this.sid;
 	}
+	String stype;//灾情类型
+	/**
+	 *灾情类型
+	 */
+	public void setStype(String stype) {
+		this.stype=stype;
+	}
+	/**
+	 *灾情类型
+	 */
+	public String getStype() {
+		return this.stype;
+	}
 }

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

@@ -48,19 +48,6 @@ public class D_D00005_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public int getPid() {
 		return this.pid;
 	}
-	String stype;//灾情类型
-	/**
-	 *灾情类型
-	 */
-	public void setStype(String stype) {
-		this.stype=stype;
-	}
-	/**
-	 *灾情类型
-	 */
-	public String getStype() {
-		return this.stype;
-	}
 	int aid;//事故id
 	/**
 	 *事故id

generated/validateform/a_d00002Form.xml

@@ -56,6 +56,19 @@
       <var-value>128</var-value>
     </var>
 </field>
+<field property="stype" depends="required,minlength,maxlength">
+    <arg0 key="a_d00002.stype"/>
+    <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_d00004Form.xml

@@ -7,19 +7,6 @@
 <field property="pid" depends="required">
     <arg0 key="a_d00004.pid"/>
 </field>
-<field property="stype" depends="minlength,maxlength">
-    <arg0 key="a_d00004.stype"/>
-    <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>
 <field property="aid" depends="required">
     <arg0 key="a_d00004.aid"/>
 </field>

generated/validateform/a_d00005Form.xml

@@ -7,9 +7,6 @@
 <field property="aid" depends="required">
     <arg0 key="a_d00005.aid"/>
 </field>
-<field property="stype" depends="required">
-    <arg0 key="a_d00005.stype"/>
-</field>
 </form>
 </formset>
 </form-validation>

generated/validator/resources_a_d00002Form_validator.properties

@@ -2,4 +2,5 @@ a_d00002.source = \u4E8B\u6545\u6765\u6E90
 a_d00002.type = \u4E8B\u6545\u7C7B\u578B
 a_d00002.name = \u4E8B\u6545\u540D\u79F0
 a_d00002.sid = \u4E8B\u6545\u6765\u6E90ID
+a_d00002.stype = \u707E\u60C5\u7C7B\u578B
 a_d00002Form = true

generated/validator/resources_a_d00002Form_validator_zh_CN.properties

@@ -2,4 +2,5 @@ a_d00002.source = \u4E8B\u6545\u6765\u6E90
 a_d00002.type = \u4E8B\u6545\u7C7B\u578B
 a_d00002.name = \u4E8B\u6545\u540D\u79F0
 a_d00002.sid = \u4E8B\u6545\u6765\u6E90ID
+a_d00002.stype = \u707E\u60C5\u7C7B\u578B
 a_d00002Form = true

generated/validator/resources_a_d00003Form_validator.properties

@@ -3,5 +3,6 @@ a_d00003.page = \u5F53\u524D\u9875\u6570
 a_d00003.aid = \u4E8B\u6545id
 a_d00003.source = \u6570\u636E\u6E90
 a_d00003.sid = \u6570\u636E\u6E90ID
+a_d00003.stype = \u707E\u60C5\u7C7B\u578B
 a_d00003.searchtag = \u67E5\u8BE2\u6761\u4EF6
 a_d00003Form = true

generated/validator/resources_a_d00003Form_validator_zh_CN.properties

@@ -3,5 +3,6 @@ a_d00003.page = \u5F53\u524D\u9875\u6570
 a_d00003.aid = \u4E8B\u6545id
 a_d00003.source = \u6570\u636E\u6E90
 a_d00003.sid = \u6570\u636E\u6E90ID
+a_d00003.stype = \u707E\u60C5\u7C7B\u578B
 a_d00003.searchtag = \u67E5\u8BE2\u6761\u4EF6
 a_d00003Form = true

generated/validator/resources_a_d00004Form_validator.properties

@@ -1,5 +1,4 @@
 a_d00004.pid = \u7BA1\u9053id
-a_d00004.stype = \u707E\u60C5\u6E90\u7C7B\u578B
 a_d00004.aid = \u4E8B\u6545id
 a_d00004.site = \u4F4D\u7F6E
 a_d00004Form = true

generated/validator/resources_a_d00004Form_validator_zh_CN.properties

@@ -1,5 +1,4 @@
 a_d00004.pid = \u7BA1\u9053id
-a_d00004.stype = \u707E\u60C5\u6E90\u7C7B\u578B
 a_d00004.aid = \u4E8B\u6545id
 a_d00004.site = \u4F4D\u7F6E
 a_d00004Form = true

generated/validator/resources_a_d00005Form_validator.properties

@@ -1,3 +1,2 @@
 a_d00005.aid = \u4E8B\u6545id
-a_d00005.stype = \u707E\u60C5\u7C7B\u578B
 a_d00005Form = true

generated/validator/resources_a_d00005Form_validator_zh_CN.properties

@@ -1,3 +1,2 @@
 a_d00005.aid = \u4E8B\u6545id
-a_d00005.stype = \u707E\u60C5\u7C7B\u578B
 a_d00005Form = true

generated/validator/resources_d_d00003_rows_recodeForm_validator.properties

@@ -3,4 +3,5 @@ d_d00003_rows_recode.source = \u4E8B\u6545\u6765\u6E90
 d_d00003_rows_recode.type = \u4E8B\u6545\u7C7B\u578B
 d_d00003_rows_recode.name = \u4E8B\u6545\u540D\u79F0
 d_d00003_rows_recode.sid = \u4E8B\u6545\u6765\u6E90ID
+d_d00003_rows_recode.stype = \u707E\u60C5\u7C7B\u578B
 d_d00003_rows_recodeForm = true

generated/validator/resources_d_d00003_rows_recodeForm_validator_zh_CN.properties

@@ -3,4 +3,5 @@ d_d00003_rows_recode.source = \u4E8B\u6545\u6765\u6E90
 d_d00003_rows_recode.type = \u4E8B\u6545\u7C7B\u578B
 d_d00003_rows_recode.name = \u4E8B\u6545\u540D\u79F0
 d_d00003_rows_recode.sid = \u4E8B\u6545\u6765\u6E90ID
+d_d00003_rows_recode.stype = \u707E\u60C5\u7C7B\u578B
 d_d00003_rows_recodeForm = true

generated/validator/resources_d_d00005_rows_recodeForm_validator.properties

@@ -1,7 +1,6 @@
 d_d00005_rows_recode.sid = \u707E\u60C5\u6E90id
 d_d00005_rows_recode.pname = \u7BA1\u9053\u540D\u79F0
 d_d00005_rows_recode.pid = \u7BA1\u9053\u7F16\u53F7
-d_d00005_rows_recode.stype = \u707E\u60C5\u7C7B\u578B
 d_d00005_rows_recode.aid = \u4E8B\u6545id
 d_d00005_rows_recode.site = \u4F4D\u7F6E
 d_d00005_rows_recodeForm = true

generated/validator/resources_d_d00005_rows_recodeForm_validator_zh_CN.properties

@@ -1,7 +1,6 @@
 d_d00005_rows_recode.sid = \u707E\u60C5\u6E90id
 d_d00005_rows_recode.pname = \u7BA1\u9053\u540D\u79F0
 d_d00005_rows_recode.pid = \u7BA1\u9053\u7F16\u53F7
-d_d00005_rows_recode.stype = \u707E\u60C5\u7C7B\u578B
 d_d00005_rows_recode.aid = \u4E8B\u6545id
 d_d00005_rows_recode.site = \u4F4D\u7F6E
 d_d00005_rows_recodeForm = true

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

@@ -29,6 +29,11 @@ public class DAccident extends MiniserviceBaseModel implements Serializable {
      */
     private String sid;
 
+    /**
+     * 灾情类型 Fire-火灾源  Water-水灾源
+     */
+    private String stype;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -116,4 +121,22 @@ public class DAccident extends MiniserviceBaseModel implements Serializable {
     public void setSid(String sid) {
         this.sid = sid == null ? null : sid.trim();
     }
+
+    /**
+     * 获取灾情类型 Fire-火灾源  Water-水灾源
+     *
+     * @return stype - 灾情类型 Fire-火灾源  Water-水灾源
+     */
+    public String getStype() {
+        return stype;
+    }
+
+    /**
+     * 设置灾情类型 Fire-火灾源  Water-水灾源
+     *
+     * @param stype 灾情类型 Fire-火灾源  Water-水灾源
+     */
+    public void setStype(String stype) {
+        this.stype = stype == null ? null : stype.trim();
+    }
 }

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

@@ -443,6 +443,76 @@ public class DAccidentSQLBuilder {
             addCriterion("sid not between", value1, value2, "sid");
             return (Criteria) this;
         }
+
+        public Criteria andStypeIsNull() {
+            addCriterion("stype is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeIsNotNull() {
+            addCriterion("stype is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeEqualTo(String value) {
+            addCriterion("stype =", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeNotEqualTo(String value) {
+            addCriterion("stype <>", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeGreaterThan(String value) {
+            addCriterion("stype >", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeGreaterThanOrEqualTo(String value) {
+            addCriterion("stype >=", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeLessThan(String value) {
+            addCriterion("stype <", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeLessThanOrEqualTo(String value) {
+            addCriterion("stype <=", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeLike(String value) {
+            addCriterion("stype like", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeNotLike(String value) {
+            addCriterion("stype not like", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeIn(List<String> values) {
+            addCriterion("stype in", values, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeNotIn(List<String> values) {
+            addCriterion("stype not in", values, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeBetween(String value1, String value2) {
+            addCriterion("stype between", value1, value2, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeNotBetween(String value1, String value2) {
+            addCriterion("stype not between", value1, value2, "stype");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -19,12 +19,6 @@ public class DSource extends MiniserviceBaseModel implements Serializable {
      */
     private String pname;
 
-    /**
-     * 类型  Fire-火灾源  Water-水灾源
-     */
-    @Column(name = "s_type")
-    private String sType;
-
     /**
      * 事故id
      */
@@ -87,24 +81,6 @@ public class DSource extends MiniserviceBaseModel implements Serializable {
         this.pname = pname == null ? null : pname.trim();
     }
 
-    /**
-     * 获取类型  Fire-火灾源  Water-水灾源
-     *
-     * @return s_type - 类型  Fire-火灾源  Water-水灾源
-     */
-    public String getsType() {
-        return sType;
-    }
-
-    /**
-     * 设置类型  Fire-火灾源  Water-水灾源
-     *
-     * @param sType 类型  Fire-火灾源  Water-水灾源
-     */
-    public void setsType(String sType) {
-        this.sType = sType == null ? null : sType.trim();
-    }
-
     /**
      * 获取事故id
      *

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

@@ -294,76 +294,6 @@ public class DSourceSQLBuilder {
             return (Criteria) this;
         }
 
-        public Criteria andSTypeIsNull() {
-            addCriterion("s_type is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSTypeIsNotNull() {
-            addCriterion("s_type is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSTypeEqualTo(String value) {
-            addCriterion("s_type =", value, "sType");
-            return (Criteria) this;
-        }
-
-        public Criteria andSTypeNotEqualTo(String value) {
-            addCriterion("s_type <>", value, "sType");
-            return (Criteria) this;
-        }
-
-        public Criteria andSTypeGreaterThan(String value) {
-            addCriterion("s_type >", value, "sType");
-            return (Criteria) this;
-        }
-
-        public Criteria andSTypeGreaterThanOrEqualTo(String value) {
-            addCriterion("s_type >=", value, "sType");
-            return (Criteria) this;
-        }
-
-        public Criteria andSTypeLessThan(String value) {
-            addCriterion("s_type <", value, "sType");
-            return (Criteria) this;
-        }
-
-        public Criteria andSTypeLessThanOrEqualTo(String value) {
-            addCriterion("s_type <=", value, "sType");
-            return (Criteria) this;
-        }
-
-        public Criteria andSTypeLike(String value) {
-            addCriterion("s_type like", value, "sType");
-            return (Criteria) this;
-        }
-
-        public Criteria andSTypeNotLike(String value) {
-            addCriterion("s_type not like", value, "sType");
-            return (Criteria) this;
-        }
-
-        public Criteria andSTypeIn(List<String> values) {
-            addCriterion("s_type in", values, "sType");
-            return (Criteria) this;
-        }
-
-        public Criteria andSTypeNotIn(List<String> values) {
-            addCriterion("s_type not in", values, "sType");
-            return (Criteria) this;
-        }
-
-        public Criteria andSTypeBetween(String value1, String value2) {
-            addCriterion("s_type between", value1, value2, "sType");
-            return (Criteria) this;
-        }
-
-        public Criteria andSTypeNotBetween(String value1, String value2) {
-            addCriterion("s_type not between", value1, value2, "sType");
-            return (Criteria) this;
-        }
-
         public Criteria andAidIsNull() {
             addCriterion("aid is null");
             return (Criteria) this;

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 Wed Jan 17 09:55:12 CST 2024.
+    This file was generated on Mon Feb 26 09:18:10 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

@@ -43,6 +43,7 @@ public class D00002Service extends D00002BaseModel implements ExecProcessFlow {
 		da.setSid(this.getA_d00002().getSid());
 		da.setSource(this.getA_d00002().getSource());
 		da.setType(this.getA_d00002().getType());
+		da.setStype(this.getA_d00002().getStype());
 		int aid=projectDao.insertSelective(da);
 
 		accident= projectDao.selectOneByExample(asb);

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

@@ -33,7 +33,7 @@ public class D00003Service extends D00003BaseModel implements ExecProcessFlow {
 		String source =this.getA_d00003().getSource();
 		String sid=this.getA_d00003().getSid();
 		Integer aid =this.getA_d00003().getAid();
-
+		String stype =this.getA_d00003().getStype();
 		String searchtag =this.getA_d00003().getSearchtag();
 		DAccidentMapper projectDao  = UtilTools.getBean(DAccidentMapper.class);
 		DAccidentSQLBuilder sb =new DAccidentSQLBuilder();
@@ -47,11 +47,16 @@ public class D00003Service extends D00003BaseModel implements ExecProcessFlow {
 			sc1.andSidEqualTo(sid);
 			sc1.andSourceEqualTo(source);
 		}
+		if(!StringUtil.isEmpty(stype)){
+			DAccidentSQLBuilder.Criteria sc1 =sb.createCriteria();
+			sc1.andStypeEqualTo(stype);
+		}
 		if(aid!=null&&aid!=0){
 			DAccidentSQLBuilder.Criteria sc1 =sb.createCriteria();
 			sc1.andIdEqualTo(aid);
 		}
 
+
 		Long count = projectDao.countByExample(sb);
 //		sb.setOrderByClause("id");
 
@@ -64,6 +69,7 @@ public class D00003Service extends D00003BaseModel implements ExecProcessFlow {
 			row.setName(dp.getName());
 			row.setSid(dp.getSid());
 			row.setType(dp.getType());
+			row.setStype(dp.getStype());
 			rows.add(row);
 		}
 		this.getD_d00003().setRows(rows);

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

@@ -52,7 +52,6 @@ public class D00004Service extends D00004BaseModel implements ExecProcessFlow {
 		ds.setAid(aid);
 		ds.setPid(pid);
 		ds.setPname(dp.getName());
-		ds.setsType(this.getA_d00004().getStype());
 		ds.setSite((float)this.getA_d00004().getSite());
 		dsm.insertSelective(ds);
 	}

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

@@ -26,12 +26,10 @@ public class D00005Service extends D00005BaseModel implements ExecProcessFlow {
  	 */
 	public void transExecute() throws Exception {
 		Integer aid = this.getA_d00005().getAid();
-		String  sType = this.getA_d00005().getStype();
 		DSourceMapper dsm = UtilTools.getBean(DSourceMapper.class);
 		DSourceSQLBuilder sb =new DSourceSQLBuilder();
 		DSourceSQLBuilder.Criteria sc=sb.createCriteria();
 		sc.andAidEqualTo(aid);
-		sc.andSTypeEqualTo(sType);
 		List<DSource> list = dsm.selectByExample(sb);
 		List <D_D00005_ROWS_RECODE> rows = new ArrayList<>();
 		for (DSource  ds: list) {
@@ -40,7 +38,6 @@ public class D00005Service extends D00005BaseModel implements ExecProcessFlow {
 			row.setAid(ds.getAid());
 			row.setPid(ds.getPid());
 			row.setPname(ds.getPname());
-			row.setStype(ds.getsType());
 			row.setSite(CommonUtils.floatTodobule(ds.getSite()));
 			rows.add(row);
 		}

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

@@ -75,7 +75,8 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 			try {
 			Runtime runtime = Runtime.getRuntime();
 			Process p =null;
-			p= runtime.exec("sh "+TemplateGenerator.BPATH+"/"+aid+"/fire"+"/"+"runFile.sh");
+			p= runtime.exec("sh "+TemplateGenerator.BPATH+"/"+
+					aid+"/fire"+"/"+"runFile.sh");
 			InputStream fis = p.getInputStream();
 			InputStreamReader isr = new InputStreamReader(fis);
 			BufferedReader br = new BufferedReader(isr);

系统设计/通信设计/通讯报文/system(系统服务)/报文体/A00007_D(验证授权码).csv

@@ -1,7 +1,9 @@
+
+
 序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
 1,authUserId,授权用户ID,string,,,,,,,,,,,
 2,authUserToken,授权用户Token,string,,,,,,,,,,,
 3,authUserName,授权用户名,string,,,,,,,,,,,
 4,authUserType,授权用户类型,string,,,,,,,,,,,
 6,authenticationState,认证状态,string,,,,,,,,,,,
-7,cfdUrl,cfd跳转页面,string,,,,,,,,,,,
+7,cfdUrl,cfd跳转页面,string,,,,,,,,,,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D00002_A(事故数据添加).csv

@@ -3,3 +3,4 @@
 2,type,事故类型,string,,,是,1,128,,,,,,
 3,name,事故名称,string,,,是,1,128,,,,,,
 4,sid,事故来源ID,string,,,是,1,128,,,,,,
+5,stype,灾情类型,string,,,是,1,128,,,,,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D00003_A(事故数据查询).csv

@@ -4,4 +4,5 @@
 3,aid,事故id,int,,,,,,,,,,,
 4,source,数据源,string,,,,,,,,,,,
 5,sid,数据源ID,string,,,,,,,,,,,
-6,searchtag,查询条件,string,,,,,,,,,,,
+7,stype,灾情类型,string,,,,,,,,,,,
+8,searchtag,查询条件,string,,,,,,,,,,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D00003_D(事故数据查询).csv

@@ -6,3 +6,4 @@
 2.3,type,事故类型,string,,,,1,128,,,,,,
 2.4,name,事故名称,string,,,,1,128,,,,,,
 2.5,sid,事故来源ID,string,,,,1,128,,,,,,
+2.6,stype,灾情类型,string,,,,,,,,,,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D00004_A(灾情点源数据添加).csv

@@ -1,5 +1,4 @@
 序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
 1,pid,管道id,int,,,是,,,,,,,,
-2,stype,灾情源类型,string,,,,1,128,,,,,,
-3,aid,事故id,int,,,是,,,,,,,,
-4,site,位置,double,,,,,,,,,,,
+2,aid,事故id,int,,,是,,,,,,,,
+3,site,位置,double,,,,,,,,,,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D00005_A(灾情点源数据查询).csv

@@ -1,3 +1,2 @@
 序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
-1,aid,事故id,int,,,是,,,,,,,,
-2,stype,灾情类型,string,,,是,,,,,,,,
+1,aid,事故id,int,,,是,,,,,,,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D00005_D(灾情点源数据查询).csv

@@ -3,6 +3,5 @@
 2.1,sid,灾情源id,int,,,,,,,,,,,
 2.2,pname,管道名称,string,,,,1,2048,,,,,,
 2.3,pid,管道编号,int,,,,,,,,,,,
-2.4,stype,灾情类型,string,,,,,,,,,,,
-2.5,aid,事故id,int,,,,,,,,,,,
-2.6,site,位置,double,,,,,,,,,,,
+2.4,aid,事故id,int,,,,,,,,,,,
+2.5,site,位置,double,,,,,,,,,,,