huangxingxing 1 год назад
Родитель
Сommit
7117796be7
40 измененных файлов с 1978 добавлено и 3 удалено
  1. 2 0
      dbscript/init/generate/03-functionInit.sql
  2. 1 0
      definitionsrc/returncode/returncode-business.properties
  3. 1 0
      definitionsrc/returncode/returncode-business_zh_CN.properties
  4. 112 0
      generated/com/miniframe/generate/business/system/model/D10028BaseModel.java
  5. 112 0
      generated/com/miniframe/generate/business/system/model/D10029BaseModel.java
  6. 99 0
      generated/com/miniframe/generate/comm/httpclientapater/D10028Client.java
  7. 99 0
      generated/com/miniframe/generate/comm/httpclientapater/D10029Client.java
  8. 25 0
      generated/com/miniframe/generate/comm/system/A_D10028.java
  9. 90 0
      generated/com/miniframe/generate/comm/system/A_D10029.java
  10. 26 0
      generated/com/miniframe/generate/comm/system/D_D10028.java
  11. 116 0
      generated/com/miniframe/generate/comm/system/D_D10028_ROWS_RECODE.java
  12. 12 0
      generated/com/miniframe/generate/comm/system/D_D10029.java
  13. 12 0
      generated/validateform/a_d10029Form.xml
  14. 2 0
      generated/validator/resources_a_d10028Form_validator.properties
  15. 2 0
      generated/validator/resources_a_d10028Form_validator_zh_CN.properties
  16. 7 0
      generated/validator/resources_a_d10029Form_validator.properties
  17. 7 0
      generated/validator/resources_a_d10029Form_validator_zh_CN.properties
  18. 1 0
      generated/validator/resources_d_d10028Form_validator.properties
  19. 1 0
      generated/validator/resources_d_d10028Form_validator_zh_CN.properties
  20. 9 0
      generated/validator/resources_d_d10028_rows_recodeForm_validator.properties
  21. 9 0
      generated/validator/resources_d_d10028_rows_recodeForm_validator_zh_CN.properties
  22. 1 0
      generated/validator/resources_d_d10029Form_validator.properties
  23. 1 0
      generated/validator/resources_d_d10029Form_validator_zh_CN.properties
  24. 153 0
      modelsrc/com/miniframe/model/system/DThreshold.java
  25. 740 0
      modelsrc/com/miniframe/model/system/DThresholdSQLBuilder.java
  26. 10 0
      modelsrc/com/miniframe/model/system/dao/DThresholdMapper.java
  27. 2 1
      modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml
  28. 50 0
      modelsrc/com/miniframe/model/system/xml/DThresholdMapper.xml
  29. 76 0
      src/main/java/com/miniframe/bisiness/system/D10028Service.java
  30. 63 0
      src/main/java/com/miniframe/bisiness/system/D10029Service.java
  31. 23 0
      src/main/java/com/miniframe/dbtransfer/DThresholdDbTransfer.java
  32. 44 0
      src/test/java/com/miniframe/comm/httpclientapater/D10028Test.java
  33. 44 0
      src/test/java/com/miniframe/comm/httpclientapater/D10029Test.java
  34. 2 1
      系统设计/实体Bean/system(实体列表).csv
  35. 2 1
      系统设计/数据定义/返 回 码/business(业务系统).csv
  36. 2 0
      系统设计/系统模块/SYSTEM(基础系统).csv
  37. 2 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10028_A(报警设置查询).csv
  38. 10 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10028_D(报警设置查询).csv
  39. 7 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10029_A(报警设置修改).csv
  40. 1 0
      系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10029_D(报警设置修改).csv

+ 2 - 0
dbscript/init/generate/03-functionInit.sql

@@ -69,3 +69,5 @@ INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D1
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10025', '基础系统','瓦斯爆炸区删除',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10026', '基础系统','瓦斯积聚区查询',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10027', '基础系统','瓦斯积聚区修改',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10028', '基础系统','报警设置查询',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10029', '基础系统','报警设置修改',true);

+ 1 - 0
definitionsrc/returncode/returncode-business.properties

@@ -85,3 +85,4 @@ EB3100024 = \u74E6\u65AF\u79EF\u805A\u533A\u4E0D\u5B58\u5728\uFF01
 EB3100025 = \u8FB9\u754C\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF\uFF01
 EB3100026 = \u76D1\u6D4B\u70B9\u7ED3\u679C\u6570\u636E\u4E0D\u5B58\u5728\uFF01
 EB3100027 = \u6C42\u89E3\u672A\u5B8C\u6210\uFF01
+EB3100028 = \u62A5\u8B66\u4E0D\u5B58\u5728\uFF01

+ 1 - 0
definitionsrc/returncode/returncode-business_zh_CN.properties

@@ -85,3 +85,4 @@ EB3100024 = \u74E6\u65AF\u79EF\u805A\u533A\u4E0D\u5B58\u5728\uFF01
 EB3100025 = \u8FB9\u754C\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF\uFF01
 EB3100026 = \u76D1\u6D4B\u70B9\u7ED3\u679C\u6570\u636E\u4E0D\u5B58\u5728\uFF01
 EB3100027 = \u6C42\u89E3\u672A\u5B8C\u6210\uFF01
+EB3100028 = \u62A5\u8B66\u4E0D\u5B58\u5728\uFF01

+ 112 - 0
generated/com/miniframe/generate/business/system/model/D10028BaseModel.java

