Răsfoiți Sursa

水泵、风机、风门 新增编码

huangxingxing 8 luni în urmă
părinte
comite
f9fc06f49a
40 a modificat fișierele cu 433 adăugiri și 8 ștergeri
  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. 13 0
      generated/validateform/a_d20002Form.xml
  8. 13 0
      generated/validateform/a_d20008Form.xml
  9. 13 0
      generated/validateform/a_d20011Form.xml
  10. 1 0
      generated/validator/resources_a_d20002Form_validator.properties
  11. 1 0
      generated/validator/resources_a_d20002Form_validator_zh_CN.properties
  12. 1 0
      generated/validator/resources_a_d20008Form_validator.properties
  13. 1 0
      generated/validator/resources_a_d20008Form_validator_zh_CN.properties
  14. 1 0
      generated/validator/resources_a_d20011Form_validator.properties
  15. 1 0
      generated/validator/resources_a_d20011Form_validator_zh_CN.properties
  16. 1 0
      generated/validator/resources_d_d20001_rows_recodeForm_validator.properties
  17. 1 0
      generated/validator/resources_d_d20001_rows_recodeForm_validator_zh_CN.properties
  18. 1 0
      generated/validator/resources_d_d20007_rows_recodeForm_validator.properties
  19. 1 0
      generated/validator/resources_d_d20007_rows_recodeForm_validator_zh_CN.properties
  20. 1 0
      generated/validator/resources_d_d20010_rows_recodeForm_validator.properties
  21. 1 0
      generated/validator/resources_d_d20010_rows_recodeForm_validator_zh_CN.properties
  22. 23 0
      modelsrc/com/miniframe/model/system/DPump.java
  23. 70 0
      modelsrc/com/miniframe/model/system/DPumpSQLBuilder.java
  24. 23 0
      modelsrc/com/miniframe/model/system/DVentdoor.java
  25. 70 0
      modelsrc/com/miniframe/model/system/DVentdoorSQLBuilder.java
  26. 23 0
      modelsrc/com/miniframe/model/system/DVentfan.java
  27. 70 0
      modelsrc/com/miniframe/model/system/DVentfanSQLBuilder.java
  28. 1 1
      modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml
  29. 1 0
      src/main/java/com/miniframe/bisiness/system/D20001Service.java
  30. 3 0
      src/main/java/com/miniframe/bisiness/system/D20002Service.java
  31. 1 0
      src/main/java/com/miniframe/bisiness/system/D20007Service.java
  32. 3 1
      src/main/java/com/miniframe/bisiness/system/D20008Service.java
  33. 1 0
      src/main/java/com/miniframe/bisiness/system/D20010Service.java
  34. 3 0
      src/main/java/com/miniframe/bisiness/system/D20011Service.java
  35. 2 1
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20001_D(水泵查询).csv
  36. 2 1
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20002_A(水泵添加修改).csv
  37. 2 1
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20007_D(风机查询).csv
  38. 2 1
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20008_A(风机添加修改).csv
  39. 2 1
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20010_D(风门查询).csv
  40. 2 1
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20011_A(风门添加修改).csv

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

@@ -113,4 +113,17 @@ public class A_D20002 extends BaseMapModel implements Serializable {
 	public int getOnoff() {
 		return this.onoff;
 	}
+	String pumpcode;//水泵编码
+	/**
+	 *水泵编码
+	 */
+	public void setPumpcode(String pumpcode) {
+		this.pumpcode=pumpcode;
+	}
+	/**
+	 *水泵编码
+	 */
+	public String getPumpcode() {
+		return this.pumpcode;
+	}
 }

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

@@ -100,4 +100,17 @@ public class A_D20008 extends BaseMapModel implements Serializable {
 	public int getAid() {
 		return this.aid;
 	}
+	String fancode;//水泵编码
+	/**
+	 *水泵编码
+	 */
+	public void setFancode(String fancode) {
+		this.fancode=fancode;
+	}
+	/**
+	 *水泵编码
+	 */
+	public String getFancode() {
+		return this.fancode;
+	}
 }

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

