huangxingxing 6 месяцев назад
Родитель
Сommit
cf9b6e708d
30 измененных файлов с 115 добавлено и 6 удалено
  1. 13 0
      generated/com/miniframe/generate/comm/system/A_D20002.java
  2. 13 0
      generated/com/miniframe/generate/comm/system/A_D20008.java
  3. 13 0
      generated/com/miniframe/generate/comm/system/A_D20011.java
  4. 13 0
      generated/com/miniframe/generate/comm/system/D_D20001_ROWS_RECODE.java
  5. 13 0
      generated/com/miniframe/generate/comm/system/D_D20007_ROWS_RECODE.java
  6. 13 0
      generated/com/miniframe/generate/comm/system/D_D20010_ROWS_RECODE.java
  7. 1 0
      generated/validator/resources_a_d20002Form_validator.properties
  8. 1 0
      generated/validator/resources_a_d20002Form_validator_zh_CN.properties
  9. 1 0
      generated/validator/resources_a_d20008Form_validator.properties
  10. 1 0
      generated/validator/resources_a_d20008Form_validator_zh_CN.properties
  11. 1 0
      generated/validator/resources_a_d20011Form_validator.properties
  12. 1 0
      generated/validator/resources_a_d20011Form_validator_zh_CN.properties
  13. 1 0
      generated/validator/resources_d_d20001_rows_recodeForm_validator.properties
  14. 1 0
      generated/validator/resources_d_d20001_rows_recodeForm_validator_zh_CN.properties
  15. 1 0
      generated/validator/resources_d_d20007_rows_recodeForm_validator.properties
  16. 1 0
      generated/validator/resources_d_d20007_rows_recodeForm_validator_zh_CN.properties
  17. 1 0
      generated/validator/resources_d_d20010_rows_recodeForm_validator.properties
  18. 1 0
      generated/validator/resources_d_d20010_rows_recodeForm_validator_zh_CN.properties
  19. 1 0
      src/main/java/com/miniframe/bisiness/system/D20001Service.java
  20. 4 0
      src/main/java/com/miniframe/bisiness/system/D20002Service.java
  21. 1 0
      src/main/java/com/miniframe/bisiness/system/D20007Service.java
  22. 3 0
      src/main/java/com/miniframe/bisiness/system/D20008Service.java
  23. 1 0
      src/main/java/com/miniframe/bisiness/system/D20010Service.java
  24. 3 0
      src/main/java/com/miniframe/bisiness/system/D20011Service.java
  25. 2 1
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20001_D(水泵查询).csv
  26. 2 1
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20002_A(水泵添加修改).csv
  27. 2 1
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20007_D(风机查询).csv
  28. 2 1
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20008_A(风机添加修改).csv
  29. 2 1
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20010_D(风门查询).csv
  30. 2 1
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20011_A(风门添加修改).csv

+ 13 - 0
generated/com/miniframe/generate/comm/system/A_D20002.java

@@ -126,4 +126,17 @@ public class A_D20002 extends BaseMapModel implements Serializable {
 	public String getPumpcode() {
 		return this.pumpcode;
 	}
+	int pumpbaseid;//水泵配置ID
+	/**
+	 *水泵配置ID
+	 */
+	public void setPumpbaseid(int pumpbaseid) {
+		this.pumpbaseid=pumpbaseid;
+	}
+	/**
+	 *水泵配置ID
+	 */
+	public int getPumpbaseid() {
+		return this.pumpbaseid;
+	}
 }

+ 13 - 0
generated/com/miniframe/generate/comm/system/A_D20008.java

@@ -113,4 +113,17 @@ public class A_D20008 extends BaseMapModel implements Serializable {
 	public String getFancode() {
 		return this.fancode;
 	}
+	int fanbaseid;//风机配置id
+	/**
+	 *风机配置id
+	 */
+	public void setFanbaseid(int fanbaseid) {
+		this.fanbaseid=fanbaseid;
+	}
+	/**
+	 *风机配置id
+	 */
+	public int getFanbaseid() {
+		return this.fanbaseid;
+	}
 }

+ 13 - 0
generated/com/miniframe/generate/comm/system/A_D20011.java

@@ -113,4 +113,17 @@ public class A_D20011 extends BaseMapModel implements Serializable {
 	public String getDoorcode() {
 		return this.doorcode;
 	}
+	int doorbaseid;//风门配置id
+	/**
+	 *风门配置id
+	 */
+	public void setDoorbaseid(int doorbaseid) {
+		this.doorbaseid=doorbaseid;
+	}
+	/**
+	 *风门配置id
+	 */
+	public int getDoorbaseid() {
+		return this.doorbaseid;
+	}
 }