@@ -0,0 +1,112 @@
+package com.miniframe.generate.business.system.model;
+
+import java.util.Map;
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import com.miniframe.core.BaseMapModel;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.core.ext.HttpMapFormater;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import com.miniframe.generate.global.AppGlobalVariableSysconfig;
+
+import com.miniframe.generate.comm.system.A_SYSTEMHEAD;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+import com.miniframe.generate.comm.system.A_D10028;
+import com.miniframe.generate.comm.system.D_D10028;
+
+/**
+ * 系统服务,“报警设置查询”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class D10028BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_D10028 a_d10028;//上行体
+	D_D10028 d_d10028;//下行体
+
+	public D10028BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_d10028=new A_D10028();
+		d_d10028=new D_D10028();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_d10028.validater();
+	}
+
+	public void setTransMap(Map map) throws Exception {
+		Map headMap = HttpMapFormater.format(map, A_SYSTEMHEAD.class);
+		this.a_systemhead = UtilTools.map2Obj(headMap, A_SYSTEMHEAD.class);
+		Map bodyMap = HttpMapFormater.format(map, A_D10028.class);
+		this.a_d10028 = UtilTools.map2Obj(bodyMap, A_D10028.class);
+	}
+
+	public Map getTransMap() throws Exception {
+		Map reMap = new LinkedHashMap();
+
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getTransCode())){
+			(this.d_systemhead).setTransCode((this.a_systemhead).getTransCode());
+		}
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getChannelNo())){
+			(this.d_systemhead).setChannelNo((this.a_systemhead).getChannelNo());
+		}
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getUserId())){
+			(this.d_systemhead).setUserId((this.a_systemhead).getUserId());
+		}
+        if(UtilTools.isNullOrBlank((this.d_systemhead).getTransTime())){
+            (this.d_systemhead).setTransTime(DateTimeFormatter.ofPattern(AppGlobalVariableSysconfig.DATETIMEFORMAT).format(ZonedDateTime.now()));
+        }
+
+		reMap.putAll(UtilTools.obj2Map(this.d_systemhead));
+		reMap.putAll(UtilTools.obj2Map(this.d_d10028));
+
+		return reMap;
+	}
+
+	public A_SYSTEMHEAD getA_systemhead() {
+		return this.a_systemhead;
+	}
+
+	public void setA_systemhead(A_SYSTEMHEAD a_systemhead) {
+		this.a_systemhead=a_systemhead;
+	}
+
+	public D_SYSTEMHEAD getD_systemhead() {
+		return d_systemhead;
+	}
+
+	public void setD_systemhead(D_SYSTEMHEAD d_systemhead) {
+		this.d_systemhead=d_systemhead;
+	}
+
+	public A_D10028 getA_d10028() {
+		return a_d10028;
+	}
+
+	public void setA_d10028(A_D10028 a_d10028) {
+		this.a_d10028=a_d10028;
+	}
+
+	public D_D10028 getD_d10028() {
+		return this.d_d10028;
+	}
+
+	public void setD_d10028(D_D10028 d_d10028) {
+		this.d_d10028=d_d10028;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 112 - 0
generated/com/miniframe/generate/business/system/model/D10029BaseModel.java

@@ -0,0 +1,112 @@
+package com.miniframe.generate.business.system.model;
+
+import java.util.Map;
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import com.miniframe.core.BaseMapModel;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.core.ext.HttpMapFormater;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import com.miniframe.generate.global.AppGlobalVariableSysconfig;
+
+import com.miniframe.generate.comm.system.A_SYSTEMHEAD;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+import com.miniframe.generate.comm.system.A_D10029;
+import com.miniframe.generate.comm.system.D_D10029;
+
+/**
+ * 系统服务,“报警设置修改”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class D10029BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_D10029 a_d10029;//上行体
+	D_D10029 d_d10029;//下行体
+
+	public D10029BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_d10029=new A_D10029();
+		d_d10029=new D_D10029();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_d10029.validater();
+	}
+
+	public void setTransMap(Map map) throws Exception {
+		Map headMap = HttpMapFormater.format(map, A_SYSTEMHEAD.class);
+		this.a_systemhead = UtilTools.map2Obj(headMap, A_SYSTEMHEAD.class);
+		Map bodyMap = HttpMapFormater.format(map, A_D10029.class);
+		this.a_d10029 = UtilTools.map2Obj(bodyMap, A_D10029.class);
+	}
+
+	public Map getTransMap() throws Exception {
+		Map reMap = new LinkedHashMap();
+
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getTransCode())){
+			(this.d_systemhead).setTransCode((this.a_systemhead).getTransCode());
+		}
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getChannelNo())){
+			(this.d_systemhead).setChannelNo((this.a_systemhead).getChannelNo());
+		}
+		if(UtilTools.isNullOrBlank((this.d_systemhead).getUserId())){
+			(this.d_systemhead).setUserId((this.a_systemhead).getUserId());
+		}
+        if(UtilTools.isNullOrBlank((this.d_systemhead).getTransTime())){
+            (this.d_systemhead).setTransTime(DateTimeFormatter.ofPattern(AppGlobalVariableSysconfig.DATETIMEFORMAT).format(ZonedDateTime.now()));
+        }
+
+		reMap.putAll(UtilTools.obj2Map(this.d_systemhead));
+		reMap.putAll(UtilTools.obj2Map(this.d_d10029));
+
+		return reMap;
+	}
+
+	public A_SYSTEMHEAD getA_systemhead() {
+		return this.a_systemhead;
+	}
+
+	public void setA_systemhead(A_SYSTEMHEAD a_systemhead) {
+		this.a_systemhead=a_systemhead;
+	}
+
+	public D_SYSTEMHEAD getD_systemhead() {
+		return d_systemhead;
+	}
+
+	public void setD_systemhead(D_SYSTEMHEAD d_systemhead) {
+		this.d_systemhead=d_systemhead;
+	}
+
+	public A_D10029 getA_d10029() {
+		return a_d10029;
+	}
+
+	public void setA_d10029(A_D10029 a_d10029) {
+		this.a_d10029=a_d10029;
+	}
+
+	public D_D10029 getD_d10029() {
+		return this.d_d10029;
+	}
+
+	public void setD_d10029(D_D10029 d_d10029) {
+		this.d_d10029=d_d10029;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpclientapater/D10028Client.java

@@ -0,0 +1,99 @@
+package com.miniframe.generate.comm.httpclientapater;
+
+import com.miniframe.spring.httpclient.MFHttpRespInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.miniframe.core.Transmitter;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.comm.system.D_D10028;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.D10028BaseModel;
+
+public class D10028Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10028Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->报警设置查询((D10028)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10028BaseModel execute(D10028BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10028BaseModel execute(D10028BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(D10028BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10028BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("D10028");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_d10028()));
+		if(extMap!=null && extMap.size()>0){
+			inMap.putAll(extMap);
+		}
+
+		Transmitter httpclientApater = (Transmitter) UtilTools.getBean("httpclientApater");
+		MFHttpRespInfo respInfo;
+		if(UtilTools.isNotNullAndBlank(url)){
+			respInfo = httpclientApater.doPostDataToRespInfo(inMap,url);
+		}else{
+			respInfo = httpclientApater.doPostDataToRespInfo(inMap);
+		}
+
+		if(respInfo!=null) {
+			Map outMap=respInfo.getParamMap();
+			D_SYSTEMHEAD d_systemhead =  UtilTools.map2Obj(outMap, D_SYSTEMHEAD.class);
+			D_D10028 d_d10028 =  UtilTools.map2Obj(outMap, D_D10028.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_d10028(d_d10028);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10028BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10028BaseModel execute(D10028BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpclientapater/D10029Client.java

@@ -0,0 +1,99 @@
+package com.miniframe.generate.comm.httpclientapater;
+
+import com.miniframe.spring.httpclient.MFHttpRespInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.miniframe.core.Transmitter;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.comm.system.D_D10029;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.D10029BaseModel;
+
+public class D10029Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10029Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->报警设置修改((D10029)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10029BaseModel execute(D10029BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10029BaseModel execute(D10029BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(D10029BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10029BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("D10029");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_d10029()));
+		if(extMap!=null && extMap.size()>0){
+			inMap.putAll(extMap);
+		}
+
+		Transmitter httpclientApater = (Transmitter) UtilTools.getBean("httpclientApater");
+		MFHttpRespInfo respInfo;
+		if(UtilTools.isNotNullAndBlank(url)){
+			respInfo = httpclientApater.doPostDataToRespInfo(inMap,url);
+		}else{
+			respInfo = httpclientApater.doPostDataToRespInfo(inMap);
+		}
+
+		if(respInfo!=null) {
+			Map outMap=respInfo.getParamMap();
+			D_SYSTEMHEAD d_systemhead =  UtilTools.map2Obj(outMap, D_SYSTEMHEAD.class);
+			D_D10029 d_d10029 =  UtilTools.map2Obj(outMap, D_D10029.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_d10029(d_d10029);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10029BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10029BaseModel execute(D10029BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

+ 25 - 0
generated/com/miniframe/generate/comm/system/A_D10028.java

@@ -0,0 +1,25 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 报警设置查询
+ */
+public class A_D10028 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String stype;//灾情类型
+	/**
+	 *灾情类型
+	 */
+	public void setStype(String stype) {
+		this.stype=stype;
+	}
+	/**
+	 *灾情类型
+	 */
+	public String getStype() {
+		return this.stype;
+	}
+}