@@ -100,4 +100,17 @@ public class A_D20011 extends BaseMapModel implements Serializable {
 	public int getAid() {
 		return this.aid;
 	}
+	String doorcode;//风门编码
+	/**
+	 *风门编码
+	 */
+	public void setDoorcode(String doorcode) {
+		this.doorcode=doorcode;
+	}
+	/**
+	 *风门编码
+	 */
+	public String getDoorcode() {
+		return this.doorcode;
+	}
 }

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

@@ -139,4 +139,17 @@ public class D_D20001_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public int getOnoff() {
 		return this.onoff;
 	}
+	String pumpcode;//水泵编码
+	/**
+	 *水泵编码
+	 */
+	public void setPumpcode(String pumpcode) {
+		this.pumpcode=pumpcode;
+	}
+	/**
+	 *水泵编码
+	 */
+	public String getPumpcode() {
+		return this.pumpcode;
+	}
 }

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

@@ -126,4 +126,17 @@ public class D_D20007_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public int getAid() {
 		return this.aid;
 	}
+	String fancode;//水泵编码
+	/**
+	 *水泵编码
+	 */
+	public void setFancode(String fancode) {
+		this.fancode=fancode;
+	}
+	/**
+	 *水泵编码
+	 */
+	public String getFancode() {
+		return this.fancode;
+	}
 }

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

@@ -126,4 +126,17 @@ public class D_D20010_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public int getAid() {
 		return this.aid;
 	}
+	String doorcode;//风门编码
+	/**
+	 *风门编码
+	 */
+	public void setDoorcode(String doorcode) {
+		this.doorcode=doorcode;
+	}
+	/**
+	 *风门编码
+	 */
+	public String getDoorcode() {
+		return this.doorcode;
+	}
 }

+ 13 - 0
generated/validateform/a_d20002Form.xml

@@ -35,6 +35,19 @@
 <field property="onoff" depends="required">
     <arg0 key="a_d20002.onoff"/>
 </field>
+<field property="pumpcode" depends="required,minlength,maxlength">
+    <arg0 key="a_d20002.pumpcode"/>
+    <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>100</var-value>
+    </var>
+</field>
 </form>
 </formset>
 </form-validation>

+ 13 - 0
generated/validateform/a_d20008Form.xml

@@ -32,6 +32,19 @@
 <field property="aid" depends="required">
     <arg0 key="a_d20008.aid"/>
 </field>
+<field property="fancode" depends="required,minlength,maxlength">
+    <arg0 key="a_d20008.fancode"/>
+    <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>100</var-value>
+    </var>
+</field>
 </form>
 </formset>
 </form-validation>

+ 13 - 0
generated/validateform/a_d20011Form.xml

@@ -32,6 +32,19 @@
 <field property="aid" depends="required">
     <arg0 key="a_d20011.aid"/>
 </field>
+<field property="doorcode" depends="required,minlength,maxlength">
+    <arg0 key="a_d20011.doorcode"/>
+    <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>100</var-value>
+    </var>
+</field>
 </form>
 </formset>
 </form-validation>

+ 1 - 0
generated/validator/resources_a_d20002Form_validator.properties

@@ -6,4 +6,5 @@ a_d20002.openhig = \u5F00\u542F\u9AD8\u5EA6
 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_d20002Form = true

+ 1 - 0
generated/validator/resources_a_d20002Form_validator_zh_CN.properties

@@ -6,4 +6,5 @@ a_d20002.openhig = \u5F00\u542F\u9AD8\u5EA6
 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_d20002Form = true

+ 1 - 0
generated/validator/resources_a_d20008Form_validator.properties

@@ -5,4 +5,5 @@ a_d20008.site = \u4F4D\u7F6E
 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_d20008Form = true

+ 1 - 0
generated/validator/resources_a_d20008Form_validator_zh_CN.properties

@@ -5,4 +5,5 @@ a_d20008.site = \u4F4D\u7F6E
 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_d20008Form = true

+ 1 - 0
generated/validator/resources_a_d20011Form_validator.properties

@@ -5,4 +5,5 @@ a_d20011.site = \u4F4D\u7F6E
 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_d20011Form = true

+ 1 - 0
generated/validator/resources_a_d20011Form_validator_zh_CN.properties

@@ -5,4 +5,5 @@ a_d20011.site = \u4F4D\u7F6E
 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_d20011Form = true

+ 1 - 0
generated/validator/resources_d_d20001_rows_recodeForm_validator.properties

@@ -8,4 +8,5 @@ d_d20001_rows_recode.openhig = \u5F00\u542F\u9AD8\u5EA6
 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_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d20001_rows_recodeForm_validator_zh_CN.properties

@@ -8,4 +8,5 @@ d_d20001_rows_recode.openhig = \u5F00\u542F\u9AD8\u5EA6
 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_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d20007_rows_recodeForm_validator.properties

@@ -7,4 +7,5 @@ d_d20007_rows_recode.site = \u4F4D\u7F6E
 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_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d20007_rows_recodeForm_validator_zh_CN.properties

@@ -7,4 +7,5 @@ d_d20007_rows_recode.site = \u4F4D\u7F6E
 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_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d20010_rows_recodeForm_validator.properties

@@ -7,4 +7,5 @@ d_d20010_rows_recode.site = \u4F4D\u7F6E
 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_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d20010_rows_recodeForm_validator_zh_CN.properties

@@ -7,4 +7,5 @@ d_d20010_rows_recode.site = \u4F4D\u7F6E
 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_recodeForm = true

+ 23 - 0
modelsrc/com/miniframe/model/system/DPump.java

@@ -54,6 +54,11 @@ public class DPump extends MiniserviceBaseModel implements Serializable {
      */
     private Integer onoff;
 
+    /**
+     * 水泵编码
+     */
+    private String code;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -231,4 +236,22 @@ public class DPump extends MiniserviceBaseModel implements Serializable {
     public void setOnoff(Integer onoff) {
         this.onoff = onoff;
     }
+
+    /**
+     * 获取水泵编码
+     *
+     * @return code - 水泵编码
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * 设置水泵编码
+     *
+     * @param code 水泵编码
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
 }

+ 70 - 0
modelsrc/com/miniframe/model/system/DPumpSQLBuilder.java

@@ -733,6 +733,76 @@ public class DPumpSQLBuilder {
             addCriterion("onoff not between", value1, value2, "onoff");
             return (Criteria) this;
         }
+
+        public Criteria andCodeIsNull() {
+            addCriterion("code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNotNull() {
+            addCriterion("code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEqualTo(String value) {
+            addCriterion("code =", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotEqualTo(String value) {
+            addCriterion("code <>", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThan(String value) {
+            addCriterion("code >", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("code >=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThan(String value) {
+            addCriterion("code <", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThanOrEqualTo(String value) {
+            addCriterion("code <=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLike(String value) {
+            addCriterion("code like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotLike(String value) {
+            addCriterion("code not like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("code in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotIn(List<String> values) {
+            addCriterion("code not in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeBetween(String value1, String value2) {
+            addCriterion("code between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotBetween(String value1, String value2) {
+            addCriterion("code not between", value1, value2, "code");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 23 - 0
modelsrc/com/miniframe/model/system/DVentdoor.java

@@ -49,6 +49,11 @@ public class DVentdoor extends MiniserviceBaseModel implements Serializable {
      */
     private Float site;
 
+    /**
+     * 风门编码
+     */
+    private String code;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -208,4 +213,22 @@ public class DVentdoor extends MiniserviceBaseModel implements Serializable {
     public void setSite(Float site) {
         this.site = site;
     }
+
+    /**
+     * 获取风门编码
+     *
+     * @return code - 风门编码
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * 设置风门编码
+     *
+     * @param code 风门编码
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
 }

+ 70 - 0
modelsrc/com/miniframe/model/system/DVentdoorSQLBuilder.java

@@ -673,6 +673,76 @@ public class DVentdoorSQLBuilder {
             addCriterion("site not between", value1, value2, "site");
             return (Criteria) this;
         }
+
+        public Criteria andCodeIsNull() {
+            addCriterion("code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNotNull() {
+            addCriterion("code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEqualTo(String value) {
+            addCriterion("code =", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotEqualTo(String value) {
+            addCriterion("code <>", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThan(String value) {
+            addCriterion("code >", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("code >=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThan(String value) {
+            addCriterion("code <", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThanOrEqualTo(String value) {
+            addCriterion("code <=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLike(String value) {
+            addCriterion("code like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotLike(String value) {
+            addCriterion("code not like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("code in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotIn(List<String> values) {
+            addCriterion("code not in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeBetween(String value1, String value2) {
+            addCriterion("code between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotBetween(String value1, String value2) {
+            addCriterion("code not between", value1, value2, "code");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 23 - 0
modelsrc/com/miniframe/model/system/DVentfan.java

@@ -49,6 +49,11 @@ public class DVentfan extends MiniserviceBaseModel implements Serializable {
      */
     private String name;
 
+    /**
+     * 风机编码
+     */
+    private String code;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -208,4 +213,22 @@ public class DVentfan extends MiniserviceBaseModel implements Serializable {
     public void setName(String name) {
         this.name = name == null ? null : name.trim();
     }
+
+    /**
+     * 获取风机编码
+     *
+     * @return code - 风机编码
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * 设置风机编码
+     *
+     * @param code 风机编码
+     */
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
 }

+ 70 - 0
modelsrc/com/miniframe/model/system/DVentfanSQLBuilder.java

@@ -673,6 +673,76 @@ public class DVentfanSQLBuilder {
             addCriterion("name not between", value1, value2, "name");
             return (Criteria) this;
         }
+
+        public Criteria andCodeIsNull() {
+            addCriterion("code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIsNotNull() {
+            addCriterion("code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEqualTo(String value) {
+            addCriterion("code =", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotEqualTo(String value) {
+            addCriterion("code <>", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThan(String value) {
+            addCriterion("code >", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("code >=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThan(String value) {
+            addCriterion("code <", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLessThanOrEqualTo(String value) {
+            addCriterion("code <=", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeLike(String value) {
+            addCriterion("code like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotLike(String value) {
+            addCriterion("code not like", value, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeIn(List<String> values) {
+            addCriterion("code in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotIn(List<String> values) {
+            addCriterion("code not in", values, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeBetween(String value1, String value2) {
+            addCriterion("code between", value1, value2, "code");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeNotBetween(String value1, String value2) {
+            addCriterion("code not between", value1, value2, "code");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 1 - 1
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 Dec 12 15:52:34 CST 2024.
+    This file was generated on Sat Dec 21 11:28:55 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

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

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

@@ -29,6 +29,7 @@ public class D20002Service extends D20002BaseModel implements ExecProcessFlow {
 		Double closehig =this.getA_d20002().getClosehig();
 		Integer aid =this.getA_d20002().getAid();
 		Integer onoff =this.getA_d20002().getOnoff();
+		String pumpcode =this.getA_d20002().getPumpcode();
 
 		DPipeMapper pipDao =UtilTools.getBean(DPipeMapper.class);
 		DPipe pipe = pipDao.selectByPrimaryKey(pid);
@@ -47,6 +48,7 @@ public class D20002Service extends D20002BaseModel implements ExecProcessFlow {
 			p.setName(pumpname);
 			p.setSite(site.floatValue());
 			p.setOnoff(onoff);
+			p.setCode(pumpcode);
 			pumpDao.insertSelective(p);
 		}else{//修改
 			DPump p =pumpDao.selectByPrimaryKey(pumpid);
@@ -62,6 +64,7 @@ public class D20002Service extends D20002BaseModel implements ExecProcessFlow {
 			p.setName(pumpname);
 			p.setSite(site.floatValue());
 			p.setOnoff(onoff);
+			p.setCode(pumpcode);
 			pumpDao.updateByPrimaryKey(p);
 		}
 

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

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

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

@@ -28,7 +28,7 @@ public class D20008Service extends D20008BaseModel implements ExecProcessFlow {
 		String fanname =this.getA_d20008().getFanname();
 		Integer onoff =this.getA_d20008().getOnoff();
 		Integer aid =this.getA_d20008().getAid();
-
+		String fancode =this.getA_d20008().getFancode();
 		DPipeMapper pipDao =UtilTools.getBean(DPipeMapper.class);
 		DPipe pipe = pipDao.selectByPrimaryKey(pid);
 		if(pipe==null){
@@ -46,6 +46,7 @@ public class D20008Service extends D20008BaseModel implements ExecProcessFlow {
 			fan.setPcode(pipe.getCode());
 			fan.setPname(pipe.getName());
 			fan.setOnoff(onoff);
+			fan.setCode(fancode);
 			fanDao.insertSelective(fan);
 		}else{//修改
 			DVentfan fan =fanDao.selectByPrimaryKey(fanid);
@@ -60,6 +61,7 @@ public class D20008Service extends D20008BaseModel implements ExecProcessFlow {
 			fan.setPcode(pipe.getCode());
 			fan.setPname(pipe.getName());
 			fan.setOnoff(onoff);
+			fan.setCode(fancode);
 			fanDao.updateByPrimaryKey(fan);
 		}
 	

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

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

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

@@ -28,6 +28,7 @@ public class D20011Service extends D20011BaseModel implements ExecProcessFlow {
 		Double dragcoe =this.getA_d20011().getDragcoe();
 		Integer onoff =this.getA_d20011().getOnoff();
 		Integer aid =this.getA_d20011().getAid();
+		String doorcode =this.getA_d20011().getDoorcode();
 		DPipeMapper pipDao = UtilTools.getBean(DPipeMapper.class);
 		DPipe pipe = pipDao.selectByPrimaryKey(pid);
 		if(pipe==null){
@@ -44,6 +45,7 @@ public class D20011Service extends D20011BaseModel implements ExecProcessFlow {
 			d.setPid(pid);
 			d.setPname(pipe.getName());
 			d.setPcode(pipe.getCode());
+			d.setCode(doorcode);
 			doorDao.insertSelective(d);
 		}else{
 			DVentdoor d =doorDao.selectByPrimaryKey(doorid);
@@ -58,6 +60,7 @@ public class D20011Service extends D20011BaseModel implements ExecProcessFlow {
 			d.setPid(pid);
 			d.setPname(pipe.getName());
 			d.setPcode(pipe.getCode());
+			d.setCode(doorcode);
 			doorDao.updateByPrimaryKey(d);
 		}
 	

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

@@ -9,4 +9,5 @@
 1.7,openhig,开启高度,double,,,,,,,,,,,
 1.8,closehig,关闭高度,double,,,,,,,,,,,
 1.9,aid,事故id,int,,,,,,,,,,,
-1.10,onoff,开关0-关1-开,int,,,,,,,,,,,
+1.10,onoff,开关0-关1-开,int,,,,,,,,,,,
+1.11,pumpcode,水泵编码,string,,,,,,,,,,,

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

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

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

@@ -8,4 +8,5 @@
 1.6,site,位置,double,,,,,,,,,,,
 1.7,pa,增压kpa,double,,,,,,,,,,,
 1.8,onoff,开关0-关1-开,int,,,,,,,,,,,
-1.9,aid,事故id,int,,,,,,,,,,,
+1.9,aid,事故id,int,,,,,,,,,,,
+1.10,fancode,水泵编码,string,,,,,,,,,,,

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

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

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

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

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

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