Selaa lähdekoodia

相对位置 添加 位置信息接口

huangxingxing 1 kuukausi sitten
vanhempi
säilyke
3d0e9f9201
100 muutettua tiedostoa jossa 1760 lisäystä ja 155 poistoa
  1. 13 0
      generated/com/miniframe/generate/comm/system/A_D000010.java
  2. 13 0
      generated/com/miniframe/generate/comm/system/A_D00004.java
  3. 13 0
      generated/com/miniframe/generate/comm/system/A_D10005.java
  4. 13 0
      generated/com/miniframe/generate/comm/system/A_D10024.java
  5. 13 0
      generated/com/miniframe/generate/comm/system/A_D20002.java
  6. 13 0
      generated/com/miniframe/generate/comm/system/A_D20008.java
  7. 13 0
      generated/com/miniframe/generate/comm/system/A_D20011.java
  8. 13 0
      generated/com/miniframe/generate/comm/system/A_D50002.java
  9. 13 0
      generated/com/miniframe/generate/comm/system/A_D50008.java
  10. 13 0
      generated/com/miniframe/generate/comm/system/A_D50011.java
  11. 13 0
      generated/com/miniframe/generate/comm/system/D_D00005_ROWS_RECODE.java
  12. 13 0
      generated/com/miniframe/generate/comm/system/D_D10004_ROWS_RECODE.java
  13. 13 0
      generated/com/miniframe/generate/comm/system/D_D10023_ROWS_RECODE.java
  14. 13 0
      generated/com/miniframe/generate/comm/system/D_D20001_ROWS_RECODE.java
  15. 13 0
      generated/com/miniframe/generate/comm/system/D_D20007_ROWS_RECODE.java
  16. 13 0
      generated/com/miniframe/generate/comm/system/D_D20010_ROWS_RECODE.java
  17. 13 0
      generated/com/miniframe/generate/comm/system/D_D50001_ROWS_RECODE.java
  18. 13 0
      generated/com/miniframe/generate/comm/system/D_D50007_ROWS_RECODE.java
  19. 13 0
      generated/com/miniframe/generate/comm/system/D_D50010_ROWS_RECODE.java
  20. 3 0
      generated/validateform/a_d000010Form.xml
  21. 1 0
      generated/validator/resources_a_d000010Form_validator.properties
  22. 1 0
      generated/validator/resources_a_d000010Form_validator_zh_CN.properties
  23. 1 0
      generated/validator/resources_a_d00004Form_validator.properties
  24. 1 0
      generated/validator/resources_a_d00004Form_validator_zh_CN.properties
  25. 1 0
      generated/validator/resources_a_d10005Form_validator.properties
  26. 1 0
      generated/validator/resources_a_d10005Form_validator_zh_CN.properties
  27. 1 0
      generated/validator/resources_a_d10024Form_validator.properties
  28. 1 0
      generated/validator/resources_a_d10024Form_validator_zh_CN.properties
  29. 1 0
      generated/validator/resources_a_d20002Form_validator.properties
  30. 1 0
      generated/validator/resources_a_d20002Form_validator_zh_CN.properties
  31. 1 0
      generated/validator/resources_a_d20008Form_validator.properties
  32. 1 0
      generated/validator/resources_a_d20008Form_validator_zh_CN.properties
  33. 1 0
      generated/validator/resources_a_d20011Form_validator.properties
  34. 1 0
      generated/validator/resources_a_d20011Form_validator_zh_CN.properties
  35. 1 0
      generated/validator/resources_a_d50002Form_validator.properties
  36. 1 0
      generated/validator/resources_a_d50002Form_validator_zh_CN.properties
  37. 1 0
      generated/validator/resources_a_d50008Form_validator.properties
  38. 1 0
      generated/validator/resources_a_d50008Form_validator_zh_CN.properties
  39. 1 0
      generated/validator/resources_a_d50011Form_validator.properties
  40. 1 0
      generated/validator/resources_a_d50011Form_validator_zh_CN.properties
  41. 1 0
      generated/validator/resources_d_d00005_rows_recodeForm_validator.properties
  42. 1 0
      generated/validator/resources_d_d00005_rows_recodeForm_validator_zh_CN.properties
  43. 1 0
      generated/validator/resources_d_d10004_rows_recodeForm_validator.properties
  44. 1 0
      generated/validator/resources_d_d10004_rows_recodeForm_validator_zh_CN.properties
  45. 1 0
      generated/validator/resources_d_d10023_rows_recodeForm_validator.properties
  46. 1 0
      generated/validator/resources_d_d10023_rows_recodeForm_validator_zh_CN.properties
  47. 1 0
      generated/validator/resources_d_d20001_rows_recodeForm_validator.properties
  48. 1 0
      generated/validator/resources_d_d20001_rows_recodeForm_validator_zh_CN.properties
  49. 1 0
      generated/validator/resources_d_d20007_rows_recodeForm_validator.properties
  50. 1 0
      generated/validator/resources_d_d20007_rows_recodeForm_validator_zh_CN.properties
  51. 1 0
      generated/validator/resources_d_d20010_rows_recodeForm_validator.properties
  52. 1 0
      generated/validator/resources_d_d20010_rows_recodeForm_validator_zh_CN.properties
  53. 1 0
      generated/validator/resources_d_d50001_rows_recodeForm_validator.properties
  54. 1 0
      generated/validator/resources_d_d50001_rows_recodeForm_validator_zh_CN.properties
  55. 1 0
      generated/validator/resources_d_d50007_rows_recodeForm_validator.properties
  56. 1 0
      generated/validator/resources_d_d50007_rows_recodeForm_validator_zh_CN.properties
  57. 1 0
      generated/validator/resources_d_d50010_rows_recodeForm_validator.properties
  58. 1 0
      generated/validator/resources_d_d50010_rows_recodeForm_validator_zh_CN.properties
  59. 9 2
      modelsrc/com/miniframe/model/system/DAccident.java
  60. 18 4
      modelsrc/com/miniframe/model/system/DBoundary.java
  61. 32 2
      modelsrc/com/miniframe/model/system/DChecknode.java
  62. 70 0
      modelsrc/com/miniframe/model/system/DChecknodeSQLBuilder.java
  63. 63 14
      modelsrc/com/miniframe/model/system/DChecknodeVal.java
  64. 63 14
      modelsrc/com/miniframe/model/system/DChecknodeValcode.java
  65. 9 2
      modelsrc/com/miniframe/model/system/DCon.java
  66. 27 6
      modelsrc/com/miniframe/model/system/DGas.java
  67. 32 2
      modelsrc/com/miniframe/model/system/DGasBlastArea.java
  68. 70 0
      modelsrc/com/miniframe/model/system/DGasBlastAreaSQLBuilder.java
  69. 9 2
      modelsrc/com/miniframe/model/system/DGasGatherArea.java
  70. 27 6
      modelsrc/com/miniframe/model/system/DJob.java
  71. 9 2
      modelsrc/com/miniframe/model/system/DMway.java
  72. 9 2
      modelsrc/com/miniframe/model/system/DMwaynode.java
  73. 54 12
      modelsrc/com/miniframe/model/system/DNode.java
  74. 18 4
      modelsrc/com/miniframe/model/system/DPipe.java
  75. 32 2
      modelsrc/com/miniframe/model/system/DPump.java
  76. 25 2
      modelsrc/com/miniframe/model/system/DPumpBase.java
  77. 70 0
      modelsrc/com/miniframe/model/system/DPumpBaseSQLBuilder.java
  78. 9 3
      modelsrc/com/miniframe/model/system/DPumpHfBase.java
  79. 70 0
      modelsrc/com/miniframe/model/system/DPumpSQLBuilder.java
  80. 54 12
      modelsrc/com/miniframe/model/system/DSensor.java
  81. 32 2
      modelsrc/com/miniframe/model/system/DSource.java
  82. 70 0
      modelsrc/com/miniframe/model/system/DSourceSQLBuilder.java
  83. 41 13
      modelsrc/com/miniframe/model/system/DSourceVal.java
  84. 32 2
      modelsrc/com/miniframe/model/system/DVentdoor.java
  85. 25 2
      modelsrc/com/miniframe/model/system/DVentdoorBase.java
  86. 70 0
      modelsrc/com/miniframe/model/system/DVentdoorBaseSQLBuilder.java
  87. 70 0
      modelsrc/com/miniframe/model/system/DVentdoorSQLBuilder.java
  88. 32 2
      modelsrc/com/miniframe/model/system/DVentfan.java
  89. 25 2
      modelsrc/com/miniframe/model/system/DVentfanBase.java
  90. 70 0
      modelsrc/com/miniframe/model/system/DVentfanBaseSQLBuilder.java
  91. 70 0
      modelsrc/com/miniframe/model/system/DVentfanSQLBuilder.java
  92. 63 14
      modelsrc/com/miniframe/model/system/DWayResult.java
  93. 14 7
      modelsrc/com/miniframe/model/system/DWaynode.java
  94. 72 16
      modelsrc/com/miniframe/model/system/DWaynodeResult.java
  95. 1 1
      modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml
  96. 1 1
      src/main/java/com/miniframe/bisiness/system/D000010Service.java
  97. 2 0
      src/main/java/com/miniframe/bisiness/system/D00004Service.java
  98. 1 0
      src/main/java/com/miniframe/bisiness/system/D00005Service.java
  99. 1 0
      src/main/java/com/miniframe/bisiness/system/D00009Service.java
  100. 1 0
      src/main/java/com/miniframe/bisiness/system/D10004Service.java

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