+ 90 - 0
generated/com/miniframe/generate/comm/system/A_D10029.java

@@ -0,0 +1,90 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 报警设置修改
+ */
+public class A_D10029 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	int id;//设置ID
+	/**
+	 *设置ID
+	 */
+	public void setId(int id) {
+		this.id=id;
+	}
+	/**
+	 *设置ID
+	 */
+	public int getId() {
+		return this.id;
+	}
+	String height;//水位
+	/**
+	 *水位
+	 */
+	public void setHeight(String height) {
+		this.height=height;
+	}
+	/**
+	 *水位
+	 */
+	public String getHeight() {
+		return this.height;
+	}
+	String temperature;//温度
+	/**
+	 *温度
+	 */
+	public void setTemperature(String temperature) {
+		this.temperature=temperature;
+	}
+	/**
+	 *温度
+	 */
+	public String getTemperature() {
+		return this.temperature;
+	}
+	String co2;//二氧化碳浓度
+	/**
+	 *二氧化碳浓度
+	 */
+	public void setCo2(String co2) {
+		this.co2=co2;
+	}
+	/**
+	 *二氧化碳浓度
+	 */
+	public String getCo2() {
+		return this.co2;
+	}
+	String ch4;//ch4浓度
+	/**
+	 *ch4浓度
+	 */
+	public void setCh4(String ch4) {
+		this.ch4=ch4;
+	}
+	/**
+	 *ch4浓度
+	 */
+	public String getCh4() {
+		return this.ch4;
+	}
+	String so2;//so2浓度
+	/**
+	 *so2浓度
+	 */
+	public void setSo2(String so2) {
+		this.so2=so2;
+	}
+	/**
+	 *so2浓度
+	 */
+	public String getSo2() {
+		return this.so2;
+	}
+}

+ 26 - 0
generated/com/miniframe/generate/comm/system/D_D10028.java

@@ -0,0 +1,26 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+import java.util.*;
+/**
+ * 报警设置查询
+ */
+public class D_D10028 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	List <D_D10028_ROWS_RECODE> rows;//数据
+	/**
+	 *数据
+	 */
+	public void setRows(List <D_D10028_ROWS_RECODE> rows) {
+		this.rows=rows;
+	}
+	/**
+	 *数据
+	 */
+	public List <D_D10028_ROWS_RECODE> getRows() {
+		return this.rows;
+	}
+}

+ 116 - 0
generated/com/miniframe/generate/comm/system/D_D10028_ROWS_RECODE.java

@@ -0,0 +1,116 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 报警设置查询->数据
+ */
+public class D_D10028_ROWS_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	int id;//设置ID
+	/**
+	 *设置ID
+	 */
+	public void setId(int id) {
+		this.id=id;
+	}
+	/**
+	 *设置ID
+	 */
+	public int getId() {
+		return this.id;
+	}
+	int grade;//等级
+	/**
+	 *等级
+	 */
+	public void setGrade(int grade) {
+		this.grade=grade;
+	}
+	/**
+	 *等级
+	 */
+	public int getGrade() {
+		return this.grade;
+	}
+	String stype;//灾害类型
+	/**
+	 *灾害类型
+	 */
+	public void setStype(String stype) {
+		this.stype=stype;
+	}
+	/**
+	 *灾害类型
+	 */
+	public String getStype() {
+		return this.stype;
+	}
+	String height;//水位
+	/**
+	 *水位
+	 */
+	public void setHeight(String height) {
+		this.height=height;
+	}
+	/**
+	 *水位
+	 */
+	public String getHeight() {
+		return this.height;
+	}
+	String temperature;//温度
+	/**
+	 *温度
+	 */
+	public void setTemperature(String temperature) {
+		this.temperature=temperature;
+	}
+	/**
+	 *温度
+	 */
+	public String getTemperature() {
+		return this.temperature;
+	}
+	String co2;//二氧化碳浓度
+	/**
+	 *二氧化碳浓度
+	 */
+	public void setCo2(String co2) {
+		this.co2=co2;
+	}
+	/**
+	 *二氧化碳浓度
+	 */
+	public String getCo2() {
+		return this.co2;
+	}
+	String ch4;//ch4浓度
+	/**
+	 *ch4浓度
+	 */
+	public void setCh4(String ch4) {
+		this.ch4=ch4;
+	}
+	/**
+	 *ch4浓度
+	 */
+	public String getCh4() {
+		return this.ch4;
+	}
+	String so2;//so2浓度
+	/**
+	 *so2浓度
+	 */
+	public void setSo2(String so2) {
+		this.so2=so2;
+	}
+	/**
+	 *so2浓度
+	 */
+	public String getSo2() {
+		return this.so2;
+	}
+}

+ 12 - 0
generated/com/miniframe/generate/comm/system/D_D10029.java

@@ -0,0 +1,12 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 报警设置修改
+ */
+public class D_D10029 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+}

+ 12 - 0
generated/validateform/a_d10029Form.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE form-validation PUBLIC "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1//EN" "http://jakarta.apache.org/commons/dtds/validator_1_1.dtd">
+<!-- 报警设置修改Form配置文件系统生成请勿修改,否则重新生成将覆盖 -->
+<form-validation>
+<formset>
+<form name="a_d10029Form">
+<field property="id" depends="required">
+    <arg0 key="a_d10029.id"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 2 - 0
generated/validator/resources_a_d10028Form_validator.properties

@@ -0,0 +1,2 @@
+a_d10028.stype = \u707E\u60C5\u7C7B\u578B
+a_d10028Form = true

+ 2 - 0
generated/validator/resources_a_d10028Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+a_d10028.stype = \u707E\u60C5\u7C7B\u578B
+a_d10028Form = true

+ 7 - 0
generated/validator/resources_a_d10029Form_validator.properties

@@ -0,0 +1,7 @@
+a_d10029.id = \u8BBE\u7F6EID
+a_d10029.height = \u6C34\u4F4D
+a_d10029.temperature = \u6E29\u5EA6
+a_d10029.co2 = \u4E8C\u6C27\u5316\u78B3\u6D53\u5EA6
+a_d10029.ch4 = ch4\u6D53\u5EA6
+a_d10029.so2 = so2\u6D53\u5EA6
+a_d10029Form = true

+ 7 - 0
generated/validator/resources_a_d10029Form_validator_zh_CN.properties

@@ -0,0 +1,7 @@
+a_d10029.id = \u8BBE\u7F6EID
+a_d10029.height = \u6C34\u4F4D
+a_d10029.temperature = \u6E29\u5EA6
+a_d10029.co2 = \u4E8C\u6C27\u5316\u78B3\u6D53\u5EA6
+a_d10029.ch4 = ch4\u6D53\u5EA6
+a_d10029.so2 = so2\u6D53\u5EA6
+a_d10029Form = true

+ 1 - 0
generated/validator/resources_d_d10028Form_validator.properties

@@ -0,0 +1 @@
+d_d10028Form = false

+ 1 - 0
generated/validator/resources_d_d10028Form_validator_zh_CN.properties

@@ -0,0 +1 @@
+d_d10028Form = false

+ 9 - 0
generated/validator/resources_d_d10028_rows_recodeForm_validator.properties

@@ -0,0 +1,9 @@
+d_d10028_rows_recode.id = \u8BBE\u7F6EID
+d_d10028_rows_recode.grade = \u7B49\u7EA7
+d_d10028_rows_recode.stype = \u707E\u5BB3\u7C7B\u578B
+d_d10028_rows_recode.height = \u6C34\u4F4D
+d_d10028_rows_recode.temperature = \u6E29\u5EA6
+d_d10028_rows_recode.co2 = \u4E8C\u6C27\u5316\u78B3\u6D53\u5EA6
+d_d10028_rows_recode.ch4 = ch4\u6D53\u5EA6
+d_d10028_rows_recode.so2 = so2\u6D53\u5EA6
+d_d10028_rows_recodeForm = true

+ 9 - 0
generated/validator/resources_d_d10028_rows_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,9 @@
+d_d10028_rows_recode.id = \u8BBE\u7F6EID
+d_d10028_rows_recode.grade = \u7B49\u7EA7
+d_d10028_rows_recode.stype = \u707E\u5BB3\u7C7B\u578B
+d_d10028_rows_recode.height = \u6C34\u4F4D
+d_d10028_rows_recode.temperature = \u6E29\u5EA6
+d_d10028_rows_recode.co2 = \u4E8C\u6C27\u5316\u78B3\u6D53\u5EA6
+d_d10028_rows_recode.ch4 = ch4\u6D53\u5EA6
+d_d10028_rows_recode.so2 = so2\u6D53\u5EA6
+d_d10028_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_d10029Form_validator.properties

@@ -0,0 +1 @@
+d_d10029Form = false

+ 1 - 0
generated/validator/resources_d_d10029Form_validator_zh_CN.properties

@@ -0,0 +1 @@
+d_d10029Form = false