+ 13 - 0
generated/com/miniframe/generate/comm/system/D_D20001_ROWS_RECODE.java

@@ -152,4 +152,17 @@ public class D_D20001_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getPumpcode() {
 		return this.pumpcode;
 	}
+	int pumpbaseid;//水泵配置ID
+	/**
+	 *水泵配置ID
+	 */
+	public void setPumpbaseid(int pumpbaseid) {
+		this.pumpbaseid=pumpbaseid;
+	}
+	/**
+	 *水泵配置ID
+	 */
+	public int getPumpbaseid() {
+		return this.pumpbaseid;
+	}
 }

+ 13 - 0
generated/com/miniframe/generate/comm/system/D_D20007_ROWS_RECODE.java

@@ -139,4 +139,17 @@ public class D_D20007_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getFancode() {
 		return this.fancode;
 	}
+	int fanbaseid;//风机配置id
+	/**
+	 *风机配置id
+	 */
+	public void setFanbaseid(int fanbaseid) {
+		this.fanbaseid=fanbaseid;
+	}
+	/**
+	 *风机配置id
+	 */
+	public int getFanbaseid() {
+		return this.fanbaseid;
+	}
 }

+ 13 - 0
generated/com/miniframe/generate/comm/system/D_D20010_ROWS_RECODE.java

@@ -139,4 +139,17 @@ public class D_D20010_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getDoorcode() {
 		return this.doorcode;
 	}
+	int doorbaseid;//风门配置id
+	/**
+	 *风门配置id
+	 */
+	public void setDoorbaseid(int doorbaseid) {
+		this.doorbaseid=doorbaseid;
+	}
+	/**
+	 *风门配置id
+	 */
+	public int getDoorbaseid() {
+		return this.doorbaseid;
+	}
 }

+ 1 - 0
generated/validator/resources_a_d20002Form_validator.properties

@@ -7,4 +7,5 @@ a_d20002.closehig = \u5173\u95ED\u9AD8\u5EA6
 a_d20002.aid = \u4E8B\u6545id
 a_d20002.onoff = \u5F00\u51730-\u51731-\u5F00
 a_d20002.pumpcode = \u6C34\u6CF5\u7F16\u7801
+a_d20002.pumpbaseid = \u6C34\u6CF5\u914D\u7F6EID
 a_d20002Form = true

+ 1 - 0
generated/validator/resources_a_d20002Form_validator_zh_CN.properties

@@ -7,4 +7,5 @@ a_d20002.closehig = \u5173\u95ED\u9AD8\u5EA6
 a_d20002.aid = \u4E8B\u6545id
 a_d20002.onoff = \u5F00\u51730-\u51731-\u5F00
 a_d20002.pumpcode = \u6C34\u6CF5\u7F16\u7801
+a_d20002.pumpbaseid = \u6C34\u6CF5\u914D\u7F6EID
 a_d20002Form = true

+ 1 - 0
generated/validator/resources_a_d20008Form_validator.properties

@@ -6,4 +6,5 @@ a_d20008.pa = \u589E\u538Bkpa
 a_d20008.onoff = \u5F00\u51730-\u51731-\u5F00
 a_d20008.aid = \u4E8B\u6545id
 a_d20008.fancode = \u6C34\u6CF5\u7F16\u7801
+a_d20008.fanbaseid = \u98CE\u673A\u914D\u7F6Eid
 a_d20008Form = true

+ 1 - 0
generated/validator/resources_a_d20008Form_validator_zh_CN.properties

@@ -6,4 +6,5 @@ a_d20008.pa = \u589E\u538Bkpa
 a_d20008.onoff = \u5F00\u51730-\u51731-\u5F00
 a_d20008.aid = \u4E8B\u6545id
 a_d20008.fancode = \u6C34\u6CF5\u7F16\u7801
+a_d20008.fanbaseid = \u98CE\u673A\u914D\u7F6Eid
 a_d20008Form = true

+ 1 - 0
generated/validator/resources_a_d20011Form_validator.properties

@@ -6,4 +6,5 @@ a_d20011.dragcoe = \u963B\u529B\u7CFB\u6570
 a_d20011.onoff = \u5F00\u51730-\u51731-\u5F00
 a_d20011.aid = \u4E8B\u6545id
 a_d20011.doorcode = \u98CE\u95E8\u7F16\u7801
+a_d20011.doorbaseid = \u98CE\u95E8\u914D\u7F6Eid
 a_d20011Form = true

+ 1 - 0
generated/validator/resources_a_d20011Form_validator_zh_CN.properties

@@ -6,4 +6,5 @@ a_d20011.dragcoe = \u963B\u529B\u7CFB\u6570
 a_d20011.onoff = \u5F00\u51730-\u51731-\u5F00
 a_d20011.aid = \u4E8B\u6545id
 a_d20011.doorcode = \u98CE\u95E8\u7F16\u7801
+a_d20011.doorbaseid = \u98CE\u95E8\u914D\u7F6Eid
 a_d20011Form = true

+ 1 - 0
generated/validator/resources_d_d20001_rows_recodeForm_validator.properties

@@ -9,4 +9,5 @@ d_d20001_rows_recode.closehig = \u5173\u95ED\u9AD8\u5EA6
 d_d20001_rows_recode.aid = \u4E8B\u6545id
 d_d20001_rows_recode.onoff = \u5F00\u51730-\u51731-\u5F00
 d_d20001_rows_recode.pumpcode = \u6C34\u6CF5\u7F16\u7801
+d_d20001_rows_recode.pumpbaseid = \u6C34\u6CF5\u914D\u7F6EID
 d_d20001_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d20001_rows_recodeForm_validator_zh_CN.properties

@@ -9,4 +9,5 @@ d_d20001_rows_recode.closehig = \u5173\u95ED\u9AD8\u5EA6
 d_d20001_rows_recode.aid = \u4E8B\u6545id
 d_d20001_rows_recode.onoff = \u5F00\u51730-\u51731-\u5F00
 d_d20001_rows_recode.pumpcode = \u6C34\u6CF5\u7F16\u7801
+d_d20001_rows_recode.pumpbaseid = \u6C34\u6CF5\u914D\u7F6EID
 d_d20001_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d20007_rows_recodeForm_validator.properties

@@ -8,4 +8,5 @@ d_d20007_rows_recode.pa = \u589E\u538Bkpa
 d_d20007_rows_recode.onoff = \u5F00\u51730-\u51731-\u5F00
 d_d20007_rows_recode.aid = \u4E8B\u6545id
 d_d20007_rows_recode.fancode = \u6C34\u6CF5\u7F16\u7801
+d_d20007_rows_recode.fanbaseid = \u98CE\u673A\u914D\u7F6Eid
 d_d20007_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d20007_rows_recodeForm_validator_zh_CN.properties

@@ -8,4 +8,5 @@ d_d20007_rows_recode.pa = \u589E\u538Bkpa
 d_d20007_rows_recode.onoff = \u5F00\u51730-\u51731-\u5F00
 d_d20007_rows_recode.aid = \u4E8B\u6545id
 d_d20007_rows_recode.fancode = \u6C34\u6CF5\u7F16\u7801
+d_d20007_rows_recode.fanbaseid = \u98CE\u673A\u914D\u7F6Eid
 d_d20007_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d20010_rows_recodeForm_validator.properties

@@ -8,4 +8,5 @@ d_d20010_rows_recode.dragcoe = \u963B\u529B\u7CFB\u6570
 d_d20010_rows_recode.onoff = \u5F00\u51730-\u51731-\u5F00
 d_d20010_rows_recode.aid = \u4E8B\u6545id
 d_d20010_rows_recode.doorcode = \u98CE\u95E8\u7F16\u7801
+d_d20010_rows_recode.doorbaseid = \u98CE\u95E8\u914D\u7F6Eid
 d_d20010_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d20010_rows_recodeForm_validator_zh_CN.properties

@@ -8,4 +8,5 @@ d_d20010_rows_recode.dragcoe = \u963B\u529B\u7CFB\u6570
 d_d20010_rows_recode.onoff = \u5F00\u51730-\u51731-\u5F00
 d_d20010_rows_recode.aid = \u4E8B\u6545id
 d_d20010_rows_recode.doorcode = \u98CE\u95E8\u7F16\u7801
+d_d20010_rows_recode.doorbaseid = \u98CE\u95E8\u914D\u7F6Eid
 d_d20010_rows_recodeForm = true

+ 1 - 0
src/main/java/com/miniframe/bisiness/system/D20001Service.java