@@ -48,4 +48,17 @@ public class A_D000010 extends BaseMapModel implements Serializable {
 	public int getSid() {
 		return this.sid;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

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

@@ -48,4 +48,17 @@ public class A_D00004 extends BaseMapModel implements Serializable {
 	public double getSite() {
 		return this.site;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

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

@@ -74,4 +74,17 @@ public class A_D10005 extends BaseMapModel implements Serializable {
 	public String getChcode() {
 		return this.chcode;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

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

@@ -74,4 +74,17 @@ public class A_D10024 extends BaseMapModel implements Serializable {
 	public int getGbid() {
 		return this.gbid;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

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

@@ -139,4 +139,17 @@ public class A_D20002 extends BaseMapModel implements Serializable {
 	public int getPumpbaseid() {
 		return this.pumpbaseid;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

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

@@ -126,4 +126,17 @@ public class A_D20008 extends BaseMapModel implements Serializable {
 	public int getFanbaseid() {
 		return this.fanbaseid;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

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

@@ -126,4 +126,17 @@ public class A_D20011 extends BaseMapModel implements Serializable {
 	public int getDoorbaseid() {
 		return this.doorbaseid;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

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

@@ -113,4 +113,17 @@ public class A_D50002 extends BaseMapModel implements Serializable {
 	public String getPumpcode() {
 		return this.pumpcode;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

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

@@ -100,4 +100,17 @@ public class A_D50008 extends BaseMapModel implements Serializable {
 	public String getFancode() {
 		return this.fancode;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

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

@@ -100,4 +100,17 @@ public class A_D50011 extends BaseMapModel implements Serializable {
 	public String getDoorcode() {
 		return this.doorcode;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

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

@@ -74,4 +74,17 @@ public class D_D00005_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public double getSite() {
 		return this.site;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

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

@@ -87,4 +87,17 @@ public class D_D10004_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getChcode() {
 		return this.chcode;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

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

@@ -100,4 +100,17 @@ public class D_D10023_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public int getGbid() {
 		return this.gbid;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

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

@@ -165,4 +165,17 @@ public class D_D20001_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public int getPumpbaseid() {
 		return this.pumpbaseid;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

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

@@ -152,4 +152,17 @@ public class D_D20007_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public int getFanbaseid() {
 		return this.fanbaseid;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

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

@@ -152,4 +152,17 @@ public class D_D20010_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public int getDoorbaseid() {
 		return this.doorbaseid;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

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

@@ -139,4 +139,17 @@ public class D_D50001_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getPumpcode() {
 		return this.pumpcode;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

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

@@ -126,4 +126,17 @@ public class D_D50007_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getFancode() {
 		return this.fancode;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

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

@@ -139,4 +139,17 @@ public class D_D50010_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public String getDoorcode() {
 		return this.doorcode;
 	}
+	String siteremark;//位置说明
+	/**
+	 *位置说明
+	 */
+	public void setSiteremark(String siteremark) {
+		this.siteremark=siteremark;
+	}
+	/**
+	 *位置说明
+	 */
+	public String getSiteremark() {
+		return this.siteremark;
+	}
 }

+ 3 - 0
generated/validateform/a_d000010Form.xml

@@ -13,6 +13,9 @@
 <field property="sid" depends="required">
     <arg0 key="a_d000010.sid"/>
 </field>
+<field property="siteremark" depends="required">
+    <arg0 key="a_d000010.siteremark"/>
+</field>
 </form>
 </formset>
 </form-validation>

+ 1 - 0
generated/validator/resources_a_d000010Form_validator.properties

@@ -1,4 +1,5 @@
 a_d000010.pid = \u7BA1\u9053id
 a_d000010.site = \u4F4D\u7F6E
 a_d000010.sid = \u707E\u60C5\u70B9\u6E90id
+a_d000010.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d000010Form = true

+ 1 - 0
generated/validator/resources_a_d000010Form_validator_zh_CN.properties

@@ -1,4 +1,5 @@
 a_d000010.pid = \u7BA1\u9053id
 a_d000010.site = \u4F4D\u7F6E
 a_d000010.sid = \u707E\u60C5\u70B9\u6E90id
+a_d000010.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d000010Form = true

+ 1 - 0
generated/validator/resources_a_d00004Form_validator.properties

@@ -1,4 +1,5 @@
 a_d00004.pid = \u7BA1\u9053id
 a_d00004.aid = \u4E8B\u6545id
 a_d00004.site = \u4F4D\u7F6E
+a_d00004.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d00004Form = true

+ 1 - 0
generated/validator/resources_a_d00004Form_validator_zh_CN.properties

@@ -1,4 +1,5 @@
 a_d00004.pid = \u7BA1\u9053id
 a_d00004.aid = \u4E8B\u6545id
 a_d00004.site = \u4F4D\u7F6E
+a_d00004.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d00004Form = true

+ 1 - 0
generated/validator/resources_a_d10005Form_validator.properties

@@ -3,4 +3,5 @@ a_d10005.pid = \u7BA1\u9053\u7F16\u53F7
 a_d10005.site = \u4F4D\u7F6E
 a_d10005.chname = \u76D1\u6D4B\u70B9\u540D\u79F0
 a_d10005.chcode = \u76D1\u6D4B\u70B9\u7F16\u53F7
+a_d10005.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d10005Form = true

+ 1 - 0
generated/validator/resources_a_d10005Form_validator_zh_CN.properties

@@ -3,4 +3,5 @@ a_d10005.pid = \u7BA1\u9053\u7F16\u53F7
 a_d10005.site = \u4F4D\u7F6E
 a_d10005.chname = \u76D1\u6D4B\u70B9\u540D\u79F0
 a_d10005.chcode = \u76D1\u6D4B\u70B9\u7F16\u53F7
+a_d10005.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d10005Form = true

+ 1 - 0
generated/validator/resources_a_d10024Form_validator.properties

@@ -3,4 +3,5 @@ a_d10024.pid = \u7BA1\u9053ID
 a_d10024.ssite = \u5F00\u59CB\u4F4D\u7F6E
 a_d10024.esite = \u7ED3\u675F\u4F4D\u7F6E
 a_d10024.gbid = \u74E6\u65AF\u7206\u70B8\u533A\u57DFID
+a_d10024.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d10024Form = true

+ 1 - 0
generated/validator/resources_a_d10024Form_validator_zh_CN.properties

@@ -3,4 +3,5 @@ a_d10024.pid = \u7BA1\u9053ID
 a_d10024.ssite = \u5F00\u59CB\u4F4D\u7F6E
 a_d10024.esite = \u7ED3\u675F\u4F4D\u7F6E
 a_d10024.gbid = \u74E6\u65AF\u7206\u70B8\u533A\u57DFID
+a_d10024.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d10024Form = true

+ 1 - 0
generated/validator/resources_a_d20002Form_validator.properties

@@ -8,4 +8,5 @@ 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_d20002.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d20002Form = true

+ 1 - 0
generated/validator/resources_a_d20002Form_validator_zh_CN.properties

@@ -8,4 +8,5 @@ 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_d20002.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d20002Form = true

+ 1 - 0
generated/validator/resources_a_d20008Form_validator.properties

@@ -7,4 +7,5 @@ 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_d20008.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d20008Form = true

+ 1 - 0
generated/validator/resources_a_d20008Form_validator_zh_CN.properties

@@ -7,4 +7,5 @@ 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_d20008.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d20008Form = true

+ 1 - 0
generated/validator/resources_a_d20011Form_validator.properties

@@ -7,4 +7,5 @@ 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_d20011.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d20011Form = true

+ 1 - 0
generated/validator/resources_a_d20011Form_validator_zh_CN.properties

@@ -7,4 +7,5 @@ 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_d20011.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d20011Form = true

+ 1 - 0
generated/validator/resources_a_d50002Form_validator.properties

@@ -6,4 +6,5 @@ a_d50002.openhig = \u5F00\u542F\u9AD8\u5EA6
 a_d50002.closehig = \u5173\u95ED\u9AD8\u5EA6
 a_d50002.onoff = \u5F00\u51730-\u51731-\u5F00
 a_d50002.pumpcode = \u6C34\u6CF5\u7F16\u7801
+a_d50002.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d50002Form = true

+ 1 - 0
generated/validator/resources_a_d50002Form_validator_zh_CN.properties

@@ -6,4 +6,5 @@ a_d50002.openhig = \u5F00\u542F\u9AD8\u5EA6
 a_d50002.closehig = \u5173\u95ED\u9AD8\u5EA6
 a_d50002.onoff = \u5F00\u51730-\u51731-\u5F00
 a_d50002.pumpcode = \u6C34\u6CF5\u7F16\u7801
+a_d50002.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d50002Form = true

+ 1 - 0
generated/validator/resources_a_d50008Form_validator.properties

@@ -5,4 +5,5 @@ a_d50008.site = \u4F4D\u7F6E
 a_d50008.pa = \u589E\u538Bkpa
 a_d50008.onoff = \u5F00\u51730-\u51731-\u5F00
 a_d50008.fancode = \u6C34\u6CF5\u7F16\u7801
+a_d50008.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d50008Form = true

+ 1 - 0
generated/validator/resources_a_d50008Form_validator_zh_CN.properties

@@ -5,4 +5,5 @@ a_d50008.site = \u4F4D\u7F6E
 a_d50008.pa = \u589E\u538Bkpa
 a_d50008.onoff = \u5F00\u51730-\u51731-\u5F00
 a_d50008.fancode = \u6C34\u6CF5\u7F16\u7801
+a_d50008.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d50008Form = true

+ 1 - 0
generated/validator/resources_a_d50011Form_validator.properties

@@ -5,4 +5,5 @@ a_d50011.site = \u4F4D\u7F6E
 a_d50011.dragcoe = \u963B\u529B\u7CFB\u6570
 a_d50011.onoff = \u5F00\u51730-\u51731-\u5F00
 a_d50011.doorcode = \u98CE\u95E8\u7F16\u7801
+a_d50011.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d50011Form = true

+ 1 - 0
generated/validator/resources_a_d50011Form_validator_zh_CN.properties

@@ -5,4 +5,5 @@ a_d50011.site = \u4F4D\u7F6E
 a_d50011.dragcoe = \u963B\u529B\u7CFB\u6570
 a_d50011.onoff = \u5F00\u51730-\u51731-\u5F00
 a_d50011.doorcode = \u98CE\u95E8\u7F16\u7801
+a_d50011.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 a_d50011Form = true

+ 1 - 0
generated/validator/resources_d_d00005_rows_recodeForm_validator.properties

@@ -3,4 +3,5 @@ d_d00005_rows_recode.pname = \u7BA1\u9053\u540D\u79F0
 d_d00005_rows_recode.pid = \u7BA1\u9053\u7F16\u53F7
 d_d00005_rows_recode.aid = \u4E8B\u6545id
 d_d00005_rows_recode.site = \u4F4D\u7F6E
+d_d00005_rows_recode.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 d_d00005_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d00005_rows_recodeForm_validator_zh_CN.properties

@@ -3,4 +3,5 @@ d_d00005_rows_recode.pname = \u7BA1\u9053\u540D\u79F0
 d_d00005_rows_recode.pid = \u7BA1\u9053\u7F16\u53F7
 d_d00005_rows_recode.aid = \u4E8B\u6545id
 d_d00005_rows_recode.site = \u4F4D\u7F6E
+d_d00005_rows_recode.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 d_d00005_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d10004_rows_recodeForm_validator.properties

@@ -4,4 +4,5 @@ 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_recode.chcode = \u76D1\u6D4B\u70B9\u7F16\u53F7
+d_d10004_rows_recode.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 d_d10004_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d10004_rows_recodeForm_validator_zh_CN.properties

@@ -4,4 +4,5 @@ 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_recode.chcode = \u76D1\u6D4B\u70B9\u7F16\u53F7
+d_d10004_rows_recode.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 d_d10004_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d10023_rows_recodeForm_validator.properties

@@ -5,4 +5,5 @@ d_d10023_rows_recode.aid = \u4E8B\u6545
 d_d10023_rows_recode.ssite = \u5F00\u59CB\u4F4D\u7F6E
 d_d10023_rows_recode.esite = \u7ED3\u675F\u4F4D\u7F6E
 d_d10023_rows_recode.gbid = \u74E6\u65AF\u7206\u70B8\u533A\u57DFID
+d_d10023_rows_recode.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 d_d10023_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d10023_rows_recodeForm_validator_zh_CN.properties

@@ -5,4 +5,5 @@ d_d10023_rows_recode.aid = \u4E8B\u6545
 d_d10023_rows_recode.ssite = \u5F00\u59CB\u4F4D\u7F6E
 d_d10023_rows_recode.esite = \u7ED3\u675F\u4F4D\u7F6E
 d_d10023_rows_recode.gbid = \u74E6\u65AF\u7206\u70B8\u533A\u57DFID
+d_d10023_rows_recode.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 d_d10023_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d20001_rows_recodeForm_validator.properties

@@ -10,4 +10,5 @@ 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_recode.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 d_d20001_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d20001_rows_recodeForm_validator_zh_CN.properties

@@ -10,4 +10,5 @@ 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_recode.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 d_d20001_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d20007_rows_recodeForm_validator.properties

@@ -9,4 +9,5 @@ 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_recode.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 d_d20007_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d20007_rows_recodeForm_validator_zh_CN.properties

@@ -9,4 +9,5 @@ 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_recode.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 d_d20007_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d20010_rows_recodeForm_validator.properties

@@ -9,4 +9,5 @@ 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_recode.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 d_d20010_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d20010_rows_recodeForm_validator_zh_CN.properties

@@ -9,4 +9,5 @@ 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_recode.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 d_d20010_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d50001_rows_recodeForm_validator.properties

@@ -8,4 +8,5 @@ d_d50001_rows_recode.openhig = \u5F00\u542F\u9AD8\u5EA6
 d_d50001_rows_recode.closehig = \u5173\u95ED\u9AD8\u5EA6
 d_d50001_rows_recode.onoff = \u5F00\u51730-\u51731-\u5F00
 d_d50001_rows_recode.pumpcode = \u6C34\u6CF5\u7F16\u7801
+d_d50001_rows_recode.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 d_d50001_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d50001_rows_recodeForm_validator_zh_CN.properties

@@ -8,4 +8,5 @@ d_d50001_rows_recode.openhig = \u5F00\u542F\u9AD8\u5EA6
 d_d50001_rows_recode.closehig = \u5173\u95ED\u9AD8\u5EA6
 d_d50001_rows_recode.onoff = \u5F00\u51730-\u51731-\u5F00
 d_d50001_rows_recode.pumpcode = \u6C34\u6CF5\u7F16\u7801
+d_d50001_rows_recode.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 d_d50001_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d50007_rows_recodeForm_validator.properties

@@ -7,4 +7,5 @@ d_d50007_rows_recode.site = \u4F4D\u7F6E
 d_d50007_rows_recode.pa = \u589E\u538Bkpa
 d_d50007_rows_recode.onoff = \u5F00\u51730-\u51731-\u5F00
 d_d50007_rows_recode.fancode = \u6C34\u6CF5\u7F16\u7801
+d_d50007_rows_recode.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 d_d50007_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d50007_rows_recodeForm_validator_zh_CN.properties

@@ -7,4 +7,5 @@ d_d50007_rows_recode.site = \u4F4D\u7F6E
 d_d50007_rows_recode.pa = \u589E\u538Bkpa
 d_d50007_rows_recode.onoff = \u5F00\u51730-\u51731-\u5F00
 d_d50007_rows_recode.fancode = \u6C34\u6CF5\u7F16\u7801
+d_d50007_rows_recode.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 d_d50007_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d50010_rows_recodeForm_validator.properties

@@ -8,4 +8,5 @@ d_d50010_rows_recode.dragcoe = \u963B\u529B\u7CFB\u6570
 d_d50010_rows_recode.onoff = \u5F00\u51730-\u51731-\u5F00
 d_d50010_rows_recode.aid = \u4E8B\u6545id
 d_d50010_rows_recode.doorcode = \u98CE\u95E8\u7F16\u7801
+d_d50010_rows_recode.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 d_d50010_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d50010_rows_recodeForm_validator_zh_CN.properties

@@ -8,4 +8,5 @@ d_d50010_rows_recode.dragcoe = \u963B\u529B\u7CFB\u6570
 d_d50010_rows_recode.onoff = \u5F00\u51730-\u51731-\u5F00
 d_d50010_rows_recode.aid = \u4E8B\u6545id
 d_d50010_rows_recode.doorcode = \u98CE\u95E8\u7F16\u7801
+d_d50010_rows_recode.siteremark = \u4F4D\u7F6E\u8BF4\u660E
 d_d50010_rows_recodeForm = true

+ 9 - 2
modelsrc/com/miniframe/model/system/DAccident.java

@@ -6,6 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_accident")
 public class DAccident extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -47,14 +50,18 @@ public class DAccident extends MiniserviceBaseModel implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;

+ 18 - 4
modelsrc/com/miniframe/model/system/DBoundary.java

@@ -6,9 +6,15 @@ import javax.persistence.*;
 
 @Table(name = "d_boundary")
 public class DBoundary extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
+    /**
+     * 节点ID
+     */
     private Integer nid;
 
     /**
@@ -59,28 +65,36 @@ public class DBoundary extends MiniserviceBaseModel implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
     }
 
     /**
-     * @return nid
+     * 获取节点ID
+     *
+     * @return nid - 节点ID
      */
     public Integer getNid() {
         return nid;
     }
 
     /**
-     * @param nid
+     * 设置节点ID
+     *
+     * @param nid 节点ID
      */
     public void setNid(Integer nid) {
         this.nid = nid;

+ 32 - 2
modelsrc/com/miniframe/model/system/DChecknode.java

@@ -6,6 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_checknode")
 public class DChecknode extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -39,17 +42,26 @@ public class DChecknode extends MiniserviceBaseModel implements Serializable {
      */
     private String pcode;
 
+    /**
+     * 位置说明
+     */
+    private String siteremark;
+
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
@@ -162,4 +174,22 @@ public class DChecknode extends MiniserviceBaseModel implements Serializable {
     public void setPcode(String pcode) {
         this.pcode = pcode == null ? null : pcode.trim();
     }
+
+    /**
+     * 获取位置说明
+     *
+     * @return siteremark - 位置说明
+     */
+    public String getSiteremark() {
+        return siteremark;
+    }
+
+    /**
+     * 设置位置说明
+     *
+     * @param siteremark 位置说明
+     */
+    public void setSiteremark(String siteremark) {
+        this.siteremark = siteremark == null ? null : siteremark.trim();
+    }
 }

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

@@ -563,6 +563,76 @@ public class DChecknodeSQLBuilder {
             addCriterion("pcode not between", value1, value2, "pcode");
             return (Criteria) this;
         }
+
+        public Criteria andSiteremarkIsNull() {
+            addCriterion("siteremark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkIsNotNull() {
+            addCriterion("siteremark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkEqualTo(String value) {
+            addCriterion("siteremark =", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotEqualTo(String value) {
+            addCriterion("siteremark <>", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkGreaterThan(String value) {
+            addCriterion("siteremark >", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkGreaterThanOrEqualTo(String value) {
+            addCriterion("siteremark >=", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLessThan(String value) {
+            addCriterion("siteremark <", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLessThanOrEqualTo(String value) {
+            addCriterion("siteremark <=", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLike(String value) {
+            addCriterion("siteremark like", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotLike(String value) {
+            addCriterion("siteremark not like", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkIn(List<String> values) {
+            addCriterion("siteremark in", values, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotIn(List<String> values) {
+            addCriterion("siteremark not in", values, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkBetween(String value1, String value2) {
+            addCriterion("siteremark between", value1, value2, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotBetween(String value1, String value2) {
+            addCriterion("siteremark not between", value1, value2, "siteremark");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 63 - 14
modelsrc/com/miniframe/model/system/DChecknodeVal.java

@@ -6,6 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_checknode_val")
 public class DChecknodeVal extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -24,16 +27,34 @@ public class DChecknodeVal extends MiniserviceBaseModel implements Serializable
      */
     private String chname;
 
+    /**
+     * 数值1
+     */
     private String v1;
 
+    /**
+     * 数值2
+     */
     private String v2;
 
+    /**
+     * 数值3
+     */
     private String v3;
 
+    /**
+     * 数值4
+     */
     private String v4;
 
+    /**
+     * 数值5
+     */
     private String v5;
 
+    /**
+     * 数值6
+     */
     private String v6;
 
     /**
@@ -49,14 +70,18 @@ public class DChecknodeVal extends MiniserviceBaseModel implements Serializable
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
@@ -117,84 +142,108 @@ public class DChecknodeVal extends MiniserviceBaseModel implements Serializable
     }
 
     /**
-     * @return v1
+     * 获取数值1
+     *
+     * @return v1 - 数值1
      */
     public String getV1() {
         return v1;
     }
 
     /**
-     * @param v1
+     * 设置数值1
+     *
+     * @param v1 数值1
      */
     public void setV1(String v1) {
         this.v1 = v1 == null ? null : v1.trim();
     }
 
     /**
-     * @return v2
+     * 获取数值2
+     *
+     * @return v2 - 数值2
      */
     public String getV2() {
         return v2;
     }
 
     /**
-     * @param v2
+     * 设置数值2
+     *
+     * @param v2 数值2
      */
     public void setV2(String v2) {
         this.v2 = v2 == null ? null : v2.trim();
     }
 
     /**
-     * @return v3
+     * 获取数值3
+     *
+     * @return v3 - 数值3
      */
     public String getV3() {
         return v3;
     }
 
     /**
-     * @param v3
+     * 设置数值3
+     *
+     * @param v3 数值3
      */
     public void setV3(String v3) {
         this.v3 = v3 == null ? null : v3.trim();
     }
 
     /**
-     * @return v4
+     * 获取数值4
+     *
+     * @return v4 - 数值4
      */
     public String getV4() {
         return v4;
     }
 
     /**
-     * @param v4
+     * 设置数值4
+     *
+     * @param v4 数值4
      */
     public void setV4(String v4) {
         this.v4 = v4 == null ? null : v4.trim();
     }
 
     /**
-     * @return v5
+     * 获取数值5
+     *
+     * @return v5 - 数值5
      */
     public String getV5() {
         return v5;
     }
 
     /**
-     * @param v5
+     * 设置数值5
+     *
+     * @param v5 数值5
      */
     public void setV5(String v5) {
         this.v5 = v5 == null ? null : v5.trim();
     }
 
     /**
-     * @return v6
+     * 获取数值6
+     *
+     * @return v6 - 数值6
      */
     public String getV6() {
         return v6;
     }
 
     /**
-     * @param v6
+     * 设置数值6
+     *
+     * @param v6 数值6
      */
     public void setV6(String v6) {
         this.v6 = v6 == null ? null : v6.trim();

+ 63 - 14
modelsrc/com/miniframe/model/system/DChecknodeValcode.java

@@ -6,6 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_checknode_valcode")
 public class DChecknodeValcode extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -19,35 +22,57 @@ public class DChecknodeValcode extends MiniserviceBaseModel implements Serializa
      */
     private Integer jid;
 
+    /**
+     * 编码1
+     */
     @Column(name = "val_code1")
     private String valCode1;
 
+    /**
+     * 编码2
+     */
     @Column(name = "val_code2")
     private String valCode2;
 
+    /**
+     * 编码3
+     */
     @Column(name = "val_code3")
     private String valCode3;
 
+    /**
+     * 编码4
+     */
     @Column(name = "val_code4")
     private String valCode4;
 
+    /**
+     * 编码5
+     */
     @Column(name = "val_code5")
     private String valCode5;
 
+    /**
+     * 编码6
+     */
     @Column(name = "val_code6")
     private String valCode6;
 
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
@@ -90,84 +115,108 @@ public class DChecknodeValcode extends MiniserviceBaseModel implements Serializa
     }
 
     /**
-     * @return val_code1
+     * 获取编码1
+     *
+     * @return val_code1 - 编码1
      */
     public String getValCode1() {
         return valCode1;
     }
 
     /**
-     * @param valCode1
+     * 设置编码1
+     *
+     * @param valCode1 编码1
      */
     public void setValCode1(String valCode1) {
         this.valCode1 = valCode1 == null ? null : valCode1.trim();
     }
 
     /**
-     * @return val_code2
+     * 获取编码2
+     *
+     * @return val_code2 - 编码2
      */
     public String getValCode2() {
         return valCode2;
     }
 
     /**
-     * @param valCode2
+     * 设置编码2
+     *
+     * @param valCode2 编码2
      */
     public void setValCode2(String valCode2) {
         this.valCode2 = valCode2 == null ? null : valCode2.trim();
     }
 
     /**
-     * @return val_code3
+     * 获取编码3
+     *
+     * @return val_code3 - 编码3
      */
     public String getValCode3() {
         return valCode3;
     }
 
     /**
-     * @param valCode3
+     * 设置编码3
+     *
+     * @param valCode3 编码3
      */
     public void setValCode3(String valCode3) {
         this.valCode3 = valCode3 == null ? null : valCode3.trim();
     }
 
     /**
-     * @return val_code4
+     * 获取编码4
+     *
+     * @return val_code4 - 编码4
      */
     public String getValCode4() {
         return valCode4;
     }
 
     /**
-     * @param valCode4
+     * 设置编码4
+     *
+     * @param valCode4 编码4
      */
     public void setValCode4(String valCode4) {
         this.valCode4 = valCode4 == null ? null : valCode4.trim();
     }
 
     /**
-     * @return val_code5
+     * 获取编码5
+     *
+     * @return val_code5 - 编码5
      */
     public String getValCode5() {
         return valCode5;
     }
 
     /**
-     * @param valCode5
+     * 设置编码5
+     *
+     * @param valCode5 编码5
      */
     public void setValCode5(String valCode5) {
         this.valCode5 = valCode5 == null ? null : valCode5.trim();
     }
 
     /**
-     * @return val_code6
+     * 获取编码6
+     *
+     * @return val_code6 - 编码6
      */
     public String getValCode6() {
         return valCode6;
     }
 
     /**
-     * @param valCode6
+     * 设置编码6
+     *
+     * @param valCode6 编码6
      */
     public void setValCode6(String valCode6) {
         this.valCode6 = valCode6 == null ? null : valCode6.trim();

+ 9 - 2
modelsrc/com/miniframe/model/system/DCon.java

@@ -6,6 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_con")
 public class DCon extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -37,14 +40,18 @@ public class DCon extends MiniserviceBaseModel implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;

+ 27 - 6
modelsrc/com/miniframe/model/system/DGas.java

@@ -34,10 +34,19 @@ public class DGas extends MiniserviceBaseModel implements Serializable {
      */
     private String bfname;
 
+    /**
+     * 巷道ID
+     */
     private Integer pid;
 
+    /**
+     * 巷道名称
+     */
     private String pname;
 
+    /**
+     * 巷道编码
+     */
     private String pcode;
 
     /**
@@ -162,42 +171,54 @@ public class DGas extends MiniserviceBaseModel implements Serializable {
     }
 
     /**
-     * @return pid
+     * 获取巷道ID
+     *
+     * @return pid - 巷道ID
      */
     public Integer getPid() {
         return pid;
     }
 
     /**
-     * @param pid
+     * 设置巷道ID
+     *
+     * @param pid 巷道ID
      */
     public void setPid(Integer pid) {
         this.pid = pid;
     }
 
     /**
-     * @return pname
+     * 获取巷道名称
+     *
+     * @return pname - 巷道名称
      */
     public String getPname() {
         return pname;
     }
 
     /**
-     * @param pname
+     * 设置巷道名称
+     *
+     * @param pname 巷道名称
      */
     public void setPname(String pname) {
         this.pname = pname == null ? null : pname.trim();
     }
 
     /**
-     * @return pcode
+     * 获取巷道编码
+     *
+     * @return pcode - 巷道编码
      */
     public String getPcode() {
         return pcode;
     }
 
     /**
-     * @param pcode
+     * 设置巷道编码
+     *
+     * @param pcode 巷道编码
      */
     public void setPcode(String pcode) {
         this.pcode = pcode == null ? null : pcode.trim();

+ 32 - 2
modelsrc/com/miniframe/model/system/DGasBlastArea.java

@@ -6,6 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_gas_blast_area")
 public class DGasBlastArea extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -44,17 +47,26 @@ public class DGasBlastArea extends MiniserviceBaseModel implements Serializable
      */
     private String pcode;
 
+    /**
+     * 位置说明
+     */
+    private String siteremark;
+
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
@@ -185,4 +197,22 @@ public class DGasBlastArea extends MiniserviceBaseModel implements Serializable
     public void setPcode(String pcode) {
         this.pcode = pcode == null ? null : pcode.trim();
     }
+
+    /**
+     * 获取位置说明
+     *
+     * @return siteremark - 位置说明
+     */
+    public String getSiteremark() {
+        return siteremark;
+    }
+
+    /**
+     * 设置位置说明
+     *
+     * @param siteremark 位置说明
+     */
+    public void setSiteremark(String siteremark) {
+        this.siteremark = siteremark == null ? null : siteremark.trim();
+    }
 }

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

@@ -603,6 +603,76 @@ public class DGasBlastAreaSQLBuilder {
             addCriterion("pcode not between", value1, value2, "pcode");
             return (Criteria) this;
         }
+
+        public Criteria andSiteremarkIsNull() {
+            addCriterion("siteremark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkIsNotNull() {
+            addCriterion("siteremark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkEqualTo(String value) {
+            addCriterion("siteremark =", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotEqualTo(String value) {
+            addCriterion("siteremark <>", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkGreaterThan(String value) {
+            addCriterion("siteremark >", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkGreaterThanOrEqualTo(String value) {
+            addCriterion("siteremark >=", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLessThan(String value) {
+            addCriterion("siteremark <", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLessThanOrEqualTo(String value) {
+            addCriterion("siteremark <=", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLike(String value) {
+            addCriterion("siteremark like", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotLike(String value) {
+            addCriterion("siteremark not like", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkIn(List<String> values) {
+            addCriterion("siteremark in", values, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotIn(List<String> values) {
+            addCriterion("siteremark not in", values, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkBetween(String value1, String value2) {
+            addCriterion("siteremark between", value1, value2, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotBetween(String value1, String value2) {
+            addCriterion("siteremark not between", value1, value2, "siteremark");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 9 - 2
modelsrc/com/miniframe/model/system/DGasGatherArea.java

@@ -6,6 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_gas_gather_area")
 public class DGasGatherArea extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -40,14 +43,18 @@ public class DGasGatherArea extends MiniserviceBaseModel implements Serializable
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;

+ 27 - 6
modelsrc/com/miniframe/model/system/DJob.java

@@ -6,6 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_job")
 public class DJob extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -14,8 +17,14 @@ public class DJob extends MiniserviceBaseModel implements Serializable {
      */
     private Integer aid;
 
+    /**
+     * 开始时间
+     */
     private String starttime;
 
+    /**
+     * 结束时间
+     */
     private String endtime;
 
     /**
@@ -71,14 +80,18 @@ public class DJob extends MiniserviceBaseModel implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
@@ -103,28 +116,36 @@ public class DJob extends MiniserviceBaseModel implements Serializable {
     }
 
     /**
-     * @return starttime
+     * 获取开始时间
+     *
+     * @return starttime - 开始时间
      */
     public String getStarttime() {
         return starttime;
     }
 
     /**
-     * @param starttime
+     * 设置开始时间
+     *
+     * @param starttime 开始时间
      */
     public void setStarttime(String starttime) {
         this.starttime = starttime == null ? null : starttime.trim();
     }
 
     /**
-     * @return endtime
+     * 获取结束时间
+     *
+     * @return endtime - 结束时间
      */
     public String getEndtime() {
         return endtime;
     }
 
     /**
-     * @param endtime
+     * 设置结束时间
+     *
+     * @param endtime 结束时间
      */
     public void setEndtime(String endtime) {
         this.endtime = endtime == null ? null : endtime.trim();

+ 9 - 2
modelsrc/com/miniframe/model/system/DMway.java

@@ -6,6 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_mway")
 public class DMway extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -37,14 +40,18 @@ public class DMway extends MiniserviceBaseModel implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;

+ 9 - 2
modelsrc/com/miniframe/model/system/DMwaynode.java

@@ -6,6 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_mwaynode")
 public class DMwaynode extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -37,14 +40,18 @@ public class DMwaynode extends MiniserviceBaseModel implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;

+ 54 - 12
modelsrc/com/miniframe/model/system/DNode.java

@@ -6,17 +6,35 @@ import javax.persistence.*;
 
 @Table(name = "d_node")
 public class DNode extends MiniserviceBaseModel implements Serializable {
+    /**
+     * 节点ID
+     */
     @Id
     private Integer id;
 
+    /**
+     * 节点名称
+     */
     private String name;
 
+    /**
+     * x
+     */
     private String x;
 
+    /**
+     * y
+     */
     private String y;
 
+    /**
+     * z
+     */
     private String z;
 
+    /**
+     * 描述
+     */
     @Column(name = "n_desc")
     private String nDesc;
 
@@ -33,84 +51,108 @@ public class DNode extends MiniserviceBaseModel implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取节点ID
+     *
+     * @return id - 节点ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置节点ID
+     *
+     * @param id 节点ID
      */
     public void setId(Integer id) {
         this.id = id;
     }
 
     /**
-     * @return name
+     * 获取节点名称
+     *
+     * @return name - 节点名称
      */
     public String getName() {
         return name;
     }
 
     /**
-     * @param name
+     * 设置节点名称
+     *
+     * @param name 节点名称
      */
     public void setName(String name) {
         this.name = name == null ? null : name.trim();
     }
 
     /**
-     * @return x
+     * 获取x
+     *
+     * @return x - x
      */
     public String getX() {
         return x;
     }
 
     /**
-     * @param x
+     * 设置x
+     *
+     * @param x x
      */
     public void setX(String x) {
         this.x = x == null ? null : x.trim();
     }
 
     /**
-     * @return y
+     * 获取y
+     *
+     * @return y - y
      */
     public String getY() {
         return y;
     }
 
     /**
-     * @param y
+     * 设置y
+     *
+     * @param y y
      */
     public void setY(String y) {
         this.y = y == null ? null : y.trim();
     }
 
     /**
-     * @return z
+     * 获取z
+     *
+     * @return z - z
      */
     public String getZ() {
         return z;
     }
 
     /**
-     * @param z
+     * 设置z
+     *
+     * @param z z
      */
     public void setZ(String z) {
         this.z = z == null ? null : z.trim();
     }
 
     /**
-     * @return n_desc
+     * 获取描述
+     *
+     * @return n_desc - 描述
      */
     public String getnDesc() {
         return nDesc;
     }
 
     /**
-     * @param nDesc
+     * 设置描述
+     *
+     * @param nDesc 描述
      */
     public void setnDesc(String nDesc) {
         this.nDesc = nDesc == null ? null : nDesc.trim();

+ 18 - 4
modelsrc/com/miniframe/model/system/DPipe.java

@@ -6,9 +6,15 @@ import javax.persistence.*;
 
 @Table(name = "d_pipe")
 public class DPipe extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
+    /**
+     * 巷道名称
+     */
     private String name;
 
     /**
@@ -97,28 +103,36 @@ public class DPipe extends MiniserviceBaseModel implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
     }
 
     /**
-     * @return name
+     * 获取巷道名称
+     *
+     * @return name - 巷道名称
      */
     public String getName() {
         return name;
     }
 
     /**
-     * @param name
+     * 设置巷道名称
+     *
+     * @param name 巷道名称
      */
     public void setName(String name) {
         this.name = name == null ? null : name.trim();

+ 32 - 2
modelsrc/com/miniframe/model/system/DPump.java

@@ -6,6 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_pump")
 public class DPump extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -64,17 +67,26 @@ public class DPump extends MiniserviceBaseModel implements Serializable {
      */
     private Integer pumpbaseid;
 
+    /**
+     * 位置说明
+     */
+    private String siteremark;
+
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
@@ -277,4 +289,22 @@ public class DPump extends MiniserviceBaseModel implements Serializable {
     public void setPumpbaseid(Integer pumpbaseid) {
         this.pumpbaseid = pumpbaseid;
     }
+
+    /**
+     * 获取位置说明
+     *
+     * @return siteremark - 位置说明
+     */
+    public String getSiteremark() {
+        return siteremark;
+    }
+
+    /**
+     * 设置位置说明
+     *
+     * @param siteremark 位置说明
+     */
+    public void setSiteremark(String siteremark) {
+        this.siteremark = siteremark == null ? null : siteremark.trim();
+    }
 }

+ 25 - 2
modelsrc/com/miniframe/model/system/DPumpBase.java

@@ -6,6 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_pump_base")
 public class DPumpBase extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -54,17 +57,23 @@ public class DPumpBase extends MiniserviceBaseModel implements Serializable {
      */
     private Integer onoff;
 
+    private String siteremark;
+
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
@@ -231,4 +240,18 @@ public class DPumpBase extends MiniserviceBaseModel implements Serializable {
     public void setOnoff(Integer onoff) {
         this.onoff = onoff;
     }
+
+    /**
+     * @return siteremark
+     */
+    public String getSiteremark() {
+        return siteremark;
+    }
+
+    /**
+     * @param siteremark
+     */
+    public void setSiteremark(String siteremark) {
+        this.siteremark = siteremark == null ? null : siteremark.trim();
+    }
 }

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

@@ -743,6 +743,76 @@ public class DPumpBaseSQLBuilder {
             addCriterion("onoff not between", value1, value2, "onoff");
             return (Criteria) this;
         }
+
+        public Criteria andSiteremarkIsNull() {
+            addCriterion("siteremark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkIsNotNull() {
+            addCriterion("siteremark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkEqualTo(String value) {
+            addCriterion("siteremark =", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotEqualTo(String value) {
+            addCriterion("siteremark <>", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkGreaterThan(String value) {
+            addCriterion("siteremark >", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkGreaterThanOrEqualTo(String value) {
+            addCriterion("siteremark >=", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLessThan(String value) {
+            addCriterion("siteremark <", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLessThanOrEqualTo(String value) {
+            addCriterion("siteremark <=", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLike(String value) {
+            addCriterion("siteremark like", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotLike(String value) {
+            addCriterion("siteremark not like", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkIn(List<String> values) {
+            addCriterion("siteremark in", values, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotIn(List<String> values) {
+            addCriterion("siteremark not in", values, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkBetween(String value1, String value2) {
+            addCriterion("siteremark between", value1, value2, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotBetween(String value1, String value2) {
+            addCriterion("siteremark not between", value1, value2, "siteremark");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 9 - 3
modelsrc/com/miniframe/model/system/DPumpHfBase.java

@@ -6,7 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_pump_hf_base")
 public class DPumpHfBase extends MiniserviceBaseModel implements Serializable {
-    @Id
+    /**
+     * ID
+     */
     private Integer id;
 
     /**
@@ -27,14 +29,18 @@ public class DPumpHfBase extends MiniserviceBaseModel implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;

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

@@ -863,6 +863,76 @@ public class DPumpSQLBuilder {
             addCriterion("pumpbaseid not between", value1, value2, "pumpbaseid");
             return (Criteria) this;
         }
+
+        public Criteria andSiteremarkIsNull() {
+            addCriterion("siteremark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkIsNotNull() {
+            addCriterion("siteremark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkEqualTo(String value) {
+            addCriterion("siteremark =", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotEqualTo(String value) {
+            addCriterion("siteremark <>", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkGreaterThan(String value) {
+            addCriterion("siteremark >", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkGreaterThanOrEqualTo(String value) {
+            addCriterion("siteremark >=", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLessThan(String value) {
+            addCriterion("siteremark <", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLessThanOrEqualTo(String value) {
+            addCriterion("siteremark <=", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLike(String value) {
+            addCriterion("siteremark like", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotLike(String value) {
+            addCriterion("siteremark not like", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkIn(List<String> values) {
+            addCriterion("siteremark in", values, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotIn(List<String> values) {
+            addCriterion("siteremark not in", values, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkBetween(String value1, String value2) {
+            addCriterion("siteremark between", value1, value2, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotBetween(String value1, String value2) {
+            addCriterion("siteremark not between", value1, value2, "siteremark");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 54 - 12
modelsrc/com/miniframe/model/system/DSensor.java

@@ -7,6 +7,9 @@ import javax.persistence.*;
 
 @Table(name = "d_sensor")
 public class DSensor extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -30,15 +33,27 @@ public class DSensor extends MiniserviceBaseModel implements Serializable {
      */
     private String pname;
 
+    /**
+     * x_coordinate
+     */
     @Column(name = "x_coordinate")
     private BigDecimal xCoordinate;
 
+    /**
+     * y_coordinate
+     */
     @Column(name = "y_coordinate")
     private BigDecimal yCoordinate;
 
+    /**
+     * z_coordinate
+     */
     @Column(name = "z_coordinate")
     private BigDecimal zCoordinate;
 
+    /**
+     * 管道编号
+     */
     @Column(name = "point_code")
     private String pointCode;
 
@@ -48,6 +63,9 @@ public class DSensor extends MiniserviceBaseModel implements Serializable {
     @Column(name = "point_name")
     private String pointName;
 
+    /**
+     * 是否删除
+     */
     private Short deleted;
 
     /**
@@ -59,14 +77,18 @@ public class DSensor extends MiniserviceBaseModel implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
@@ -145,56 +167,72 @@ public class DSensor extends MiniserviceBaseModel implements Serializable {
     }
 
     /**
-     * @return x_coordinate
+     * 获取x_coordinate
+     *
+     * @return x_coordinate - x_coordinate
      */
     public BigDecimal getxCoordinate() {
         return xCoordinate;
     }
 
     /**
-     * @param xCoordinate
+     * 设置x_coordinate
+     *
+     * @param xCoordinate x_coordinate
      */
     public void setxCoordinate(BigDecimal xCoordinate) {
         this.xCoordinate = xCoordinate;
     }
 
     /**
-     * @return y_coordinate
+     * 获取y_coordinate
+     *
+     * @return y_coordinate - y_coordinate
      */
     public BigDecimal getyCoordinate() {
         return yCoordinate;
     }
 
     /**
-     * @param yCoordinate
+     * 设置y_coordinate
+     *
+     * @param yCoordinate y_coordinate
      */
     public void setyCoordinate(BigDecimal yCoordinate) {
         this.yCoordinate = yCoordinate;
     }
 
     /**
-     * @return z_coordinate
+     * 获取z_coordinate
+     *
+     * @return z_coordinate - z_coordinate
      */
     public BigDecimal getzCoordinate() {
         return zCoordinate;
     }
 
     /**
-     * @param zCoordinate
+     * 设置z_coordinate
+     *
+     * @param zCoordinate z_coordinate
      */
     public void setzCoordinate(BigDecimal zCoordinate) {
         this.zCoordinate = zCoordinate;
     }
 
     /**
-     * @return point_code
+     * 获取管道编号
+     *
+     * @return point_code - 管道编号
      */
     public String getPointCode() {
         return pointCode;
     }
 
     /**
-     * @param pointCode
+     * 设置管道编号
+     *
+     * @param pointCode 管道编号
      */
     public void setPointCode(String pointCode) {
         this.pointCode = pointCode == null ? null : pointCode.trim();
@@ -219,14 +257,18 @@ public class DSensor extends MiniserviceBaseModel implements Serializable {
     }
 
     /**
-     * @return deleted
+     * 获取是否删除
+     *
+     * @return deleted - 是否删除
      */
     public Short getDeleted() {
         return deleted;
     }
 
     /**
-     * @param deleted
+     * 设置是否删除
+     *
+     * @param deleted 是否删除
      */
     public void setDeleted(Short deleted) {
         this.deleted = deleted;

+ 32 - 2
modelsrc/com/miniframe/model/system/DSource.java

@@ -6,6 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_source")
 public class DSource extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -34,17 +37,26 @@ public class DSource extends MiniserviceBaseModel implements Serializable {
      */
     private String pcode;
 
+    /**
+     * 位置说明
+     */
+    private String siteremark;
+
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
@@ -139,4 +151,22 @@ public class DSource extends MiniserviceBaseModel implements Serializable {
     public void setPcode(String pcode) {
         this.pcode = pcode == null ? null : pcode.trim();
     }
+
+    /**
+     * 获取位置说明
+     *
+     * @return siteremark - 位置说明
+     */
+    public String getSiteremark() {
+        return siteremark;
+    }
+
+    /**
+     * 设置位置说明
+     *
+     * @param siteremark 位置说明
+     */
+    public void setSiteremark(String siteremark) {
+        this.siteremark = siteremark == null ? null : siteremark.trim();
+    }
 }

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

@@ -483,6 +483,76 @@ public class DSourceSQLBuilder {
             addCriterion("pcode not between", value1, value2, "pcode");
             return (Criteria) this;
         }
+
+        public Criteria andSiteremarkIsNull() {
+            addCriterion("siteremark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkIsNotNull() {
+            addCriterion("siteremark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkEqualTo(String value) {
+            addCriterion("siteremark =", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotEqualTo(String value) {
+            addCriterion("siteremark <>", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkGreaterThan(String value) {
+            addCriterion("siteremark >", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkGreaterThanOrEqualTo(String value) {
+            addCriterion("siteremark >=", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLessThan(String value) {
+            addCriterion("siteremark <", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLessThanOrEqualTo(String value) {
+            addCriterion("siteremark <=", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLike(String value) {
+            addCriterion("siteremark like", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotLike(String value) {
+            addCriterion("siteremark not like", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkIn(List<String> values) {
+            addCriterion("siteremark in", values, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotIn(List<String> values) {
+            addCriterion("siteremark not in", values, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkBetween(String value1, String value2) {
+            addCriterion("siteremark between", value1, value2, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotBetween(String value1, String value2) {
+            addCriterion("siteremark not between", value1, value2, "siteremark");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 41 - 13
modelsrc/com/miniframe/model/system/DSourceVal.java

@@ -6,6 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_source_val")
 public class DSourceVal extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -20,14 +23,23 @@ public class DSourceVal extends MiniserviceBaseModel implements Serializable {
     private Integer timeline;
 
     /**
-     * 观测值
+     * 观测值1
      */
     private Float val1;
 
+    /**
+     * 观测值2
+     */
     private Float val2;
 
+    /**
+     * 观测值3
+     */
     private Float val3;
 
+    /**
+     * 观测值4
+     */
     private Float val4;
 
     /**
@@ -38,14 +50,18 @@ public class DSourceVal extends MiniserviceBaseModel implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
@@ -88,60 +104,72 @@ public class DSourceVal extends MiniserviceBaseModel implements Serializable {
     }
 
     /**
-     * 获取观测值
+     * 获取观测值1
      *
-     * @return val1 - 观测值
+     * @return val1 - 观测值1
      */
     public Float getVal1() {
         return val1;
     }
 
     /**
-     * 设置观测值
+     * 设置观测值1
      *
-     * @param val1 观测值
+     * @param val1 观测值1
      */
     public void setVal1(Float val1) {
         this.val1 = val1;
     }
 
     /**
-     * @return val2
+     * 获取观测值2
+     *
+     * @return val2 - 观测值2
      */
     public Float getVal2() {
         return val2;
     }
 
     /**
-     * @param val2
+     * 设置观测值2
+     *
+     * @param val2 观测值2
      */
     public void setVal2(Float val2) {
         this.val2 = val2;
     }
 
     /**
-     * @return val3
+     * 获取观测值3
+     *
+     * @return val3 - 观测值3
      */
     public Float getVal3() {
         return val3;
     }
 
     /**
-     * @param val3
+     * 设置观测值3
+     *
+     * @param val3 观测值3
      */
     public void setVal3(Float val3) {
         this.val3 = val3;
     }
 
     /**
-     * @return val4
+     * 获取观测值4
+     *
+     * @return val4 - 观测值4
      */
     public Float getVal4() {
         return val4;
     }
 
     /**
-     * @param val4
+     * 设置观测值4
+     *
+     * @param val4 观测值4
      */
     public void setVal4(Float val4) {
         this.val4 = val4;

+ 32 - 2
modelsrc/com/miniframe/model/system/DVentdoor.java

@@ -6,6 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_ventdoor")
 public class DVentdoor extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -59,17 +62,26 @@ public class DVentdoor extends MiniserviceBaseModel implements Serializable {
      */
     private Integer doorbaseid;
 
+    /**
+     * 位置说明
+     */
+    private String siteremark;
+
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
@@ -254,4 +266,22 @@ public class DVentdoor extends MiniserviceBaseModel implements Serializable {
     public void setDoorbaseid(Integer doorbaseid) {
         this.doorbaseid = doorbaseid;
     }
+
+    /**
+     * 获取位置说明
+     *
+     * @return siteremark - 位置说明
+     */
+    public String getSiteremark() {
+        return siteremark;
+    }
+
+    /**
+     * 设置位置说明
+     *
+     * @param siteremark 位置说明
+     */
+    public void setSiteremark(String siteremark) {
+        this.siteremark = siteremark == null ? null : siteremark.trim();
+    }
 }

+ 25 - 2
modelsrc/com/miniframe/model/system/DVentdoorBase.java

@@ -6,6 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_ventdoor_base")
 public class DVentdoorBase extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -49,17 +52,23 @@ public class DVentdoorBase extends MiniserviceBaseModel implements Serializable
      */
     private String code;
 
+    private String siteremark;
+
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
@@ -208,4 +217,18 @@ public class DVentdoorBase extends MiniserviceBaseModel implements Serializable
     public void setCode(String code) {
         this.code = code == null ? null : code.trim();
     }
+
+    /**
+     * @return siteremark
+     */
+    public String getSiteremark() {
+        return siteremark;
+    }
+
+    /**
+     * @param siteremark
+     */
+    public void setSiteremark(String siteremark) {
+        this.siteremark = siteremark == null ? null : siteremark.trim();
+    }
 }

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

@@ -683,6 +683,76 @@ public class DVentdoorBaseSQLBuilder {
             addCriterion("code not between", value1, value2, "code");
             return (Criteria) this;
         }
+
+        public Criteria andSiteremarkIsNull() {
+            addCriterion("siteremark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkIsNotNull() {
+            addCriterion("siteremark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkEqualTo(String value) {
+            addCriterion("siteremark =", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotEqualTo(String value) {
+            addCriterion("siteremark <>", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkGreaterThan(String value) {
+            addCriterion("siteremark >", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkGreaterThanOrEqualTo(String value) {
+            addCriterion("siteremark >=", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLessThan(String value) {
+            addCriterion("siteremark <", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLessThanOrEqualTo(String value) {
+            addCriterion("siteremark <=", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLike(String value) {
+            addCriterion("siteremark like", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotLike(String value) {
+            addCriterion("siteremark not like", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkIn(List<String> values) {
+            addCriterion("siteremark in", values, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotIn(List<String> values) {
+            addCriterion("siteremark not in", values, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkBetween(String value1, String value2) {
+            addCriterion("siteremark between", value1, value2, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotBetween(String value1, String value2) {
+            addCriterion("siteremark not between", value1, value2, "siteremark");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -803,6 +803,76 @@ public class DVentdoorSQLBuilder {
             addCriterion("doorbaseid not between", value1, value2, "doorbaseid");
             return (Criteria) this;
         }
+
+        public Criteria andSiteremarkIsNull() {
+            addCriterion("siteremark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkIsNotNull() {
+            addCriterion("siteremark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkEqualTo(String value) {
+            addCriterion("siteremark =", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotEqualTo(String value) {
+            addCriterion("siteremark <>", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkGreaterThan(String value) {
+            addCriterion("siteremark >", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkGreaterThanOrEqualTo(String value) {
+            addCriterion("siteremark >=", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLessThan(String value) {
+            addCriterion("siteremark <", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLessThanOrEqualTo(String value) {
+            addCriterion("siteremark <=", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLike(String value) {
+            addCriterion("siteremark like", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotLike(String value) {
+            addCriterion("siteremark not like", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkIn(List<String> values) {
+            addCriterion("siteremark in", values, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotIn(List<String> values) {
+            addCriterion("siteremark not in", values, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkBetween(String value1, String value2) {
+            addCriterion("siteremark between", value1, value2, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotBetween(String value1, String value2) {
+            addCriterion("siteremark not between", value1, value2, "siteremark");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 32 - 2
modelsrc/com/miniframe/model/system/DVentfan.java

@@ -6,6 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_ventfan")
 public class DVentfan extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -59,17 +62,26 @@ public class DVentfan extends MiniserviceBaseModel implements Serializable {
      */
     private Integer fanbaseid;
 
+    /**
+     * 位置说明
+     */
+    private String siteremark;
+
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
@@ -254,4 +266,22 @@ public class DVentfan extends MiniserviceBaseModel implements Serializable {
     public void setFanbaseid(Integer fanbaseid) {
         this.fanbaseid = fanbaseid;
     }
+
+    /**
+     * 获取位置说明
+     *
+     * @return siteremark - 位置说明
+     */
+    public String getSiteremark() {
+        return siteremark;
+    }
+
+    /**
+     * 设置位置说明
+     *
+     * @param siteremark 位置说明
+     */
+    public void setSiteremark(String siteremark) {
+        this.siteremark = siteremark == null ? null : siteremark.trim();
+    }
 }

+ 25 - 2
modelsrc/com/miniframe/model/system/DVentfanBase.java

@@ -6,6 +6,9 @@ import javax.persistence.*;
 
 @Table(name = "d_ventfan_base")
 public class DVentfanBase extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
@@ -49,17 +52,23 @@ public class DVentfanBase extends MiniserviceBaseModel implements Serializable {
      */
     private String code;
 
+    private String siteremark;
+
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
@@ -208,4 +217,18 @@ public class DVentfanBase extends MiniserviceBaseModel implements Serializable {
     public void setCode(String code) {
         this.code = code == null ? null : code.trim();
     }
+
+    /**
+     * @return siteremark
+     */
+    public String getSiteremark() {
+        return siteremark;
+    }
+
+    /**
+     * @param siteremark
+     */
+    public void setSiteremark(String siteremark) {
+        this.siteremark = siteremark == null ? null : siteremark.trim();
+    }
 }

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

@@ -683,6 +683,76 @@ public class DVentfanBaseSQLBuilder {
             addCriterion("code not between", value1, value2, "code");
             return (Criteria) this;
         }
+
+        public Criteria andSiteremarkIsNull() {
+            addCriterion("siteremark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkIsNotNull() {
+            addCriterion("siteremark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkEqualTo(String value) {
+            addCriterion("siteremark =", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotEqualTo(String value) {
+            addCriterion("siteremark <>", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkGreaterThan(String value) {
+            addCriterion("siteremark >", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkGreaterThanOrEqualTo(String value) {
+            addCriterion("siteremark >=", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLessThan(String value) {
+            addCriterion("siteremark <", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLessThanOrEqualTo(String value) {
+            addCriterion("siteremark <=", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLike(String value) {
+            addCriterion("siteremark like", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotLike(String value) {
+            addCriterion("siteremark not like", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkIn(List<String> values) {
+            addCriterion("siteremark in", values, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotIn(List<String> values) {
+            addCriterion("siteremark not in", values, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkBetween(String value1, String value2) {
+            addCriterion("siteremark between", value1, value2, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotBetween(String value1, String value2) {
+            addCriterion("siteremark not between", value1, value2, "siteremark");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -803,6 +803,76 @@ public class DVentfanSQLBuilder {
             addCriterion("fanbaseid not between", value1, value2, "fanbaseid");
             return (Criteria) this;
         }
+
+        public Criteria andSiteremarkIsNull() {
+            addCriterion("siteremark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkIsNotNull() {
+            addCriterion("siteremark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkEqualTo(String value) {
+            addCriterion("siteremark =", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotEqualTo(String value) {
+            addCriterion("siteremark <>", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkGreaterThan(String value) {
+            addCriterion("siteremark >", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkGreaterThanOrEqualTo(String value) {
+            addCriterion("siteremark >=", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLessThan(String value) {
+            addCriterion("siteremark <", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLessThanOrEqualTo(String value) {
+            addCriterion("siteremark <=", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkLike(String value) {
+            addCriterion("siteremark like", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotLike(String value) {
+            addCriterion("siteremark not like", value, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkIn(List<String> values) {
+            addCriterion("siteremark in", values, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotIn(List<String> values) {
+            addCriterion("siteremark not in", values, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkBetween(String value1, String value2) {
+            addCriterion("siteremark between", value1, value2, "siteremark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteremarkNotBetween(String value1, String value2) {
+            addCriterion("siteremark not between", value1, value2, "siteremark");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 63 - 14
modelsrc/com/miniframe/model/system/DWayResult.java

@@ -6,116 +6,165 @@ import javax.persistence.*;
 
 @Table(name = "d_way_result")
 public class DWayResult extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
+    /**
+     * 事故ID
+     */
     private Integer aid;
 
+    /**
+     * 任务ID
+     */
     private Integer jid;
 
+    /**
+     * 人员
+     */
     private String person;
 
+    /**
+     * 路径编号
+     */
     private String wcode;
 
+    /**
+     * 安全类型
+     */
     private String safety;
 
+    /**
+     * 标记
+     */
     private String flag;
 
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
     }
 
     /**
-     * @return aid
+     * 获取事故ID
+     *
+     * @return aid - 事故ID
      */
     public Integer getAid() {
         return aid;
     }
 
     /**
-     * @param aid
+     * 设置事故ID
+     *
+     * @param aid 事故ID
      */
     public void setAid(Integer aid) {
         this.aid = aid;
     }
 
     /**
-     * @return jid
+     * 获取任务ID
+     *
+     * @return jid - 任务ID
      */
     public Integer getJid() {
         return jid;
     }
 
     /**
-     * @param jid
+     * 设置任务ID
+     *
+     * @param jid 任务ID
      */
     public void setJid(Integer jid) {
         this.jid = jid;
     }
 
     /**
-     * @return person
+     * 获取人员
+     *
+     * @return person - 人员
      */
     public String getPerson() {
         return person;
     }
 
     /**
-     * @param person
+     * 设置人员
+     *
+     * @param person 人员
      */
     public void setPerson(String person) {
         this.person = person == null ? null : person.trim();
     }
 
     /**
-     * @return wcode
+     * 获取路径编号
+     *
+     * @return wcode - 路径编号
      */
     public String getWcode() {
         return wcode;
     }
 
     /**
-     * @param wcode
+     * 设置路径编号
+     *
+     * @param wcode 路径编号
      */
     public void setWcode(String wcode) {
         this.wcode = wcode == null ? null : wcode.trim();
     }
 
     /**
-     * @return safety
+     * 获取安全类型
+     *
+     * @return safety - 安全类型
      */
     public String getSafety() {
         return safety;
     }
 
     /**
-     * @param safety
+     * 设置安全类型
+     *
+     * @param safety 安全类型
      */
     public void setSafety(String safety) {
         this.safety = safety == null ? null : safety.trim();
     }
 
     /**
-     * @return flag
+     * 获取标记
+     *
+     * @return flag - 标记
      */
     public String getFlag() {
         return flag;
     }
 
     /**
-     * @param flag
+     * 设置标记
+     *
+     * @param flag 标记
      */
     public void setFlag(String flag) {
         this.flag = flag == null ? null : flag.trim();

+ 14 - 7
modelsrc/com/miniframe/model/system/DWaynode.java

@@ -6,11 +6,14 @@ import javax.persistence.*;
 
 @Table(name = "d_waynode")
 public class DWaynode extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
     /**
-     * 路径编号
+     * 路径ID
      */
     private Integer wid;
 
@@ -37,32 +40,36 @@ public class DWaynode extends MiniserviceBaseModel implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
     }
 
     /**
-     * 获取路径编号
+     * 获取路径ID
      *
-     * @return wid - 路径编号
+     * @return wid - 路径ID
      */
     public Integer getWid() {
         return wid;
     }
 
     /**
-     * 设置路径编号
+     * 设置路径ID
      *
-     * @param wid 路径编号
+     * @param wid 路径ID
      */
     public void setWid(Integer wid) {
         this.wid = wid;

+ 72 - 16
modelsrc/com/miniframe/model/system/DWaynodeResult.java

@@ -6,132 +6,188 @@ import javax.persistence.*;
 
 @Table(name = "d_waynode_result")
 public class DWaynodeResult extends MiniserviceBaseModel implements Serializable {
+    /**
+     * ID
+     */
     @Id
     private Integer id;
 
+    /**
+     * 事故ID
+     */
     private Integer aid;
 
+    /**
+     * 任务ID
+     */
     private Integer jid;
 
+    /**
+     * 路径编号
+     */
     private String wcode;
 
+    /**
+     * 节点编号
+     */
     private String ncode;
 
+    /**
+     * 值1
+     */
     private String v1;
 
+    /**
+     * 值2
+     */
     private String v2;
 
+    /**
+     * 值3
+     */
     private String v3;
 
     private static final long serialVersionUID = 1L;
 
     /**
-     * @return id
+     * 获取ID
+     *
+     * @return id - ID
      */
     public Integer getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置ID
+     *
+     * @param id ID
      */
     public void setId(Integer id) {
         this.id = id;
     }
 
     /**
-     * @return aid
+     * 获取事故ID
+     *
+     * @return aid - 事故ID
      */
     public Integer getAid() {
         return aid;
     }
 
     /**
-     * @param aid
+     * 设置事故ID
+     *
+     * @param aid 事故ID
      */
     public void setAid(Integer aid) {
         this.aid = aid;
     }
 
     /**
-     * @return jid
+     * 获取任务ID
+     *
+     * @return jid - 任务ID
      */
     public Integer getJid() {
         return jid;
     }
 
     /**
-     * @param jid
+     * 设置任务ID
+     *
+     * @param jid 任务ID
      */
     public void setJid(Integer jid) {
         this.jid = jid;
     }
 
     /**
-     * @return wcode
+     * 获取路径编号
+     *
+     * @return wcode - 路径编号
      */
     public String getWcode() {
         return wcode;
     }
 
     /**
-     * @param wcode
+     * 设置路径编号
+     *
+     * @param wcode 路径编号
      */
     public void setWcode(String wcode) {
         this.wcode = wcode == null ? null : wcode.trim();
     }
 
     /**
-     * @return ncode
+     * 获取节点编号
+     *
+     * @return ncode - 节点编号
      */
     public String getNcode() {
         return ncode;
     }
 
     /**
-     * @param ncode
+     * 设置节点编号
+     *
+     * @param ncode 节点编号
      */
     public void setNcode(String ncode) {
         this.ncode = ncode == null ? null : ncode.trim();
     }
 
     /**
-     * @return v1
+     * 获取值1
+     *
+     * @return v1 - 值1
      */
     public String getV1() {
         return v1;
     }
 
     /**
-     * @param v1
+     * 设置值1
+     *
+     * @param v1 值1
      */
     public void setV1(String v1) {
         this.v1 = v1 == null ? null : v1.trim();
     }
 
     /**
-     * @return v2
+     * 获取值2
+     *
+     * @return v2 - 值2
      */
     public String getV2() {
         return v2;
     }
 
     /**
-     * @param v2
+     * 设置值2
+     *
+     * @param v2 值2
      */
     public void setV2(String v2) {
         this.v2 = v2 == null ? null : v2.trim();
     }
 
     /**
-     * @return v3
+     * 获取值3
+     *
+     * @return v3 - 值3
      */
     public String getV3() {
         return v3;
     }
 
     /**
-     * @param v3
+     * 设置值3
+     *
+     * @param v3 值3
      */
     public void setV3(String v3) {
         this.v3 = v3 == null ? null : v3.trim();

+ 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 Tue Feb 18 17:33:23 CST 2025.
+    This file was generated on Tue Jul 29 14:52:27 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

@@ -24,7 +24,6 @@ public class D000010Service extends D000010BaseModel implements ExecProcessFlow
 		Integer sid = this.getA_d000010().getSid();
 		Integer pid =this.getA_d000010().getPid();
 		double site =this.getA_d000010().getSite();
-
 		DSourceMapper dsm = UtilTools.getBean(DSourceMapper.class);
 		DSource ds = dsm.selectByPrimaryKey(sid);
 		if(ds==null){
@@ -36,6 +35,7 @@ public class D000010Service extends D000010BaseModel implements ExecProcessFlow
 		ds.setPid(pid);
 		ds.setPcode(pipe.getCode());
 		ds.setSite((float)site);
+		ds.setSiteremark(this.getA_d000010().getSiteremark());
 		dsm.updateByPrimaryKey(ds);
 	}
 	

+ 2 - 0
src/main/java/com/miniframe/bisiness/system/D00004Service.java

@@ -54,6 +54,8 @@ public class D00004Service extends D00004BaseModel implements ExecProcessFlow {
 		ds.setPcode(dp.getCode());
 		ds.setPname(dp.getName());
 		ds.setSite((float)this.getA_d00004().getSite());
+		ds.setSiteremark(this.getA_d00004().getSiteremark());
+
 		dsm.insertSelective(ds);
 	}
 	

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

@@ -39,6 +39,7 @@ public class D00005Service extends D00005BaseModel implements ExecProcessFlow {
 			row.setPid(ds.getPid());
 			row.setPname(ds.getPname());
 			row.setSite(CommonUtils.floatTodobule(ds.getSite()));
+			row.setSiteremark(ds.getSiteremark());
 			rows.add(row);
 		}
 		this.getD_d00005().setRows(rows);

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

@@ -32,6 +32,7 @@ public class D00009Service extends D00009BaseModel implements ExecProcessFlow {
 		DAccidentMapper accidentDao  = UtilTools.getBean(DAccidentMapper.class);
 		DAccident accident= accidentDao.selectByPrimaryKey(aid);
 
+
 //		String id = getA_b00022().getId();
 		String outPath="";
 		String fileName ="";

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

@@ -34,6 +34,7 @@ public class D10004Service extends D10004BaseModel implements ExecProcessFlow {
 			row.setPname(node.getPname());
 			row.setChname(node.getChname());
 			row.setChcode(node.getChcode());
+			row.setSiteremark(node.getSiteremark());
 			rows.add(row);
 		}
 		this.getD_d10004().setRows(rows);

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä