管道灾源

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

@@ -35,6 +35,45 @@ public class A_D00003 extends BaseMapModel implements Serializable {
 	public int getPage() {
 		return this.page;
 	}
+	int aid;//事故id
+	/**
+	 *事故id
+	 */
+	public void setAid(int aid) {
+		this.aid=aid;
+	}
+	/**
+	 *事故id
+	 */
+	public int getAid() {
+		return this.aid;
+	}
+	String source;//数据源
+	/**
+	 *数据源
+	 */
+	public void setSource(String source) {
+		this.source=source;
+	}
+	/**
+	 *数据源
+	 */
+	public String getSource() {
+		return this.source;
+	}
+	String sid;//数据源ID
+	/**
+	 *数据源ID
+	 */
+	public void setSid(String sid) {
+		this.sid=sid;
+	}
+	/**
+	 *数据源ID
+	 */
+	public String getSid() {
+		return this.sid;
+	}
 	String searchtag;//查询条件
 	/**
 	 *查询条件

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

@@ -9,18 +9,18 @@ import java.io.Serializable;
  */
 public class D_D00003_ROWS_RECODE extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
-	int id;//节点编号
+	int aid;//事故id
 	/**
-	 *节点编号
+	 *事故id
 	 */
-	public void setId(int id) {
-		this.id=id;
+	public void setAid(int aid) {
+		this.aid=aid;
 	}
 	/**
-	 *节点编号
+	 *事故id
 	 */
-	public int getId() {
-		return this.id;
+	public int getAid() {
+		return this.aid;
 	}
 	String source;//事故来源
 	/**

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

@@ -9,18 +9,18 @@ import java.io.Serializable;
  */
 public class D_D00005_ROWS_RECODE extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
-	int id;//编号
+	int sid;//灾情源id
 	/**
-	 *编号
+	 *灾情源id
 	 */
-	public void setId(int id) {
-		this.id=id;
+	public void setSid(int sid) {
+		this.sid=sid;
 	}
 	/**
-	 *编号
+	 *灾情源id
 	 */
-	public int getId() {
-		return this.id;
+	public int getSid() {
+		return this.sid;
 	}
 	String pname;//管道名称
 	/**

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

@@ -100,17 +100,17 @@ public class D_D00007_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public double getVal4() {
 		return this.val4;
 	}
-	int id;//检测id
+	int svid;//检测id
 	/**
 	 *检测id
 	 */
-	public void setId(int id) {
-		this.id=id;
+	public void setSvid(int svid) {
+		this.svid=svid;
 	}
 	/**
 	 *检测id
 	 */
-	public int getId() {
-		return this.id;
+	public int getSvid() {
+		return this.svid;
 	}
 }

generated/validator/resources_a_d00003Form_validator.properties

@@ -1,4 +1,7 @@
 a_d00003.count = \u6BCF\u9875\u663E\u793A\u6761\u6570
 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.searchtag = \u67E5\u8BE2\u6761\u4EF6
 a_d00003Form = true

generated/validator/resources_a_d00003Form_validator_zh_CN.properties

@@ -1,4 +1,7 @@
 a_d00003.count = \u6BCF\u9875\u663E\u793A\u6761\u6570
 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.searchtag = \u67E5\u8BE2\u6761\u4EF6
 a_d00003Form = true

generated/validator/resources_d_d00003_rows_recodeForm_validator.properties

@@ -1,4 +1,4 @@
-d_d00003_rows_recode.id = \u8282\u70B9\u7F16\u53F7
+d_d00003_rows_recode.aid = \u4E8B\u6545id
 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

generated/validator/resources_d_d00003_rows_recodeForm_validator_zh_CN.properties

@@ -1,4 +1,4 @@
-d_d00003_rows_recode.id = \u8282\u70B9\u7F16\u53F7
+d_d00003_rows_recode.aid = \u4E8B\u6545id
 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

generated/validator/resources_d_d00005_rows_recodeForm_validator.properties

@@ -1,4 +1,4 @@
-d_d00005_rows_recode.id = \u7F16\u53F7
+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

generated/validator/resources_d_d00005_rows_recodeForm_validator_zh_CN.properties

@@ -1,4 +1,4 @@
-d_d00005_rows_recode.id = \u7F16\u53F7
+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

generated/validator/resources_d_d00007_rows_recodeForm_validator.properties

@@ -5,5 +5,5 @@ d_d00007_rows_recode.val1 = \u503C1
 d_d00007_rows_recode.val2 = \u503C2
 d_d00007_rows_recode.val3 = \u503C3
 d_d00007_rows_recode.val4 = \u503C4
-d_d00007_rows_recode.id = \u68C0\u6D4Bid
+d_d00007_rows_recode.svid = \u68C0\u6D4Bid
 d_d00007_rows_recodeForm = true

generated/validator/resources_d_d00007_rows_recodeForm_validator_zh_CN.properties

@@ -5,5 +5,5 @@ d_d00007_rows_recode.val1 = \u503C1
 d_d00007_rows_recode.val2 = \u503C2
 d_d00007_rows_recode.val3 = \u503C3
 d_d00007_rows_recode.val4 = \u503C4
-d_d00007_rows_recode.id = \u68C0\u6D4Bid
+d_d00007_rows_recode.svid = \u68C0\u6D4Bid
 d_d00007_rows_recodeForm = true

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

@@ -30,6 +30,10 @@ public class D00003Service extends D00003BaseModel implements ExecProcessFlow {
 	public void transExecute() throws Exception {
 		Integer page = this.getA_d00003().getPage();
 		Integer size = this.getA_d00003().getCount();
+		String source =this.getA_d00003().getSource();
+		String sid=this.getA_d00003().getSid();
+		Integer aid =this.getA_d00003().getAid();
+
 		String searchtag =this.getA_d00003().getSearchtag();
 		DAccidentMapper projectDao  = UtilTools.getBean(DAccidentMapper.class);
 		DAccidentSQLBuilder sb =new DAccidentSQLBuilder();
@@ -38,6 +42,16 @@ public class D00003Service extends D00003BaseModel implements ExecProcessFlow {
 			DAccidentSQLBuilder.Criteria sc1 =sb.createCriteria();
 			sc1.andNameLike("%"+searchtag+"%");
 		}
+		if(!StringUtil.isEmpty(source)&&!StringUtil.isEmpty(sid)){
+			DAccidentSQLBuilder.Criteria sc1 =sb.createCriteria();
+			sc1.andSidEqualTo(sid);
+			sc1.andSourceEqualTo(source);
+		}
+		if(aid!=null&&aid!=0){
+			DAccidentSQLBuilder.Criteria sc1 =sb.createCriteria();
+			sc1.andIdEqualTo(aid);
+		}
+
 		Long count = projectDao.countByExample(sb);
 //		sb.setOrderByClause("id");
 
@@ -46,7 +60,7 @@ public class D00003Service extends D00003BaseModel implements ExecProcessFlow {
 		List <D_D00003_ROWS_RECODE> rows = new ArrayList<>();
 		for (DAccident  dp: list) {
 			D_D00003_ROWS_RECODE row = new D_D00003_ROWS_RECODE();
-			row.setId(dp.getId());
+			row.setAid(dp.getId());
 			row.setName(dp.getName());
 			row.setSid(dp.getSid());
 			row.setType(dp.getType());

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

@@ -34,7 +34,7 @@ public class D00005Service extends D00005BaseModel implements ExecProcessFlow {
 		List <D_D00005_ROWS_RECODE> rows = new ArrayList<>();
 		for (DSource  ds: list) {
 			D_D00005_ROWS_RECODE row = new D_D00005_ROWS_RECODE();
-			row.setId(ds.getId());
+			row.setSid(ds.getId());
 			row.setAid(ds.getAid());
 			row.setPid(ds.getPid());
 			row.setPname(ds.getPname());

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

@@ -35,7 +35,7 @@ public class D00007Service extends D00007BaseModel implements ExecProcessFlow {
 		for (DSourceVal dsv: list) {
 			D_D00007_ROWS_RECODE row = new D_D00007_ROWS_RECODE();
 			row.setAid(dsv.getAid());
-			row.setId(dsv.getId());
+			row.setSid(dsv.getId());
 			row.setSid(dsv.getSid());
 			row.setTimeline(dsv.getTimeline());
 			row.setVal1(floatTodobule(dsv.getVal1()));

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

@@ -1,4 +1,7 @@
 序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
 1,count,每页显示条数,int,,,,,,,,,,,
 2,page,当前页数,int,,,,,,,,,,,
-3,searchtag,查询条件,string,,,,,,,,,,,
+3,aid,事故id,int,,,,,,,,,,,
+4,source,数据源,string,,,,,,,,,,,
+5,sid,数据源ID,string,,,,,,,,,,,
+6,searchtag,查询条件,string,,,,,,,,,,,

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

@@ -1,7 +1,7 @@
 序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
 1,total,总数,int,,,,1,256,,,,,,
 2,rows,数据,list,,,,0,,,,,,,
-2.1,id,节点编号,int,,,,,,,,,,,
+2.1,aid,事故id,int,,,,,,,,,,,
 2.2,source,事故来源,string,,,,1,128,,,,,,
 2.3,type,事故类型,string,,,,1,128,,,,,,
 2.4,name,事故名称,string,,,,1,128,,,,,,

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

@@ -1,6 +1,6 @@
 序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
 2,rows,数据,list,,,,0,,,,,,,
-2.1,id,编号,int,,,,,,,,,,,
+2.1,sid,灾情源id,int,,,,,,,,,,,
 2.2,pname,管道名称,string,,,,1,2048,,,,,,
 2.3,pid,管道编号,int,,,,,,,,,,,
 2.4,sType,灾情类型,string,,,,,,,,,,,

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

@@ -7,4 +7,4 @@
 1.5,val2,值2,double,,,,,,,,,,,
 1.6,val3,值3,double,,,,,,,,,,,
 1.7,val4,值4,double,,,,,,,,,,,
-1.8,id,检测id,int,,,,,,,,,,,
+1.8,svid,检测id,int,,,,,,,,,,,