+ 153 - 0
modelsrc/com/miniframe/model/system/DThreshold.java

@@ -0,0 +1,153 @@
+package com.miniframe.model.system;
+
+import com.miniframe.system.MiniserviceBaseModel;
+import java.io.Serializable;
+import javax.persistence.*;
+
+@Table(name = "d_threshold")
+public class DThreshold extends MiniserviceBaseModel implements Serializable {
+    @Id
+    private Integer id;
+
+    /**
+     * 灾情类型 Fire-火灾源  Water-水灾源
+     */
+    private String stype;
+
+    private String height;
+
+    private String temperature;
+
+    private String co2;
+
+    private String ch4;
+
+    /**
+     * 等级
+     */
+    private Integer grade;
+
+    private String so2;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取灾情类型 Fire-火灾源  Water-水灾源
+     *
+     * @return stype - 灾情类型 Fire-火灾源  Water-水灾源
+     */
+    public String getStype() {
+        return stype;
+    }
+
+    /**
+     * 设置灾情类型 Fire-火灾源  Water-水灾源
+     *
+     * @param stype 灾情类型 Fire-火灾源  Water-水灾源
+     */
+    public void setStype(String stype) {
+        this.stype = stype == null ? null : stype.trim();
+    }
+
+    /**
+     * @return height
+     */
+    public String getHeight() {
+        return height;
+    }
+
+    /**
+     * @param height
+     */
+    public void setHeight(String height) {
+        this.height = height == null ? null : height.trim();
+    }
+
+    /**
+     * @return temperature
+     */
+    public String getTemperature() {
+        return temperature;
+    }
+
+    /**
+     * @param temperature
+     */
+    public void setTemperature(String temperature) {
+        this.temperature = temperature == null ? null : temperature.trim();
+    }
+
+    /**
+     * @return co2
+     */
+    public String getCo2() {
+        return co2;
+    }
+
+    /**
+     * @param co2
+     */
+    public void setCo2(String co2) {
+        this.co2 = co2 == null ? null : co2.trim();
+    }
+
+    /**
+     * @return ch4
+     */
+    public String getCh4() {
+        return ch4;
+    }
+
+    /**
+     * @param ch4
+     */
+    public void setCh4(String ch4) {
+        this.ch4 = ch4 == null ? null : ch4.trim();
+    }
+
+    /**
+     * 获取等级
+     *
+     * @return grade - 等级
+     */
+    public Integer getGrade() {
+        return grade;
+    }
+
+    /**
+     * 设置等级
+     *
+     * @param grade 等级
+     */
+    public void setGrade(Integer grade) {
+        this.grade = grade;
+    }
+
+    /**
+     * @return so2
+     */
+    public String getSo2() {
+        return so2;
+    }
+
+    /**
+     * @param so2
+     */
+    public void setSo2(String so2) {
+        this.so2 = so2 == null ? null : so2.trim();
+    }
+}

+ 740 - 0
modelsrc/com/miniframe/model/system/DThresholdSQLBuilder.java