@@ -47,6 +47,7 @@ public class D20001Service extends D20001BaseModel implements ExecProcessFlow {
 			row.setSite(CommonUtils.floatTodobule(p.getSite()));
 			row.setOnoff(p.getOnoff());
 			row.setPumpcode(p.getCode());
+			row.setPumpbaseid(p.getPumpbaseid());
 			rows.add(row);
 		}
 		this.getD_d20001().setRows(rows);

+ 4 - 0
src/main/java/com/miniframe/bisiness/system/D20002Service.java

@@ -31,6 +31,8 @@ public class D20002Service extends D20002BaseModel implements ExecProcessFlow {
 		Integer onoff =this.getA_d20002().getOnoff();
 		String pumpcode =this.getA_d20002().getPumpcode();
 
+		Integer pumpbaseid =this.getA_d20002().getPumpbaseid();
+
 		DPipeMapper pipDao =UtilTools.getBean(DPipeMapper.class);
 		DPipe pipe = pipDao.selectByPrimaryKey(pid);
 		if(pipe==null){
@@ -49,6 +51,7 @@ public class D20002Service extends D20002BaseModel implements ExecProcessFlow {
 			p.setSite(site.floatValue());
 			p.setOnoff(onoff);
 			p.setCode(pumpcode);
+			p.setPumpbaseid(pumpbaseid);
 			pumpDao.insertSelective(p);
 		}else{//修改
 			DPump p =pumpDao.selectByPrimaryKey(pumpid);
@@ -65,6 +68,7 @@ public class D20002Service extends D20002BaseModel implements ExecProcessFlow {
 			p.setSite(site.floatValue());
 			p.setOnoff(onoff);
 			p.setCode(pumpcode);
+			p.setPumpbaseid(pumpbaseid);
 			pumpDao.updateByPrimaryKey(p);
 		}
 

+ 1 - 0
src/main/java/com/miniframe/bisiness/system/D20007Service.java

@@ -42,6 +42,7 @@ public class D20007Service extends D20007BaseModel implements ExecProcessFlow {
 			row.setPname(fan.getPname());
 			row.setPcode(fan.getPcode());
 			row.setFancode(fan.getCode());
+			row.setFanbaseid(fan.getFanbaseid());
 			rows.add(row);
 		}
 		this.getD_d20007().setRows(rows);

+ 3 - 0
src/main/java/com/miniframe/bisiness/system/D20008Service.java

@@ -29,6 +29,7 @@ public class D20008Service extends D20008BaseModel implements ExecProcessFlow {
 		Integer onoff =this.getA_d20008().getOnoff();
 		Integer aid =this.getA_d20008().getAid();
 		String fancode =this.getA_d20008().getFancode();
+		Integer fanbaseid =this.getA_d20008().getFanbaseid();
 		DPipeMapper pipDao =UtilTools.getBean(DPipeMapper.class);
 		DPipe pipe = pipDao.selectByPrimaryKey(pid);
 		if(pipe==null){
@@ -47,6 +48,7 @@ public class D20008Service extends D20008BaseModel implements ExecProcessFlow {
 			fan.setPname(pipe.getName());
 			fan.setOnoff(onoff);
 			fan.setCode(fancode);
+			fan.setFanbaseid(fanbaseid);
 			fanDao.insertSelective(fan);
 		}else{//修改
 			DVentfan fan =fanDao.selectByPrimaryKey(fanid);
@@ -62,6 +64,7 @@ public class D20008Service extends D20008BaseModel implements ExecProcessFlow {
 			fan.setPname(pipe.getName());
 			fan.setOnoff(onoff);
 			fan.setCode(fancode);
+			fan.setFanbaseid(fanbaseid);
 			fanDao.updateByPrimaryKey(fan);
 		}
 	

+ 1 - 0
src/main/java/com/miniframe/bisiness/system/D20010Service.java

@@ -42,6 +42,7 @@ public class D20010Service extends D20010BaseModel implements ExecProcessFlow {
 			row.setOnoff(d.getOnoff());
 			row.setSite(CommonUtils.floatTodobule(d.getSite()));
 			row.setDoorcode(d.getCode());
+			row.setDoorbaseid(d.getDoorbaseid());
 			rows.add(row);
 		}
 		this.getD_d20010().setRows(rows);

+ 3 - 0
src/main/java/com/miniframe/bisiness/system/D20011Service.java

@@ -29,6 +29,7 @@ public class D20011Service extends D20011BaseModel implements ExecProcessFlow {
 		Integer onoff =this.getA_d20011().getOnoff();
 		Integer aid =this.getA_d20011().getAid();
 		String doorcode =this.getA_d20011().getDoorcode();
+		Integer doorbaseid =this.getA_d20011().getDoorbaseid();
 		DPipeMapper pipDao = UtilTools.getBean(DPipeMapper.class);
 		DPipe pipe = pipDao.selectByPrimaryKey(pid);
 		if(pipe==null){
@@ -46,6 +47,7 @@ public class D20011Service extends D20011BaseModel implements ExecProcessFlow {
 			d.setPname(pipe.getName());
 			d.setPcode(pipe.getCode());
 			d.setCode(doorcode);
+			d.setDoorbaseid(doorbaseid);
 			doorDao.insertSelective(d);
 		}else{
 			DVentdoor d =doorDao.selectByPrimaryKey(doorid);
@@ -61,6 +63,7 @@ public class D20011Service extends D20011BaseModel implements ExecProcessFlow {
 			d.setPname(pipe.getName());
 			d.setPcode(pipe.getCode());
 			d.setCode(doorcode);
+			d.setDoorbaseid(doorbaseid);
 			doorDao.updateByPrimaryKey(d);
 		}
 	

+ 2 - 1
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20001_D(水泵查询).csv

@@ -10,4 +10,5 @@
 1.8,closehig,关闭高度,double,,,,,,,,,,,
 1.9,aid,事故id,int,,,,,,,,,,,
 1.10,onoff,开关0-关1-开,int,,,,,,,,,,,
-1.11,pumpcode,水泵编码,string,,,,,,,,,,,
+1.11,pumpcode,水泵编码,string,,,,,,,,,,,
+1.12,pumpbaseid,水泵配置ID,int,,,,,,,,,,,

+ 2 - 1
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20002_A(水泵添加修改).csv

@@ -7,4 +7,5 @@
 6,closehig,关闭高度,double,,,是,,,,,,,,
 7,aid,事故id,int,,,是,,,,,,,,
 8,onoff,开关0-关1-开,int,,0,是,,,,,,,,
-9,pumpcode,水泵编码,string,,,是,1,100,,,,,,
+9,pumpcode,水泵编码,string,,,是,1,100,,,,,,
+10,pumpbaseid,水泵配置ID,int,,,,,,,,,,,

+ 2 - 1
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20007_D(风机查询).csv

@@ -9,4 +9,5 @@
 1.7,pa,增压kpa,double,,,,,,,,,,,
 1.8,onoff,开关0-关1-开,int,,,,,,,,,,,
 1.9,aid,事故id,int,,,,,,,,,,,
-1.10,fancode,水泵编码,string,,,,,,,,,,,
+1.10,fancode,水泵编码,string,,,,,,,,,,,
+1.11,fanbaseid,风机配置id,int,,,,,,,,,,,

+ 2 - 1
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20008_A(风机添加修改).csv

@@ -6,4 +6,5 @@
 6,pa,增压kpa,double,,100000,是,,,,,,,,
 7,onoff,开关0-关1-开,int,,0,是,,,,,,,,
 8,aid,事故id,int,,,是,,,,,,,,
-9,fancode,水泵编码,string,,,是,1,100,,,,,,
+9,fancode,水泵编码,string,,,是,1,100,,,,,,
+10,fanbaseid,风机配置id,int,,,,,,,,,,,

+ 2 - 1
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20010_D(风门查询).csv

@@ -9,4 +9,5 @@
 1.7,dragcoe,阻力系数,double,,,,,,,,,,,
 1.8,onoff,开关0-关1-开,int,,,,,,,,,,,
 1.9,aid,事故id,int,,,,,,,,,,,
-1.10,doorcode,风门编码,string,,,,,,,,,,,
+1.10,doorcode,风门编码,string,,,,,,,,,,,
+1.11,doorbaseid,风门配置id,int,,,,,,,,,,,

+ 2 - 1
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20011_A(风门添加修改).csv

@@ -6,4 +6,5 @@
 5,dragcoe,阻力系数,double,,,是,,,,,,,,
 6,onoff,开关0-关1-开,int,,0,是,,,,,,,,
 7,aid,事故id,int,,,是,,,,,,,,
-8,doorcode,风门编码,string,,,是,1,100,,,,,,
+8,doorcode,风门编码,string,,,是,1,100,,,,,,
+9,doorbaseid,风门配置id,int,,,,,,,,,,,