@@ -0,0 +1,740 @@
+package com.miniframe.model.system;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DThresholdSQLBuilder {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public DThresholdSQLBuilder() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeIsNull() {
+            addCriterion("stype is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeIsNotNull() {
+            addCriterion("stype is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeEqualTo(String value) {
+            addCriterion("stype =", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeNotEqualTo(String value) {
+            addCriterion("stype <>", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeGreaterThan(String value) {
+            addCriterion("stype >", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeGreaterThanOrEqualTo(String value) {
+            addCriterion("stype >=", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeLessThan(String value) {
+            addCriterion("stype <", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeLessThanOrEqualTo(String value) {
+            addCriterion("stype <=", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeLike(String value) {
+            addCriterion("stype like", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeNotLike(String value) {
+            addCriterion("stype not like", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeIn(List<String> values) {
+            addCriterion("stype in", values, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeNotIn(List<String> values) {
+            addCriterion("stype not in", values, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeBetween(String value1, String value2) {
+            addCriterion("stype between", value1, value2, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeNotBetween(String value1, String value2) {
+            addCriterion("stype not between", value1, value2, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightIsNull() {
+            addCriterion("height is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightIsNotNull() {
+            addCriterion("height is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightEqualTo(String value) {
+            addCriterion("height =", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightNotEqualTo(String value) {
+            addCriterion("height <>", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightGreaterThan(String value) {
+            addCriterion("height >", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightGreaterThanOrEqualTo(String value) {
+            addCriterion("height >=", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightLessThan(String value) {
+            addCriterion("height <", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightLessThanOrEqualTo(String value) {
+            addCriterion("height <=", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightLike(String value) {
+            addCriterion("height like", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightNotLike(String value) {
+            addCriterion("height not like", value, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightIn(List<String> values) {
+            addCriterion("height in", values, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightNotIn(List<String> values) {
+            addCriterion("height not in", values, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightBetween(String value1, String value2) {
+            addCriterion("height between", value1, value2, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeightNotBetween(String value1, String value2) {
+            addCriterion("height not between", value1, value2, "height");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureIsNull() {
+            addCriterion("temperature is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureIsNotNull() {
+            addCriterion("temperature is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureEqualTo(String value) {
+            addCriterion("temperature =", value, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureNotEqualTo(String value) {
+            addCriterion("temperature <>", value, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureGreaterThan(String value) {
+            addCriterion("temperature >", value, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureGreaterThanOrEqualTo(String value) {
+            addCriterion("temperature >=", value, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureLessThan(String value) {
+            addCriterion("temperature <", value, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureLessThanOrEqualTo(String value) {
+            addCriterion("temperature <=", value, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureLike(String value) {
+            addCriterion("temperature like", value, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureNotLike(String value) {
+            addCriterion("temperature not like", value, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureIn(List<String> values) {
+            addCriterion("temperature in", values, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureNotIn(List<String> values) {
+            addCriterion("temperature not in", values, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureBetween(String value1, String value2) {
+            addCriterion("temperature between", value1, value2, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemperatureNotBetween(String value1, String value2) {
+            addCriterion("temperature not between", value1, value2, "temperature");
+            return (Criteria) this;
+        }
+
+        public Criteria andCo2IsNull() {
+            addCriterion("co2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCo2IsNotNull() {
+            addCriterion("co2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCo2EqualTo(String value) {
+            addCriterion("co2 =", value, "co2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCo2NotEqualTo(String value) {
+            addCriterion("co2 <>", value, "co2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCo2GreaterThan(String value) {
+            addCriterion("co2 >", value, "co2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCo2GreaterThanOrEqualTo(String value) {
+            addCriterion("co2 >=", value, "co2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCo2LessThan(String value) {
+            addCriterion("co2 <", value, "co2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCo2LessThanOrEqualTo(String value) {
+            addCriterion("co2 <=", value, "co2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCo2Like(String value) {
+            addCriterion("co2 like", value, "co2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCo2NotLike(String value) {
+            addCriterion("co2 not like", value, "co2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCo2In(List<String> values) {
+            addCriterion("co2 in", values, "co2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCo2NotIn(List<String> values) {
+            addCriterion("co2 not in", values, "co2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCo2Between(String value1, String value2) {
+            addCriterion("co2 between", value1, value2, "co2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCo2NotBetween(String value1, String value2) {
+            addCriterion("co2 not between", value1, value2, "co2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCh4IsNull() {
+            addCriterion("ch4 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCh4IsNotNull() {
+            addCriterion("ch4 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCh4EqualTo(String value) {
+            addCriterion("ch4 =", value, "ch4");
+            return (Criteria) this;
+        }
+
+        public Criteria andCh4NotEqualTo(String value) {
+            addCriterion("ch4 <>", value, "ch4");
+            return (Criteria) this;
+        }
+
+        public Criteria andCh4GreaterThan(String value) {
+            addCriterion("ch4 >", value, "ch4");
+            return (Criteria) this;
+        }
+
+        public Criteria andCh4GreaterThanOrEqualTo(String value) {
+            addCriterion("ch4 >=", value, "ch4");
+            return (Criteria) this;
+        }
+
+        public Criteria andCh4LessThan(String value) {
+            addCriterion("ch4 <", value, "ch4");
+            return (Criteria) this;
+        }
+
+        public Criteria andCh4LessThanOrEqualTo(String value) {
+            addCriterion("ch4 <=", value, "ch4");
+            return (Criteria) this;
+        }
+
+        public Criteria andCh4Like(String value) {
+            addCriterion("ch4 like", value, "ch4");
+            return (Criteria) this;
+        }
+
+        public Criteria andCh4NotLike(String value) {
+            addCriterion("ch4 not like", value, "ch4");
+            return (Criteria) this;
+        }
+
+        public Criteria andCh4In(List<String> values) {
+            addCriterion("ch4 in", values, "ch4");
+            return (Criteria) this;
+        }
+
+        public Criteria andCh4NotIn(List<String> values) {
+            addCriterion("ch4 not in", values, "ch4");
+            return (Criteria) this;
+        }
+
+        public Criteria andCh4Between(String value1, String value2) {
+            addCriterion("ch4 between", value1, value2, "ch4");
+            return (Criteria) this;
+        }
+
+        public Criteria andCh4NotBetween(String value1, String value2) {
+            addCriterion("ch4 not between", value1, value2, "ch4");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeIsNull() {
+            addCriterion("grade is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeIsNotNull() {
+            addCriterion("grade is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeEqualTo(Integer value) {
+            addCriterion("grade =", value, "grade");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeNotEqualTo(Integer value) {
+            addCriterion("grade <>", value, "grade");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeGreaterThan(Integer value) {
+            addCriterion("grade >", value, "grade");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("grade >=", value, "grade");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeLessThan(Integer value) {
+            addCriterion("grade <", value, "grade");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeLessThanOrEqualTo(Integer value) {
+            addCriterion("grade <=", value, "grade");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeIn(List<Integer> values) {
+            addCriterion("grade in", values, "grade");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeNotIn(List<Integer> values) {
+            addCriterion("grade not in", values, "grade");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeBetween(Integer value1, Integer value2) {
+            addCriterion("grade between", value1, value2, "grade");
+            return (Criteria) this;
+        }
+
+        public Criteria andGradeNotBetween(Integer value1, Integer value2) {
+            addCriterion("grade not between", value1, value2, "grade");
+            return (Criteria) this;
+        }
+
+        public Criteria andSo2IsNull() {
+            addCriterion("so2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSo2IsNotNull() {
+            addCriterion("so2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSo2EqualTo(String value) {
+            addCriterion("so2 =", value, "so2");
+            return (Criteria) this;
+        }
+
+        public Criteria andSo2NotEqualTo(String value) {
+            addCriterion("so2 <>", value, "so2");
+            return (Criteria) this;
+        }
+
+        public Criteria andSo2GreaterThan(String value) {
+            addCriterion("so2 >", value, "so2");
+            return (Criteria) this;
+        }
+
+        public Criteria andSo2GreaterThanOrEqualTo(String value) {
+            addCriterion("so2 >=", value, "so2");
+            return (Criteria) this;
+        }
+
+        public Criteria andSo2LessThan(String value) {
+            addCriterion("so2 <", value, "so2");
+            return (Criteria) this;
+        }
+
+        public Criteria andSo2LessThanOrEqualTo(String value) {
+            addCriterion("so2 <=", value, "so2");
+            return (Criteria) this;
+        }
+
+        public Criteria andSo2Like(String value) {
+            addCriterion("so2 like", value, "so2");
+            return (Criteria) this;
+        }
+
+        public Criteria andSo2NotLike(String value) {
+            addCriterion("so2 not like", value, "so2");
+            return (Criteria) this;
+        }
+
+        public Criteria andSo2In(List<String> values) {
+            addCriterion("so2 in", values, "so2");
+            return (Criteria) this;
+        }
+
+        public Criteria andSo2NotIn(List<String> values) {
+            addCriterion("so2 not in", values, "so2");
+            return (Criteria) this;
+        }
+
+        public Criteria andSo2Between(String value1, String value2) {
+            addCriterion("so2 between", value1, value2, "so2");
+            return (Criteria) this;
+        }
+
+        public Criteria andSo2NotBetween(String value1, String value2) {
+            addCriterion("so2 not between", value1, value2, "so2");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 10 - 0
modelsrc/com/miniframe/model/system/dao/DThresholdMapper.java

@@ -0,0 +1,10 @@
+package com.miniframe.model.system.dao;
+
+import com.miniframe.model.system.DThreshold;
+import com.miniframe.model.system.DThresholdSQLBuilder;
+import com.miniframe.spring.db.MFBaseMapper;
+import com.miniframe.system.MiniserviceBaseDao;
+
+public interface DThresholdMapper extends MiniserviceBaseDao, MFBaseMapper<DThreshold> {
+    long countByExample(DThresholdSQLBuilder example);
+}

+ 2 - 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 Fri Apr 12 15:38:41 CST 2024.
+    This file was generated on Thu Apr 18 16:25:02 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />
@@ -36,5 +36,6 @@
     <mapper resource="com/miniframe/model/system/xml/DGasMapper.xml" />
     <mapper resource="com/miniframe/model/system/xml/DChecknodeValcodeMapper.xml" />
     <mapper resource="com/miniframe/model/system/xml/DChecknodeValMapper.xml" />
+    <mapper resource="com/miniframe/model/system/xml/DThresholdMapper.xml" />
   </mappers>
 </configuration>

+ 50 - 0
modelsrc/com/miniframe/model/system/xml/DThresholdMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miniframe.model.system.dao.DThresholdMapper">
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <select id="countByExample" parameterType="com.miniframe.model.system.DThresholdSQLBuilder" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    select count(*) from d_threshold
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <cache>
+    <!--
+      WARNING - @mbg.generated
+    -->
+  </cache>
+</mapper>

+ 76 - 0
src/main/java/com/miniframe/bisiness/system/D10028Service.java

@@ -0,0 +1,76 @@
+package com.miniframe.bisiness.system;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.system.model.D10028BaseModel;
+import com.miniframe.generate.comm.system.D_D10028_ROWS_RECODE;
+import com.miniframe.model.system.DThreshold;
+import com.miniframe.model.system.DThresholdSQLBuilder;
+import com.miniframe.model.system.dao.DThresholdMapper;
+
+/**
+ * 基础系统,“报警设置查询”逻辑处理(重新生成不覆盖)。
+ */
+public class D10028Service extends D10028BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“报警设置查询”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		String stype =this.getA_d10028().getStype();
+		DThresholdMapper dTMapper = UtilTools.getBean(DThresholdMapper.class);
+		DThresholdSQLBuilder sb = new DThresholdSQLBuilder();
+		DThresholdSQLBuilder.Criteria sc = sb.createCriteria();
+		sc.andStypeEqualTo(stype);
+
+		List<DThreshold> dtList =dTMapper.selectByExample(sb);
+		List<D_D10028_ROWS_RECODE> rows =new ArrayList<>();
+		for (DThreshold dt :dtList
+			 ) {
+			D_D10028_ROWS_RECODE row =new D_D10028_ROWS_RECODE();
+			row.setId(dt.getId());
+			row.setGrade(dt.getGrade());
+			row.setCo2(dt.getCo2());
+			row.setHeight(dt.getHeight());
+			row.setSo2(dt.getSo2());
+			row.setStype(dt.getStype());
+			row.setCh4(dt.getCh4());
+			row.setTemperature(dt.getTemperature());
+			rows.add(row);
+		}
+		this.getD_d10028().setRows(rows);
+	}
+	
+	/**
+	 * 基础系统,“报警设置查询”业务前处理
+ 	 */
+	public void preTransFlow() throws Exception {
+		this.validater();
+	}
+	
+	/**
+	 * 基础系统,“报警设置查询”业务后处理
+ 	 */
+	public void afterTransFlow() throws Exception {
+	
+	}
+	
+	/**
+	 * 基础系统,“报警设置查询”逻辑入口处理方法
+ 	 */
+ 	@SuppressWarnings("rawtypes")
+	@Override
+	public Map execute(Map vars) throws Exception {
+		this.setTransMap(vars);
+		preTransFlow();// 执行业务开始的规则检查和校验
+		transExecute();// 执行核心业务段
+		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
+		return this.getTransMap();
+	}
+
+}

+ 63 - 0
src/main/java/com/miniframe/bisiness/system/D10029Service.java

@@ -0,0 +1,63 @@
+package com.miniframe.bisiness.system;
+
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.exception.BusinessException;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.system.model.D10029BaseModel;
+import com.miniframe.model.system.DThreshold;
+import com.miniframe.model.system.dao.DThresholdMapper;
+
+/**
+ * 基础系统,“报警设置修改”逻辑处理(重新生成不覆盖)。
+ */
+public class D10029Service extends D10029BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“报警设置修改”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		Integer id = this.getA_d10029().getId();
+		DThresholdMapper dTMapper = UtilTools.getBean(DThresholdMapper.class);
+		DThreshold dt =dTMapper.selectByPrimaryKey(id);
+		if(dt ==null){
+			throw  new BusinessException("EB3100028");
+		}
+		dt.setHeight(this.getA_d10029().getHeight());
+		dt.setCh4(this.getA_d10029().getCh4());
+		dt.setCo2(this.getA_d10029().getCo2());
+		dt.setSo2(this.getA_d10029().getSo2());
+		dt.setTemperature(this.getA_d10029().getTemperature());
+		dTMapper.updateByPrimaryKey(dt);
+	}
+	
+	/**
+	 * 基础系统,“报警设置修改”业务前处理
+ 	 */
+	public void preTransFlow() throws Exception {
+		this.validater();
+	}
+	
+	/**
+	 * 基础系统,“报警设置修改”业务后处理
+ 	 */
+	public void afterTransFlow() throws Exception {
+	
+	}
+	
+	/**
+	 * 基础系统,“报警设置修改”逻辑入口处理方法
+ 	 */
+ 	@SuppressWarnings("rawtypes")
+	@Override
+	public Map execute(Map vars) throws Exception {
+		this.setTransMap(vars);
+		preTransFlow();// 执行业务开始的规则检查和校验
+		transExecute();// 执行核心业务段
+		afterTransFlow();// 执行核心逻辑完成后的收尾逻辑
+		return this.getTransMap();
+	}
+
+}

+ 23 - 0
src/main/java/com/miniframe/dbtransfer/DThresholdDbTransfer.java

@@ -0,0 +1,23 @@
+package com.miniframe.dbtransfer;
+
+import com.miniframe.core.DbTransfer;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import com.miniframe.model.system.DThreshold;
+
+/**
+ * 实体列表,“D_THRESHOLD”数据库数据转化逻辑处理(重新生成不覆盖)。
+ */
+public class DThresholdDbTransfer extends DbTransfer implements Serializable {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+
+	@Override
+	public List transfer(final List l,Map map) throws Exception{
+		List<DThreshold> list=l;
+		return list;
+	};
+
+}

+ 44 - 0
src/test/java/com/miniframe/comm/httpclientapater/D10028Test.java

@@ -0,0 +1,44 @@
+package com.miniframe.comm.httpclientapater;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.miniframe.comm.httpclientapater.HttpclientapaterUtil;
+import com.miniframe.generate.comm.system.A_D10028;
+import com.miniframe.generate.comm.httpclientapater.D10028Client;
+import com.miniframe.generate.business.system.model.D10028BaseModel;
+
+public class D10028Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10028Test.class);
+
+	/**
+	 * 报警设置查询,获取报文体
+	 * @return
+	 */
+	public static A_D10028 getA_d10028() {
+		A_D10028 a_d10028 = new A_D10028();
+
+		// ----------以下增加【报警设置查询】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_d10028;
+	}
+	
+	/**
+	 * 运行客户端测试,报警设置查询
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		D10028BaseModel model = new D10028BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("D10028"));
+		model.setA_d10028(D10028Test.getA_d10028());
+		D10028Client client = new D10028Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

+ 44 - 0
src/test/java/com/miniframe/comm/httpclientapater/D10029Test.java

@@ -0,0 +1,44 @@
+package com.miniframe.comm.httpclientapater;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.miniframe.comm.httpclientapater.HttpclientapaterUtil;
+import com.miniframe.generate.comm.system.A_D10029;
+import com.miniframe.generate.comm.httpclientapater.D10029Client;
+import com.miniframe.generate.business.system.model.D10029BaseModel;
+
+public class D10029Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10029Test.class);
+
+	/**
+	 * 报警设置修改,获取报文体
+	 * @return
+	 */
+	public static A_D10029 getA_d10029() {
+		A_D10029 a_d10029 = new A_D10029();
+
+		// ----------以下增加【报警设置修改】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_d10029;
+	}
+	
+	/**
+	 * 运行客户端测试,报警设置修改
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		D10029BaseModel model = new D10029BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("D10029"));
+		model.setA_d10029(D10029Test.getA_d10029());
+		D10029Client client = new D10029Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

+ 2 - 1
系统设计/实体Bean/system(实体列表).csv

@@ -28,4 +28,5 @@
 24,D_GAS_GATHER_AREA,瓦斯积聚区,FALSE,
 25,D_GAS,瓦斯灾源,FALSE,
 26,D_CHECKNODE_VALCODE,监测点求解结果code,FALSE,
-26,D_CHECKNODE_VAL,监测点求解结果val,FALSE,
+26,D_CHECKNODE_VAL,监测点求解结果val,FALSE,
+27,D_THRESHOLD,报警设置,FALSE,

+ 2 - 1
系统设计/数据定义/返 回 码/business(业务系统).csv

@@ -96,4 +96,5 @@
 3100025,EB3100025,边界文件格式错误!,
 3100026,EB3100026,监测点结果数据不存在!,
 
-3100027,EB3100027,求解未完成!,
+3100027,EB3100027,求解未完成!,
+3100028,EB3100028,报警不存在!,

+ 2 - 0
系统设计/系统模块/SYSTEM(基础系统).csv

@@ -73,3 +73,5 @@
 310010,D10026,瓦斯积聚区查询,service,,
 310011,D10027,瓦斯积聚区修改,service,,
 
+310012,D10028,报警设置查询,service,,
+310013,D10029,报警设置修改,service,,

+ 2 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10028_A(报警设置查询).csv

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

+ 10 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10028_D(报警设置查询).csv

@@ -0,0 +1,10 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,rows,数据,list,,,,0,,,,,,,
+1.1,id,设置ID,int,,,,,,,,,,,
+1.2,grade,等级,int,,,,,,,,,,,
+1.3,stype,灾害类型,string,,,,,,,,,,,
+1.4,height,水位,string,,,,,,,,,,,
+1.5,temperature,温度,string,,,,,,,,,,,
+1.6,co2,二氧化碳浓度,string,,,,,,,,,,,
+1.7,ch4,ch4浓度,string,,,,,,,,,,,
+1.8,so2,so2浓度,string,,,,,,,,,,,

+ 7 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10029_A(报警设置修改).csv

@@ -0,0 +1,7 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,id,设置ID,int,,,是,,,,,,,,
+2,height,水位,string,,,,,,,,,,,
+3,temperature,温度,string,,,,,,,,,,,
+4,co2,二氧化碳浓度,string,,,,,,,,,,,
+5,ch4,ch4浓度,string,,,,,,,,,,,
+6,so2,so2浓度,string,,,,,,,,,,,

+ 1 - 0
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10029_D(报警设置修改).csv

@@ -0,0 +1 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA