一维瓦斯爆炸

dbscript/init/generate/03-functionInit.sql

@@ -90,6 +90,10 @@ INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D2
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D20010', '基础系统','风门查询',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D20011', '基础系统','风门添加修改',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D20012', '基础系统','风门删除',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D20013', '基础系统','报表下载',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D30001', '基础系统','一维瓦斯灾源查询',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D30002', '基础系统','一维瓦斯灾源添加修改',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D30003', '基础系统','一维瓦斯灾源删除',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('M00001', '基础系统','平台对接事故数据',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('M00002', '基础系统','平台对接预设路径',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('M00003', '基础系统','平台对接求解状态',true);

generated/com/miniframe/generate/business/system/model/D20013BaseModel.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_D20013;
+import com.miniframe.generate.comm.system.D_D20013;
+
+/**
+ * 系统服务,“报表下载”模型类（不要维护，重新生成将覆盖）。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class D20013BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_D20013 a_d20013;//上行体
+	D_D20013 d_d20013;//下行体
+
+	public D20013BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_d20013=new A_D20013();
+		d_d20013=new D_D20013();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_d20013.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_D20013.class);
+		this.a_d20013 = UtilTools.map2Obj(bodyMap, A_D20013.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_d20013));
+
+		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_D20013 getA_d20013() {
+		return a_d20013;
+	}
+
+	public void setA_d20013(A_D20013 a_d20013) {
+		this.a_d20013=a_d20013;
+	}
+
+	public D_D20013 getD_d20013() {
+		return this.d_d20013;
+	}
+
+	public void setD_d20013(D_D20013 d_d20013) {
+		this.d_d20013=d_d20013;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

generated/com/miniframe/generate/business/system/model/D30001BaseModel.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_D30001;
+import com.miniframe.generate.comm.system.D_D30001;
+
+/**
+ * 系统服务,“一维瓦斯灾源查询”模型类（不要维护，重新生成将覆盖）。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class D30001BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_D30001 a_d30001;//上行体
+	D_D30001 d_d30001;//下行体
+
+	public D30001BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_d30001=new A_D30001();
+		d_d30001=new D_D30001();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_d30001.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_D30001.class);
+		this.a_d30001 = UtilTools.map2Obj(bodyMap, A_D30001.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_d30001));
+
+		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_D30001 getA_d30001() {
+		return a_d30001;
+	}
+
+	public void setA_d30001(A_D30001 a_d30001) {
+		this.a_d30001=a_d30001;
+	}
+
+	public D_D30001 getD_d30001() {
+		return this.d_d30001;
+	}
+
+	public void setD_d30001(D_D30001 d_d30001) {
+		this.d_d30001=d_d30001;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

generated/com/miniframe/generate/business/system/model/D30002BaseModel.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_D30002;
+import com.miniframe.generate.comm.system.D_D30002;
+
+/**
+ * 系统服务,“一维瓦斯灾源添加修改”模型类（不要维护，重新生成将覆盖）。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class D30002BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_D30002 a_d30002;//上行体
+	D_D30002 d_d30002;//下行体
+
+	public D30002BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_d30002=new A_D30002();
+		d_d30002=new D_D30002();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_d30002.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_D30002.class);
+		this.a_d30002 = UtilTools.map2Obj(bodyMap, A_D30002.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_d30002));
+
+		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_D30002 getA_d30002() {
+		return a_d30002;
+	}
+
+	public void setA_d30002(A_D30002 a_d30002) {
+		this.a_d30002=a_d30002;
+	}
+
+	public D_D30002 getD_d30002() {
+		return this.d_d30002;
+	}
+
+	public void setD_d30002(D_D30002 d_d30002) {
+		this.d_d30002=d_d30002;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

generated/com/miniframe/generate/business/system/model/D30003BaseModel.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_D30003;
+import com.miniframe.generate.comm.system.D_D30003;
+
+/**
+ * 系统服务,“一维瓦斯灾源删除”模型类（不要维护，重新生成将覆盖）。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class D30003BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_D30003 a_d30003;//上行体
+	D_D30003 d_d30003;//下行体
+
+	public D30003BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_d30003=new A_D30003();
+		d_d30003=new D_D30003();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_d30003.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_D30003.class);
+		this.a_d30003 = UtilTools.map2Obj(bodyMap, A_D30003.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_d30003));
+
+		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_D30003 getA_d30003() {
+		return a_d30003;
+	}
+
+	public void setA_d30003(A_D30003 a_d30003) {
+		this.a_d30003=a_d30003;
+	}
+
+	public D_D30003 getD_d30003() {
+		return this.d_d30003;
+	}
+
+	public void setD_d30003(D_D30003 d_d30003) {
+		this.d_d30003=d_d30003;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

generated/com/miniframe/generate/comm/httpclientapater/D20013Client.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_D20013;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.D20013BaseModel;
+
+public class D20013Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(D20013Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->报表下载((D20013)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D20013BaseModel execute(D20013BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D20013BaseModel execute(D20013BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(D20013BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D20013BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("D20013");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_d20013()));
+		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_D20013 d_d20013 =  UtilTools.map2Obj(outMap, D_D20013.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_d20013(d_d20013);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D20013BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D20013BaseModel execute(D20013BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

generated/com/miniframe/generate/comm/httpclientapater/D30001Client.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_D30001;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.D30001BaseModel;
+
+public class D30001Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(D30001Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->一维瓦斯灾源查询((D30001)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D30001BaseModel execute(D30001BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D30001BaseModel execute(D30001BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(D30001BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D30001BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("D30001");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_d30001()));
+		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_D30001 d_d30001 =  UtilTools.map2Obj(outMap, D_D30001.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_d30001(d_d30001);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D30001BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D30001BaseModel execute(D30001BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

generated/com/miniframe/generate/comm/httpclientapater/D30002Client.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_D30002;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.D30002BaseModel;
+
+public class D30002Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(D30002Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->一维瓦斯灾源添加修改((D30002)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D30002BaseModel execute(D30002BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D30002BaseModel execute(D30002BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(D30002BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D30002BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("D30002");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_d30002()));
+		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_D30002 d_d30002 =  UtilTools.map2Obj(outMap, D_D30002.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_d30002(d_d30002);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D30002BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D30002BaseModel execute(D30002BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

generated/com/miniframe/generate/comm/httpclientapater/D30003Client.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_D30003;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.D30003BaseModel;
+
+public class D30003Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(D30003Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->一维瓦斯灾源删除((D30003)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D30003BaseModel execute(D30003BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D30003BaseModel execute(D30003BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(D30003BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D30003BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("D30003");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_d30003()));
+		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_D30003 d_d30003 =  UtilTools.map2Obj(outMap, D_D30003.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_d30003(d_d30003);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D30003BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D30003BaseModel execute(D30003BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

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

@@ -0,0 +1,25 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 报表下载
+ */
+public class A_D20013 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	int aid;//事故ID
+	/**
+	 *事故ID
+	 */
+	public void setAid(int aid) {
+		this.aid=aid;
+	}
+	/**
+	 *事故ID
+	 */
+	public int getAid() {
+		return this.aid;
+	}
+}

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

@@ -0,0 +1,25 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 一维瓦斯灾源查询
+ */
+public class A_D30001 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	int aid;//事故ID
+	/**
+	 *事故ID
+	 */
+	public void setAid(int aid) {
+		this.aid=aid;
+	}
+	/**
+	 *事故ID
+	 */
+	public int getAid() {
+		return this.aid;
+	}
+}

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

@@ -0,0 +1,77 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 一维瓦斯灾源添加修改
+ */
+public class A_D30002 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	int aid;//事故
+	/**
+	 *事故
+	 */
+	public void setAid(int aid) {
+		this.aid=aid;
+	}
+	/**
+	 *事故
+	 */
+	public int getAid() {
+		return this.aid;
+	}
+	int pid;//巷道ID
+	/**
+	 *巷道ID
+	 */
+	public void setPid(int pid) {
+		this.pid=pid;
+	}
+	/**
+	 *巷道ID
+	 */
+	public int getPid() {
+		return this.pid;
+	}
+	double ssite;//开始位置
+	/**
+	 *开始位置
+	 */
+	public void setSsite(double ssite) {
+		this.ssite=ssite;
+	}
+	/**
+	 *开始位置
+	 */
+	public double getSsite() {
+		return this.ssite;
+	}
+	double esite;//结束位置
+	/**
+	 *结束位置
+	 */
+	public void setEsite(double esite) {
+		this.esite=esite;
+	}
+	/**
+	 *结束位置
+	 */
+	public double getEsite() {
+		return this.esite;
+	}
+	double gasdensity;//瓦斯爆炸区浓度
+	/**
+	 *瓦斯爆炸区浓度
+	 */
+	public void setGasdensity(double gasdensity) {
+		this.gasdensity=gasdensity;
+	}
+	/**
+	 *瓦斯爆炸区浓度
+	 */
+	public double getGasdensity() {
+		return this.gasdensity;
+	}
+}

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

@@ -0,0 +1,25 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 一维瓦斯灾源删除
+ */
+public class A_D30003 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	int gid;//瓦斯灾情源id
+	/**
+	 *瓦斯灾情源id
+	 */
+	public void setGid(int gid) {
+		this.gid=gid;
+	}
+	/**
+	 *瓦斯灾情源id
+	 */
+	public int getGid() {
+		return this.gid;
+	}
+}

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

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

generated/com/miniframe/generate/comm/system/D_D30001.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_D30001 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	List <D_D30001_ROW_RECODE> row;//数据
+	/**
+	 *数据
+	 */
+	public void setRow(List <D_D30001_ROW_RECODE> row) {
+		this.row=row;
+	}
+	/**
+	 *数据
+	 */
+	public List <D_D30001_ROW_RECODE> getRow() {
+		return this.row;
+	}
+}

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

@@ -0,0 +1,116 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 一维瓦斯灾源查询->数据
+ */
+public class D_D30001_ROW_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	int gid;//瓦斯灾情源id
+	/**
+	 *瓦斯灾情源id
+	 */
+	public void setGid(int gid) {
+		this.gid=gid;
+	}
+	/**
+	 *瓦斯灾情源id
+	 */
+	public int getGid() {
+		return this.gid;
+	}
+	int aid;//事故
+	/**
+	 *事故
+	 */
+	public void setAid(int aid) {
+		this.aid=aid;
+	}
+	/**
+	 *事故
+	 */
+	public int getAid() {
+		return this.aid;
+	}
+	int pid;//巷道ID
+	/**
+	 *巷道ID
+	 */
+	public void setPid(int pid) {
+		this.pid=pid;
+	}
+	/**
+	 *巷道ID
+	 */
+	public int getPid() {
+		return this.pid;
+	}
+	String pname;//巷道名称
+	/**
+	 *巷道名称
+	 */
+	public void setPname(String pname) {
+		this.pname=pname;
+	}
+	/**
+	 *巷道名称
+	 */
+	public String getPname() {
+		return this.pname;
+	}
+	String pcode;//巷道编号
+	/**
+	 *巷道编号
+	 */
+	public void setPcode(String pcode) {
+		this.pcode=pcode;
+	}
+	/**
+	 *巷道编号
+	 */
+	public String getPcode() {
+		return this.pcode;
+	}
+	double ssite;//开始位置
+	/**
+	 *开始位置
+	 */
+	public void setSsite(double ssite) {
+		this.ssite=ssite;
+	}
+	/**
+	 *开始位置
+	 */
+	public double getSsite() {
+		return this.ssite;
+	}
+	double esite;//结束位置
+	/**
+	 *结束位置
+	 */
+	public void setEsite(double esite) {
+		this.esite=esite;
+	}
+	/**
+	 *结束位置
+	 */
+	public double getEsite() {
+		return this.esite;
+	}
+	double gasdensity;//瓦斯爆炸区浓度
+	/**
+	 *瓦斯爆炸区浓度
+	 */
+	public void setGasdensity(double gasdensity) {
+		this.gasdensity=gasdensity;
+	}
+	/**
+	 *瓦斯爆炸区浓度
+	 */
+	public double getGasdensity() {
+		return this.gasdensity;
+	}
+}

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

@@ -0,0 +1,12 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 一维瓦斯灾源添加修改
+ */
+public class D_D30002 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+}

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

@@ -0,0 +1,12 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 一维瓦斯灾源删除
+ */
+public class D_D30003 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+}

generated/validateform/a_d20013Form.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_d20013Form">
+<field property="aid" depends="required">
+    <arg0 key="a_d20013.aid"/>
+</field>
+</form>
+</formset>
+</form-validation>

generated/validateform/a_d30001Form.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_d30001Form">
+<field property="aid" depends="required">
+    <arg0 key="a_d30001.aid"/>
+</field>
+</form>
+</formset>
+</form-validation>

generated/validateform/a_d30002Form.xml

@@ -0,0 +1,24 @@
+<?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_d30002Form">
+<field property="aid" depends="required">
+    <arg0 key="a_d30002.aid"/>
+</field>
+<field property="pid" depends="required">
+    <arg0 key="a_d30002.pid"/>
+</field>
+<field property="ssite" depends="required">
+    <arg0 key="a_d30002.ssite"/>
+</field>
+<field property="esite" depends="required">
+    <arg0 key="a_d30002.esite"/>
+</field>
+<field property="gasdensity" depends="required">
+    <arg0 key="a_d30002.gasdensity"/>
+</field>
+</form>
+</formset>
+</form-validation>

generated/validateform/a_d30003Form.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_d30003Form">
+<field property="gid" depends="required">
+    <arg0 key="a_d30003.gid"/>
+</field>
+</form>
+</formset>
+</form-validation>

generated/validator/resources_a_d20013Form_validator.properties

@@ -0,0 +1,2 @@
+a_d20013.aid = \u4E8B\u6545ID
+a_d20013Form = true

generated/validator/resources_a_d20013Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+a_d20013.aid = \u4E8B\u6545ID
+a_d20013Form = true

generated/validator/resources_a_d30001Form_validator.properties

@@ -0,0 +1,2 @@
+a_d30001.aid = \u4E8B\u6545ID
+a_d30001Form = true

generated/validator/resources_a_d30001Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+a_d30001.aid = \u4E8B\u6545ID
+a_d30001Form = true

generated/validator/resources_a_d30002Form_validator.properties

@@ -0,0 +1,6 @@
+a_d30002.aid = \u4E8B\u6545
+a_d30002.pid = \u5DF7\u9053ID
+a_d30002.ssite = \u5F00\u59CB\u4F4D\u7F6E
+a_d30002.esite = \u7ED3\u675F\u4F4D\u7F6E
+a_d30002.gasdensity = \u74E6\u65AF\u7206\u70B8\u533A\u6D53\u5EA6
+a_d30002Form = true

generated/validator/resources_a_d30002Form_validator_zh_CN.properties

@@ -0,0 +1,6 @@
+a_d30002.aid = \u4E8B\u6545
+a_d30002.pid = \u5DF7\u9053ID
+a_d30002.ssite = \u5F00\u59CB\u4F4D\u7F6E
+a_d30002.esite = \u7ED3\u675F\u4F4D\u7F6E
+a_d30002.gasdensity = \u74E6\u65AF\u7206\u70B8\u533A\u6D53\u5EA6
+a_d30002Form = true

generated/validator/resources_a_d30003Form_validator.properties

@@ -0,0 +1,2 @@
+a_d30003.gid = \u74E6\u65AF\u707E\u60C5\u6E90id
+a_d30003Form = true

generated/validator/resources_a_d30003Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+a_d30003.gid = \u74E6\u65AF\u707E\u60C5\u6E90id
+a_d30003Form = true

generated/validator/resources_d_d20013Form_validator.properties

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

generated/validator/resources_d_d20013Form_validator_zh_CN.properties

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

generated/validator/resources_d_d30001Form_validator.properties

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

generated/validator/resources_d_d30001Form_validator_zh_CN.properties

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

generated/validator/resources_d_d30001_row_recodeForm_validator.properties

@@ -0,0 +1,9 @@
+d_d30001_row_recode.gid = \u74E6\u65AF\u707E\u60C5\u6E90id
+d_d30001_row_recode.aid = \u4E8B\u6545
+d_d30001_row_recode.pid = \u5DF7\u9053ID
+d_d30001_row_recode.pname = \u5DF7\u9053\u540D\u79F0
+d_d30001_row_recode.pcode = \u5DF7\u9053\u7F16\u53F7
+d_d30001_row_recode.ssite = \u5F00\u59CB\u4F4D\u7F6E
+d_d30001_row_recode.esite = \u7ED3\u675F\u4F4D\u7F6E
+d_d30001_row_recode.gasdensity = \u74E6\u65AF\u7206\u70B8\u533A\u6D53\u5EA6
+d_d30001_row_recodeForm = true

generated/validator/resources_d_d30001_row_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,9 @@
+d_d30001_row_recode.gid = \u74E6\u65AF\u707E\u60C5\u6E90id
+d_d30001_row_recode.aid = \u4E8B\u6545
+d_d30001_row_recode.pid = \u5DF7\u9053ID
+d_d30001_row_recode.pname = \u5DF7\u9053\u540D\u79F0
+d_d30001_row_recode.pcode = \u5DF7\u9053\u7F16\u53F7
+d_d30001_row_recode.ssite = \u5F00\u59CB\u4F4D\u7F6E
+d_d30001_row_recode.esite = \u7ED3\u675F\u4F4D\u7F6E
+d_d30001_row_recode.gasdensity = \u74E6\u65AF\u7206\u70B8\u533A\u6D53\u5EA6
+d_d30001_row_recodeForm = true

generated/validator/resources_d_d30002Form_validator.properties

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

generated/validator/resources_d_d30002Form_validator_zh_CN.properties

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

generated/validator/resources_d_d30003Form_validator.properties

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

generated/validator/resources_d_d30003Form_validator_zh_CN.properties

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

modelsrc/com/miniframe/model/system/DGas.java

@@ -40,6 +40,21 @@ public class DGas extends MiniserviceBaseModel implements Serializable {
 
     private String pcode;
 
+    /**
+     * 开始位置
+     */
+    private Float ssite;
+
+    /**
+     * 结束位置
+     */
+    private Float esite;
+
+    /**
+     * 瓦斯爆炸区浓度 一维
+     */
+    private Float gasdensity;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -187,4 +202,58 @@ public class DGas extends MiniserviceBaseModel implements Serializable {
     public void setPcode(String pcode) {
         this.pcode = pcode == null ? null : pcode.trim();
     }
+
+    /**
+     * 获取开始位置
+     *
+     * @return ssite - 开始位置
+     */
+    public Float getSsite() {
+        return ssite;
+    }
+
+    /**
+     * 设置开始位置
+     *
+     * @param ssite 开始位置
+     */
+    public void setSsite(Float ssite) {
+        this.ssite = ssite;
+    }
+
+    /**
+     * 获取结束位置
+     *
+     * @return esite - 结束位置
+     */
+    public Float getEsite() {
+        return esite;
+    }
+
+    /**
+     * 设置结束位置
+     *
+     * @param esite 结束位置
+     */
+    public void setEsite(Float esite) {
+        this.esite = esite;
+    }
+
+    /**
+     * 获取瓦斯爆炸区浓度 一维
+     *
+     * @return gasdensity - 瓦斯爆炸区浓度 一维
+     */
+    public Float getGasdensity() {
+        return gasdensity;
+    }
+
+    /**
+     * 设置瓦斯爆炸区浓度 一维
+     *
+     * @param gasdensity 瓦斯爆炸区浓度 一维
+     */
+    public void setGasdensity(Float gasdensity) {
+        this.gasdensity = gasdensity;
+    }
 }

modelsrc/com/miniframe/model/system/DGasSQLBuilder.java

@@ -703,6 +703,186 @@ public class DGasSQLBuilder {
             addCriterion("pcode not between", value1, value2, "pcode");
             return (Criteria) this;
         }
+
+        public Criteria andSsiteIsNull() {
+            addCriterion("ssite is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSsiteIsNotNull() {
+            addCriterion("ssite is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSsiteEqualTo(Float value) {
+            addCriterion("ssite =", value, "ssite");
+            return (Criteria) this;
+        }
+
+        public Criteria andSsiteNotEqualTo(Float value) {
+            addCriterion("ssite <>", value, "ssite");
+            return (Criteria) this;
+        }
+
+        public Criteria andSsiteGreaterThan(Float value) {
+            addCriterion("ssite >", value, "ssite");
+            return (Criteria) this;
+        }
+
+        public Criteria andSsiteGreaterThanOrEqualTo(Float value) {
+            addCriterion("ssite >=", value, "ssite");
+            return (Criteria) this;
+        }
+
+        public Criteria andSsiteLessThan(Float value) {
+            addCriterion("ssite <", value, "ssite");
+            return (Criteria) this;
+        }
+
+        public Criteria andSsiteLessThanOrEqualTo(Float value) {
+            addCriterion("ssite <=", value, "ssite");
+            return (Criteria) this;
+        }
+
+        public Criteria andSsiteIn(List<Float> values) {
+            addCriterion("ssite in", values, "ssite");
+            return (Criteria) this;
+        }
+
+        public Criteria andSsiteNotIn(List<Float> values) {
+            addCriterion("ssite not in", values, "ssite");
+            return (Criteria) this;
+        }
+
+        public Criteria andSsiteBetween(Float value1, Float value2) {
+            addCriterion("ssite between", value1, value2, "ssite");
+            return (Criteria) this;
+        }
+
+        public Criteria andSsiteNotBetween(Float value1, Float value2) {
+            addCriterion("ssite not between", value1, value2, "ssite");
+            return (Criteria) this;
+        }
+
+        public Criteria andEsiteIsNull() {
+            addCriterion("esite is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEsiteIsNotNull() {
+            addCriterion("esite is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEsiteEqualTo(Float value) {
+            addCriterion("esite =", value, "esite");
+            return (Criteria) this;
+        }
+
+        public Criteria andEsiteNotEqualTo(Float value) {
+            addCriterion("esite <>", value, "esite");
+            return (Criteria) this;
+        }
+
+        public Criteria andEsiteGreaterThan(Float value) {
+            addCriterion("esite >", value, "esite");
+            return (Criteria) this;
+        }
+
+        public Criteria andEsiteGreaterThanOrEqualTo(Float value) {
+            addCriterion("esite >=", value, "esite");
+            return (Criteria) this;
+        }
+
+        public Criteria andEsiteLessThan(Float value) {
+            addCriterion("esite <", value, "esite");
+            return (Criteria) this;
+        }
+
+        public Criteria andEsiteLessThanOrEqualTo(Float value) {
+            addCriterion("esite <=", value, "esite");
+            return (Criteria) this;
+        }
+
+        public Criteria andEsiteIn(List<Float> values) {
+            addCriterion("esite in", values, "esite");
+            return (Criteria) this;
+        }
+
+        public Criteria andEsiteNotIn(List<Float> values) {
+            addCriterion("esite not in", values, "esite");
+            return (Criteria) this;
+        }
+
+        public Criteria andEsiteBetween(Float value1, Float value2) {
+            addCriterion("esite between", value1, value2, "esite");
+            return (Criteria) this;
+        }
+
+        public Criteria andEsiteNotBetween(Float value1, Float value2) {
+            addCriterion("esite not between", value1, value2, "esite");
+            return (Criteria) this;
+        }
+
+        public Criteria andGasdensityIsNull() {
+            addCriterion("gasdensity is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGasdensityIsNotNull() {
+            addCriterion("gasdensity is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGasdensityEqualTo(Float value) {
+            addCriterion("gasdensity =", value, "gasdensity");
+            return (Criteria) this;
+        }
+
+        public Criteria andGasdensityNotEqualTo(Float value) {
+            addCriterion("gasdensity <>", value, "gasdensity");
+            return (Criteria) this;
+        }
+
+        public Criteria andGasdensityGreaterThan(Float value) {
+            addCriterion("gasdensity >", value, "gasdensity");
+            return (Criteria) this;
+        }
+
+        public Criteria andGasdensityGreaterThanOrEqualTo(Float value) {
+            addCriterion("gasdensity >=", value, "gasdensity");
+            return (Criteria) this;
+        }
+
+        public Criteria andGasdensityLessThan(Float value) {
+            addCriterion("gasdensity <", value, "gasdensity");
+            return (Criteria) this;
+        }
+
+        public Criteria andGasdensityLessThanOrEqualTo(Float value) {
+            addCriterion("gasdensity <=", value, "gasdensity");
+            return (Criteria) this;
+        }
+
+        public Criteria andGasdensityIn(List<Float> values) {
+            addCriterion("gasdensity in", values, "gasdensity");
+            return (Criteria) this;
+        }
+
+        public Criteria andGasdensityNotIn(List<Float> values) {
+            addCriterion("gasdensity not in", values, "gasdensity");
+            return (Criteria) this;
+        }
+
+        public Criteria andGasdensityBetween(Float value1, Float value2) {
+            addCriterion("gasdensity between", value1, value2, "gasdensity");
+            return (Criteria) this;
+        }
+
+        public Criteria andGasdensityNotBetween(Float value1, Float value2) {
+            addCriterion("gasdensity not between", value1, value2, "gasdensity");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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 Wed Dec 11 14:02:06 CST 2024.
+    This file was generated on Wed Dec 11 19:04:02 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

pom.xml

@@ -154,6 +154,12 @@
             <groupId>com.miniframe</groupId>
             <artifactId>miniframe-spring-boot-starter</artifactId>
             <version>2.1.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>poi</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -280,7 +286,29 @@
             <artifactId>freemarker</artifactId>
             <version>2.3.29</version>
         </dependency>
-
+        <!--报告生成-->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>5.2.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>5.2.2</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>poi</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

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

@@ -114,7 +114,33 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 			LogService.addLog(accident,"waterEscape.control配置生成——————————————————成功");
 			exeWater(aid,jid);
 		}
+		if(accident.getStype().equals("Gass1")) {//瓦斯爆炸一维
+			TemplateGenerator2.createGeometry(aid,jid);
+			TemplateGenerator2.createEscape(aid,jid);
+			TemplateGenerator2.createGassEsccapeControl(aid,jid);
+
+			DGasMapper gasMapper =UtilTools.getBean(DGasMapper.class);
+			DGasSQLBuilder gasSb = new DGasSQLBuilder();
+			DGasSQLBuilder.Criteria gasSc = gasSb.createCriteria();
+			gasSc.andAidEqualTo(aid);
+			List<DGas> gases =gasMapper.selectByExample(gasSb);
+			if(gases.isEmpty()){
+				throw  new BusinessException("EB3000004");
+			}
+			DGas gas =gases.get(0);
+
+			/**
+			 * 一维文件生成
+			 */
+			TemplateGenerator.createGas1Init(aid,jid,gas.getId());
+			TemplateGenerator.createGass1Runsh(aid,jid);
+			TemplateGenerator.createGas1Control(aid,jid,totaltime,dt,dx,reportstep,interactionstep,cocodes);
+
 
+			//执行文件
+			exeGass(aid,jid);
+
+		}
 		if(accident.getStype().equals("Gass")){//瓦斯爆炸
 			TemplateGenerator2.createGeometry(aid,jid);
 			TemplateGenerator2.createEscape(aid,jid);
@@ -481,7 +507,39 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 		});
 
 	}
+	//异步执行
+	@SneakyThrows
+	public void exeGass1(Integer aid, Integer jid) throws Exception{
+
+		CompletableFuture<Void> cf = CompletableFuture.supplyAsync(()->{
+			try {
+				Runtime runtime = Runtime.getRuntime();
+				Process p =null;
+				LogService.addLog(aid,jid,"Gass1","求解——————————————————开始");
+				p= runtime.exec("sh "+TemplateGenerator.BPATH + "/" + aid + "/" + jid + "/" + "/gas" + "/run.sh");
+				InputStream fis = p.getInputStream();
+				InputStreamReader isr = new InputStreamReader(fis);
+				BufferedReader br = new BufferedReader(isr);
+				String line = null;
+				while ((line = br.readLine()) != null) {
+					LogService.addLog(aid,jid,"Gass1",line);
+					System.out.println(line);
+				}
+				//监测点数据保存
+				saveMonitorValue(aid,jid);
+				//路径保存
+				saveWayValue(aid,jid);
+				LogService.addLog(aid,jid,"Gass1","求解——————————————————成功");
+				JobSucces(jid);
+			} catch (IOException | BusinessException e) {
+				LogService.addLog(aid,jid,"Gass1","求解——————————————————失败");
+				e.printStackTrace();
+				JobError(jid);
+			}
+			return null;
+		});
 
+	}
 	//异步执行
 	@SneakyThrows
 	public void exeGass(Integer aid, Integer jid) throws Exception{
@@ -490,24 +548,24 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 			try {
 				Runtime runtime = Runtime.getRuntime();
 				Process p =null;
-				LogService.addLog(aid,jid,"Gass","求解——————————————————开始");
+				LogService.addLog(aid,jid,"gas","求解——————————————————开始");
 				p= runtime.exec("sh "+TemplateGenerator.BPATH + "/" + aid + "/" + jid + "/" + "/gas" + "/run.sh");
 				InputStream fis = p.getInputStream();
 				InputStreamReader isr = new InputStreamReader(fis);
 				BufferedReader br = new BufferedReader(isr);
 				String line = null;
 				while ((line = br.readLine()) != null) {
-					LogService.addLog(aid,jid,"Gass",line);
+					LogService.addLog(aid,jid,"gas",line);
 					System.out.println(line);
 				}
 				//监测点数据保存
 				saveMonitorValue(aid,jid);
 				//路径保存
 				saveWayValue(aid,jid);
-				LogService.addLog(aid,jid,"Gass","求解——————————————————成功");
+				LogService.addLog(aid,jid,"gas","求解——————————————————成功");
 				JobSucces(jid);
 			} catch (IOException | BusinessException e) {
-				LogService.addLog(aid,jid,"Fire","求解——————————————————失败");
+				LogService.addLog(aid,jid,"gas","求解——————————————————失败");
 				e.printStackTrace();
 				JobError(jid);
 			}

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

@@ -28,6 +28,7 @@ public class D20004Service extends D20004BaseModel implements ExecProcessFlow {
 		DPumpHfSQLBuilder sb= new DPumpHfSQLBuilder();
 		DPumpHfSQLBuilder.Criteria sc = sb.createCriteria();
 		sc.andPumpidEqualTo(pumpid);
+		sb.setOrderByClause("hight");
 		List<DPumpHf> hfs = hfDao.selectByExample(sb);
 		List<D_D20004_ROWS_RECODE> rows =new ArrayList<>();
 		for (DPumpHf hf :hfs) {

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

@@ -0,0 +1,56 @@
+package com.miniframe.bisiness.system;
+
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.system.model.D20013BaseModel;
+import com.miniframe.httpserver.HttpServerTransFile;
+import com.miniframe.template.word.WordReport;
+
+/**
+ * 基础系统,“报表下载”逻辑处理（重新生成不覆盖）。
+ */
+public class D20013Service extends D20013BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“报表下载”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		WordReport.testAnimal((out));
+		HttpServerTransFile transFile = new HttpServerTransFile("报告.docx",".docx", out);
+		UtilTools.setHttpServerTransFile(transFile);
+	}
+	
+	/**
+	 * 基础系统,“报表下载”业务前处理
+ 	 */
+	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();
+	}
+
+}

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

@@ -0,0 +1,84 @@
+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.D30001BaseModel;
+import com.miniframe.generate.comm.system.D_D30001;
+import com.miniframe.generate.comm.system.D_D30001_ROW_RECODE;
+import com.miniframe.model.system.DAccident;
+import com.miniframe.model.system.DGas;
+import com.miniframe.model.system.DGasSQLBuilder;
+import com.miniframe.model.system.dao.DAccidentMapper;
+import com.miniframe.model.system.dao.DGasMapper;
+import com.miniframe.tools.CommonUtils;
+
+/**
+ * 基础系统,“一维瓦斯灾源查询”逻辑处理（重新生成不覆盖）。
+ */
+public class D30001Service extends D30001BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“一维瓦斯灾源查询”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		Integer aid =this.getA_d30001().getAid();
+		DAccidentMapper acDao =UtilTools.getBean(DAccidentMapper.class);
+		DAccident a =acDao.selectByPrimaryKey(aid);
+		if(!a.getStype().equals("Gass1")){
+			return;
+		}
+		DGasMapper gDao = UtilTools.getBean(DGasMapper.class);
+		DGasSQLBuilder sb = new DGasSQLBuilder();
+		DGasSQLBuilder.Criteria sc =sb.createCriteria();
+		sc.andAidEqualTo(aid);
+		List<DGas> glist = gDao.selectByExample(sb);
+		List<D_D30001_ROW_RECODE> rows =new ArrayList<>();
+		if(!glist.isEmpty()){
+			DGas g =glist.get(0);
+			D_D30001_ROW_RECODE d =new D_D30001_ROW_RECODE();
+			d.setAid(g.getAid());
+			d.setEsite(CommonUtils.floatTodobule(g.getEsite()));
+			d.setGasdensity(CommonUtils.floatTodobule(g.getGasdensity()));
+			d.setGid(g.getId());
+			d.setPcode(g.getPcode());
+			d.setPid(g.getPid());
+			d.setPname(g.getPname());
+			d.setSsite(CommonUtils.floatTodobule(g.getSsite()));
+			rows.add(d);
+		}
+		this.getD_d30001().setRow(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();
+	}
+
+}

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

@@ -0,0 +1,93 @@
+package com.miniframe.bisiness.system;
+
+import java.util.List;
+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.D30002BaseModel;
+import com.miniframe.model.system.DGas;
+import com.miniframe.model.system.DGasSQLBuilder;
+import com.miniframe.model.system.DPipe;
+import com.miniframe.model.system.dao.DGasMapper;
+import com.miniframe.model.system.dao.DPipeMapper;
+
+/**
+ * 基础系统,“一维瓦斯灾源添加修改”逻辑处理（重新生成不覆盖）。
+ */
+public class D30002Service extends D30002BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“一维瓦斯灾源添加修改”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		Integer aid =this.getA_d30002().getAid();
+		Integer pid =this.getA_d30002().getPid();
+		Double ssite =this.getA_d30002().getSsite();
+		Double esite =this.getA_d30002().getEsite();
+		Double gasdensity=this.getA_d30002().getGasdensity();
+
+		DPipeMapper pipDao =UtilTools.getBean(DPipeMapper.class);
+		DPipe pipe = pipDao.selectByPrimaryKey(pid);
+		if(pipe==null){
+			throw new BusinessException("EB3100015");
+		}
+		DGasMapper gDao = UtilTools.getBean(DGasMapper.class);
+		DGasSQLBuilder sb = new DGasSQLBuilder();
+		DGasSQLBuilder.Criteria sc =sb.createCriteria();
+		sc.andAidEqualTo(aid);
+		List<DGas> glist = gDao.selectByExample(sb);
+		if(glist.isEmpty()){//添加
+			DGas g= new DGas();
+			g.setPid(pid);
+			g.setPname(pipe.getName());
+			g.setPcode(pipe.getCode());
+			g.setAid(aid);
+			g.setSsite(ssite.floatValue());
+			g.setEsite(esite.floatValue());
+			g.setGasdensity(gasdensity.floatValue());
+			gDao.insertSelective(g);
+
+		}else{//修改
+			DGas g =glist.get(0);
+			g.setPid(pid);
+			g.setPname(pipe.getName());
+			g.setPcode(pipe.getCode());
+			g.setAid(aid);
+			g.setSsite(ssite.floatValue());
+			g.setEsite(esite.floatValue());
+			g.setGasdensity(gasdensity.floatValue());
+			gDao.updateByPrimaryKey(g);
+		}
+	}
+	
+	/**
+	 * 基础系统,“一维瓦斯灾源添加修改”业务前处理
+ 	 */
+	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();
+	}
+
+}

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

@@ -0,0 +1,52 @@
+package com.miniframe.bisiness.system;
+
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.system.model.D30003BaseModel;
+import com.miniframe.model.system.dao.DGasMapper;
+
+/**
+ * 基础系统,“一维瓦斯灾源删除”逻辑处理（重新生成不覆盖）。
+ */
+public class D30003Service extends D30003BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“一维瓦斯灾源删除”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		Integer gid =this.getA_d30003().getGid();
+		DGasMapper gDao = UtilTools.getBean(DGasMapper.class);
+		gDao.deleteByPrimaryKey(gid);
+	}
+	
+	/**
+	 * 基础系统,“一维瓦斯灾源删除”业务前处理
+ 	 */
+	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();
+	}
+
+}

src/main/java/com/miniframe/template/TemplateGenerator.java

@@ -565,5 +565,133 @@ public class TemplateGenerator {
         fileWriter.close();
 
 
+    }
+
+    public static void createGas1Control(Integer aid, Integer jid, String totaltime,
+                                        String dt, String dx, String reportstep, String interactionstep,
+                                        String cocodes) throws IOException, TemplateException {
+
+        Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
+        // 设置模板所在目录
+        cfg.setClassForTemplateLoading(TemplateGenerator.class, "/templates");
+        // 获取模板对象
+        Template template = cfg.getTemplate("mashGas1Control.ftl");
+        // 定义数据模型（Map）
+        Map<String, Object> dataModel = new HashMap<>();
+        //几何文件路径
+        dataModel.put("geoFilePath", BPATH + "/" + aid + "/" + jid + "/Geometry");
+        //fireinit 文件路径
+        dataModel.put("initFilePath", BPATH + "/" + aid + "/" + jid + "/gas" + "/" + "MashGas.init");
+        //midPath
+        dataModel.put("monitorPath", BPATH + "/" + aid + "/" + jid + "/monitor.in");
+        //midPath
+        dataModel.put("midPath", BPATH + "/" + aid + "/" + jid + "/gas" + "/" + "/mid");
+        //outPath
+        dataModel.put("outPath", BPATH + "/" + aid + "/" + jid + "/gas" + "/" +  "/out");
+        //CPUS
+        dataModel.put("cups", 4);
+        dataModel.put("totaltime", totaltime);
+        dataModel.put("dt", dt);
+        dataModel.put("dx", dx);
+        dataModel.put("reportstep", reportstep);
+        dataModel.put("interactionstep", interactionstep);
+
+        DBoundaryMapper dBoundaryMapper = UtilTools.getBean(DBoundaryMapper.class);
+        DBoundarySQLBuilder sb = new DBoundarySQLBuilder();
+        DBoundarySQLBuilder.Criteria sc = sb.createCriteria();
+        sc.andAidEqualTo(aid);
+        List<DBoundary> boundaries = dBoundaryMapper.selectByExample(sb);
+        //边界数量
+        dataModel.put("boundarynum", boundaries.size());
+        //TODO
+        dataModel.put("mashgasnumber", 1);
+
+
+        //物理量
+        if (StringUtil.isEmpty(cocodes)) {
+            dataModel.put("conNum", 0);
+            dataModel.put("cons", new ArrayList<>());
+        } else {
+            String[] codes = cocodes.split(",");
+            List<String> concodeList = new ArrayList<>();
+            for (String concode : codes
+            ) {
+                concodeList.add(concode);
+            }
+            DConMapper conMapper = UtilTools.getBean(DConMapper.class);
+            DConSQLBuilder consb = new DConSQLBuilder();
+            DConSQLBuilder.Criteria consc = consb.createCriteria();
+            consc.andCodeIn(concodeList);
+            List<DCon> cons = conMapper.selectByExample(consb);
+            dataModel.put("conNum", cons.size());
+            dataModel.put("cons", cons);
+        }
+
+        // 将数据模型传入模板进行处理
+        StringWriter writer = new StringWriter();
+        template.process(dataModel, writer);
+        mkGassDirs(aid, jid);
+
+        FileWriter fileWriter = new FileWriter(BPATH + "/" + aid + "/" + jid + "/" + "/gas" + "/MashGas.control");
+        fileWriter.write(writer.toString());
+        fileWriter.close();
+
+    }
+
+
+
+
+    public static void createGas1Init(Integer aid, Integer jid, Integer gid) throws IOException, TemplateException, BusinessException {
+
+        Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
+        // 设置模板所在目录
+        cfg.setClassForTemplateLoading(TemplateGenerator.class, "/templates");
+        // 获取模板对象
+        Template template = cfg.getTemplate("mashGas1Init.ftl");
+        // 定义数据模型（Map）
+        Map<String, Object> dataModel = new HashMap<>();
+
+        //边界
+        DBoundaryMapper dBoundaryMapper = UtilTools.getBean(DBoundaryMapper.class);
+        DBoundarySQLBuilder sb = new DBoundarySQLBuilder();
+        DBoundarySQLBuilder.Criteria sc = sb.createCriteria();
+        sc.andAidEqualTo(aid);
+        List<DBoundary> boundaries = dBoundaryMapper.selectByExample(sb);
+        dataModel.put("boundaries", boundaries);
+
+        DGasMapper gasMapper = UtilTools.getBean(DGasMapper.class);
+        DGas gas = gasMapper.selectByPrimaryKey(gid);
+        dataModel.put("b", gas);
+        // 将数据模型传入模板进行处理
+        StringWriter writer = new StringWriter();
+        template.process(dataModel, writer);
+        mkGassDirs(aid, jid);
+
+        FileWriter fileWriter = new FileWriter(BPATH + "/" + aid + "/" + jid + "/" + "/gas" + "/MashGas.init");
+        fileWriter.write(writer.toString());
+        fileWriter.close();
+
+    }
+
+    public static void createGass1Runsh(Integer aid, Integer jid) throws IOException, TemplateException {
+        Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
+        // 设置模板所在目录
+        cfg.setClassForTemplateLoading(TemplateGenerator.class, "/templates");
+        // 获取模板对象
+        Template template = cfg.getTemplate("mashGas1Runsh.ftl");
+        // 定义数据模型（Map）
+        Map<String, Object> dataModel = new HashMap<>();
+        dataModel.put("gascontrol", BPATH + "/" + aid + "/" + jid  + "/gas" + "/MashGas.control");
+        dataModel.put("gasescapecontrol", BPATH + "/" + aid + "/" + jid + "/" + "/gas"  + "/gasEscape.control");
+        // 将数据模型传入模板进行处理
+        StringWriter writer = new StringWriter();
+        template.process(dataModel, writer);
+        mkGassDirs(aid, jid);
+        FileWriter fileWriter = new FileWriter(BPATH + "/" + aid + "/" + jid + "/" + "/gas" + "/run.sh");
+        fileWriter.write(writer.toString());
+
+        fileWriter.close();
+
+
     }
 }

src/main/java/com/miniframe/template/TemplateGenerator2.java

@@ -201,6 +201,7 @@ public class TemplateGenerator2 {
         // 将数据模型传入模板进行处理
         StringWriter writer = new StringWriter();
         template.process(dataModel, writer);
+        mkDirs(aid, jid, "/gas");
         FileWriter fileWriter =
                 new FileWriter(BPATH + "/" + aid + "/" + jid + "/" + "/gas" + "/gasEscape.control");
         fileWriter.write(writer.toString());
@@ -244,7 +245,7 @@ public class TemplateGenerator2 {
         // 将数据模型传入模板进行处理
         StringWriter writer = new StringWriter();
         template.process(dataModel, writer);
-        mkDirs(aid, jid, "/fire");
+        mkDirs(aid, jid, "/gas");
         FileWriter fileWriter = new FileWriter(BPATH + "/" + aid + "/" + jid + "/escape");
         fileWriter.write(writer.toString());
         fileWriter.close();
@@ -324,7 +325,7 @@ public class TemplateGenerator2 {
     }
 
 
-    private static void mkDirs(Integer aid, Integer jid, String s) {
+    public static void mkDirs(Integer aid, Integer jid, String s) {
         XIFileUtils.mkdir(BPATH);
         XIFileUtils.mkdir(BPATH + "/" + aid);
         XIFileUtils.mkdir(BPATH + "/" + aid + "/" + jid);

src/main/java/com/miniframe/template/word/WordData.java

@@ -0,0 +1,54 @@
+package com.miniframe.template.word;
+
+import com.deepoove.poi.data.TableRenderData;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class WordData {
+    private TableRenderData order;
+    private String stype;
+    private String pname;
+    private String qjtime;
+    private List<WordPerson> persons =new ArrayList<>();
+
+    public String getQjtime() {
+        return qjtime;
+    }
+
+    public void setQjtime(String qjtime) {
+        this.qjtime = qjtime;
+    }
+
+    public String getStype() {
+        return stype;
+    }
+
+    public void setStype(String stype) {
+        this.stype = stype;
+    }
+
+    public TableRenderData getOrder() {
+        return order;
+    }
+
+    public void setOrder(TableRenderData order) {
+        this.order = order;
+    }
+
+    public String getPname() {
+        return pname;
+    }
+
+    public void setPname(String pname) {
+        this.pname = pname;
+    }
+
+    public List<WordPerson> getPersons() {
+        return persons;
+    }
+
+    public void setPersons(List<WordPerson> persons) {
+        this.persons = persons;
+    }
+}

src/main/java/com/miniframe/template/word/WordPerson.java

@@ -0,0 +1,58 @@
+package com.miniframe.template.word;
+
+public class WordPerson {
+    private String pname;
+    private String index;
+    private String code;
+    private String site;
+    private String num;
+    private String time;
+
+    public String getIndex() {
+        return index;
+    }
+
+    public void setIndex(String index) {
+        this.index = index;
+    }
+
+    public String getPname() {
+        return pname;
+    }
+
+    public void setPname(String pname) {
+        this.pname = pname;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getSite() {
+        return site;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+}

src/main/java/com/miniframe/template/word/WordReport.java

@@ -0,0 +1,80 @@
+package com.miniframe.template.word;
+
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.data.RowRenderData;
+import com.deepoove.poi.data.Rows;
+import com.deepoove.poi.data.TableRenderData;
+import com.deepoove.poi.data.Tables;
+import com.deepoove.poi.data.style.BorderStyle;
+import org.apache.poi.xwpf.usermodel.XWPFTable;
+
+import java.io.BufferedOutputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+public class WordReport {
+    public static void testAnimal(OutputStream bos ) throws Exception {
+        WordData data =new WordData();
+        data.setPname("1号运输大巷");
+        data.setStype("火灾源");
+        data.setQjtime("3h23m12s");
+        List<String> headers =new ArrayList<>();
+        headers.add("编号");
+        headers.add("距起点相对位置");
+        headers.add("发生时间");
+        headers.add("火源温度");
+        headers.add("SO2");
+        headers.add("CO");
+        headers.add("CO2");
+        RowRenderData header = Rows.of(headers.toArray(new String[0]))
+                .bgColor("F2F2F2")
+                .center()
+                .textColor("7F7f7F").textFontFamily("Hei").textFontSize(9).create();
+
+        List<String> rowt =new ArrayList<>();
+        rowt.add("100");
+        rowt.add("0.2");
+        rowt.add("2024.12.7 12:00:00");
+        rowt.add("837K");
+        rowt.add("200 ppm/s");
+        rowt.add("130 ppm/s");
+        rowt.add("1000 ppm/s");
+
+
+        RowRenderData row = Rows.of(rowt.toArray(new String[0]))
+                .center().create();
+
+        BorderStyle borderStyle = new BorderStyle();
+        borderStyle.setColor("A6A6A6");
+        borderStyle.setSize(4);
+        borderStyle.setType(XWPFTable.XWPFBorderType.SINGLE);
+        TableRenderData table = Tables.ofA4MediumWidth().addRow(header).addRow(row).
+                border(borderStyle).center()
+                .create();
+        table.addRow(row);
+        table.addRow(row);
+        data.setOrder(table);
+
+        List<WordPerson> persons =new ArrayList<>();
+        WordPerson person =new WordPerson();
+        person.setIndex("1");
+        person.setCode("23");
+        person.setNum("32");
+        person.setPname("3号运输巷道第2开采区");
+        person.setSite("0.2");
+        person.setTime("0h30m23s");
+        persons.add(person);
+        persons.add(person);
+        data.setPersons(persons);
+
+        XWPFTemplate template = XWPFTemplate.compile("D://pname.docx").render(data);
+        template.writeAndClose(bos);
+
+//         XWPFTemplate.compile("D://pname.docx").render(new HashMap<String, Object>() {
+//            {
+//                put("pname", "sdf");
+//            }
+//        }).writeToFile("D:///out_example_animal.docx");
+    }
+}

src/main/resources/templates/mashGas1Control.ftl

@@ -0,0 +1,20 @@
+geoFile : ${geoFilePath}
+initFile : ${initFilePath}
+monitorFile : ${monitorPath}
+midPath : ${midPath}
+outPath : ${outPath}
+CPUS: ${cups}
+3Dtotaltime: 0.000005
+totaltime: ${totaltime}
+dt: ${dt}
+dx: ${dx}
+report step: ${reportstep}
+Boundary number:${boundarynum}
+MashGas number:${mashgasnumber}
+tecplot : OK
+interactionstep : ${interactionstep}
+Number Con:${conNum}
+<#list cons as b>
+${b.code},${b.diffcoe}
+</#list>
+#end

src/main/resources/templates/mashGas1Init.ftl

@@ -0,0 +1,16 @@
+#nodes
+#end
+#boundaries Inlet 
+<#list boundaries as b>
+${b.ncode},${b.type},${b.flow},${b.pressure},${b.temperature} ,${b.polcon1} ,${b.polcon2}
+</#list>
+#end 
+#MashGass
+MashGas1,1,3
+${b.pcode},${b.ssite},${b.esite}
+grdfile,pipes3.x
+inpfile,pipes3.inp
+block-4,1,0.2
+ign-2,2,${b.gasdensity}
+block-5,1,0
+#end

src/main/resources/templates/mashGas1Runsh.ftl

@@ -0,0 +1,4 @@
+cd /home/disaster/zhty/Program
+export LD_LIBRARY_PATH=./bin:$LD_LIBRARY_PATH
+./1Gas ${gascontrol}
+./calDanger ${gasescapecontrol}

src/test/java/com/miniframe/WordData.java

@@ -0,0 +1,54 @@
+package com.miniframe;
+
+import com.deepoove.poi.data.TableRenderData;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class WordData {
+    private TableRenderData order;
+    private String stype;
+    private String pname;
+    private String qjtime;
+    private List<WordPerson> persons =new ArrayList<>();
+
+    public String getQjtime() {
+        return qjtime;
+    }
+
+    public void setQjtime(String qjtime) {
+        this.qjtime = qjtime;
+    }
+
+    public String getStype() {
+        return stype;
+    }
+
+    public void setStype(String stype) {
+        this.stype = stype;
+    }
+
+    public TableRenderData getOrder() {
+        return order;
+    }
+
+    public void setOrder(TableRenderData order) {
+        this.order = order;
+    }
+
+    public String getPname() {
+        return pname;
+    }
+
+    public void setPname(String pname) {
+        this.pname = pname;
+    }
+
+    public List<WordPerson> getPersons() {
+        return persons;
+    }
+
+    public void setPersons(List<WordPerson> persons) {
+        this.persons = persons;
+    }
+}

src/test/java/com/miniframe/WordPerson.java

@@ -0,0 +1,58 @@
+package com.miniframe;
+
+public class WordPerson {
+    private String pname;
+    private String index;
+    private String code;
+    private String site;
+    private String num;
+    private String time;
+
+    public String getIndex() {
+        return index;
+    }
+
+    public void setIndex(String index) {
+        this.index = index;
+    }
+
+    public String getPname() {
+        return pname;
+    }
+
+    public void setPname(String pname) {
+        this.pname = pname;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getSite() {
+        return site;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+}

src/test/java/com/miniframe/comm/httpclientapater/D20013Test.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_D20013;
+import com.miniframe.generate.comm.httpclientapater.D20013Client;
+import com.miniframe.generate.business.system.model.D20013BaseModel;
+
+public class D20013Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(D20013Test.class);
+
+	/**
+	 * 报表下载，获取报文体
+	 * @return
+	 */
+	public static A_D20013 getA_d20013() {
+		A_D20013 a_d20013 = new A_D20013();
+
+		// ----------以下增加【报表下载】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_d20013;
+	}
+	
+	/**
+	 * 运行客户端测试，报表下载
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		D20013BaseModel model = new D20013BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("D20013"));
+		model.setA_d20013(D20013Test.getA_d20013());
+		D20013Client client = new D20013Client();
+		logger.error("客户端发送前总线：\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线：\r\n"+model);
+	}
+}

src/test/java/com/miniframe/comm/httpclientapater/D30001Test.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_D30001;
+import com.miniframe.generate.comm.httpclientapater.D30001Client;
+import com.miniframe.generate.business.system.model.D30001BaseModel;
+
+public class D30001Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(D30001Test.class);
+
+	/**
+	 * 一维瓦斯灾源查询，获取报文体
+	 * @return
+	 */
+	public static A_D30001 getA_d30001() {
+		A_D30001 a_d30001 = new A_D30001();
+
+		// ----------以下增加【一维瓦斯灾源查询】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_d30001;
+	}
+	
+	/**
+	 * 运行客户端测试，一维瓦斯灾源查询
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		D30001BaseModel model = new D30001BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("D30001"));
+		model.setA_d30001(D30001Test.getA_d30001());
+		D30001Client client = new D30001Client();
+		logger.error("客户端发送前总线：\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线：\r\n"+model);
+	}
+}

src/test/java/com/miniframe/comm/httpclientapater/D30002Test.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_D30002;
+import com.miniframe.generate.comm.httpclientapater.D30002Client;
+import com.miniframe.generate.business.system.model.D30002BaseModel;
+
+public class D30002Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(D30002Test.class);
+
+	/**
+	 * 一维瓦斯灾源添加修改，获取报文体
+	 * @return
+	 */
+	public static A_D30002 getA_d30002() {
+		A_D30002 a_d30002 = new A_D30002();
+
+		// ----------以下增加【一维瓦斯灾源添加修改】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_d30002;
+	}
+	
+	/**
+	 * 运行客户端测试，一维瓦斯灾源添加修改
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		D30002BaseModel model = new D30002BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("D30002"));
+		model.setA_d30002(D30002Test.getA_d30002());
+		D30002Client client = new D30002Client();
+		logger.error("客户端发送前总线：\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线：\r\n"+model);
+	}
+}

src/test/java/com/miniframe/comm/httpclientapater/D30003Test.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_D30003;
+import com.miniframe.generate.comm.httpclientapater.D30003Client;
+import com.miniframe.generate.business.system.model.D30003BaseModel;
+
+public class D30003Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(D30003Test.class);
+
+	/**
+	 * 一维瓦斯灾源删除，获取报文体
+	 * @return
+	 */
+	public static A_D30003 getA_d30003() {
+		A_D30003 a_d30003 = new A_D30003();
+
+		// ----------以下增加【一维瓦斯灾源删除】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_d30003;
+	}
+	
+	/**
+	 * 运行客户端测试，一维瓦斯灾源删除
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		D30003BaseModel model = new D30003BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("D30003"));
+		model.setA_d30003(D30003Test.getA_d30003());
+		D30003Client client = new D30003Client();
+		logger.error("客户端发送前总线：\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线：\r\n"+model);
+	}
+}

src/test/java/com/miniframe/wordTemplte.java

@@ -1,16 +1,15 @@
 package com.miniframe;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
+import com.deepoove.poi.config.Configure;
+import com.deepoove.poi.data.*;
+import com.deepoove.poi.data.style.BorderStyle;
+import org.apache.poi.xwpf.usermodel.XWPFTable;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 import com.deepoove.poi.XWPFTemplate;
-import com.deepoove.poi.data.Charts;
-import com.deepoove.poi.data.Pictures;
 
 
 public class wordTemplte {
@@ -20,38 +19,65 @@ public class wordTemplte {
 
     public static void testAnimal() throws Exception {
 
-        Map<String, Object> elephant = new HashMap<String, Object>() {
-            {
-                put("name", "大象");
-                put("chart",
-                        Charts.ofMultiSeries("大象生存现状", new String[] { "2018年", "2019年", "2020年" })
-                                .addSeries("成年象", new Integer[] { 500, 600, 700 })
-                                .addSeries("幼象", new Integer[] { 200, 300, 400 })
-                                .addSeries("全部", new Integer[] { 700, 900, 1100 })
-                                .create());
-
-            }
-        };
-        Map<String, Object> giraffe = new HashMap<String, Object>() {
-            {
-                put("name", "长颈鹿");
-                put("picture", Pictures.ofLocal("src/test/resources/lu.png").size(100, 120).create());
-                put("chart",
-                        Charts.ofMultiSeries("长颈鹿生存现状", new String[] { "2018年", "2019年", "2020年" })
-                                .addSeries("成年鹿", new Integer[] { 500, 600, 700 })
-                                .addSeries("幼鹿", new Integer[] { 200, 300, 400 })
-                                .create());
-
-            }
-        };
-        List<Map<String, Object>> animals = Arrays.asList(elephant, giraffe);
-        XWPFTemplate.compile("src/test/resources/animal/animal.docx").render(new HashMap<String, Object>() {
-            {
-                put("animals", animals);
-            }
-        }).writeToFile("target/out_example_animal.docx");
-
-//        XWPFTemplate.compile("D://pname.docx").render(new HashMap<String, Object>() {
+        WordData data =new WordData();
+        data.setPname("1号运输大巷");
+        data.setStype("火灾源");
+        data.setQjtime("3h23m12s");
+        List<String> headers =new ArrayList<>();
+        headers.add("编号");
+        headers.add("距起点相对位置");
+        headers.add("发生时间");
+        headers.add("火源温度");
+        headers.add("SO2");
+        headers.add("CO");
+        headers.add("CO2");
+
+
+        RowRenderData header = Rows.of(headers.toArray(new String[0]))
+                .bgColor("F2F2F2")
+                .center()
+                .textColor("7F7f7F").textFontFamily("Hei").textFontSize(9).create();
+
+        List<String> rowt =new ArrayList<>();
+        rowt.add("100");
+        rowt.add("0.2");
+        rowt.add("2024.12.7 12:00:00");
+        rowt.add("837K");
+        rowt.add("200 ppm/s");
+        rowt.add("130 ppm/s");
+        rowt.add("1000 ppm/s");
+
+
+        RowRenderData row = Rows.of(rowt.toArray(new String[0]))
+                .center().create();
+
+        BorderStyle borderStyle = new BorderStyle();
+        borderStyle.setColor("A6A6A6");
+        borderStyle.setSize(4);
+        borderStyle.setType(XWPFTable.XWPFBorderType.SINGLE);
+        TableRenderData table = Tables.ofA4MediumWidth().addRow(header).addRow(row).
+                border(borderStyle).center()
+                .create();
+        table.addRow(row);
+        table.addRow(row);
+        data.setOrder(table);
+
+        List<WordPerson> persons =new ArrayList<>();
+        WordPerson person =new WordPerson();
+        person.setIndex("1");
+        person.setCode("23");
+        person.setNum("32");
+        person.setPname("3号运输巷道第2开采区");
+        person.setSite("0.2");
+        person.setTime("0h30m23s");
+        persons.add(person);
+        persons.add(person);
+        data.setPersons(persons);
+
+        XWPFTemplate template = XWPFTemplate.compile("D://pname.docx").render(data);
+        template.writeToFile("D:///out_example_animal.docx");
+
+//         XWPFTemplate.compile("D://pname.docx").render(new HashMap<String, Object>() {
 //            {
 //                put("pname", "sdf");
 //            }

系统设计/系统模块/SYSTEM(基础系统).csv

@@ -86,7 +86,6 @@
 
 310020,D10036,路径求解结果获取,service,,
 
-
 310001,D20001,水泵查询,service,,
 310002,D20002,水泵添加修改,service,,
 310003,D20003,水泵删除,service,,
@@ -99,7 +98,11 @@
 310010,D20010,风门查询,service,,
 310011,D20011,风门添加修改,service,,
 310012,D20012,风门删除,service,,
+310013,D20013,报表下载,service,,
 
+320001,D30001,一维瓦斯灾源查询,service,,
+320002,D30002,一维瓦斯灾源添加修改,service,,
+320003,D30003,一维瓦斯灾源删除,service,,
 
 400001,M00001,平台对接事故数据,service,,
 400002,M00002,平台对接预设路径,service,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20013_A(报表下载).csv

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

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D20013_D(报表下载).csv

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

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D30001_A(一维瓦斯灾源查询).csv

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

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D30001_D(一维瓦斯灾源查询).csv

@@ -0,0 +1,10 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,row,数据,list,,,,,,,,,,,
+1.1,gid,瓦斯灾情源id,int,,,,,,,,,,,
+1.6,aid,事故,int,,,,,,,,,,,
+1.7,pid,巷道ID,int,,,,,,,,,,,
+1.8,pname,巷道名称,string,,,,,,,,,,,
+1.9,pcode,巷道编号,string,,,,,,,,,,,
+1.10,ssite,开始位置,double,,,,,,,,,,,
+1.11,esite,结束位置,double,,,,,,,,,,,
+1.12,gasdensity,瓦斯爆炸区浓度,double,,,,,,,,,,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D30002_A(一维瓦斯灾源添加修改).csv

@@ -0,0 +1,6 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+2,aid,事故,int,,,是,,,,,,,,
+3,pid,巷道ID,int,,,是,,,,,,,,
+4,ssite,开始位置,double,,,是,,,,,,,,
+5,esite,结束位置,double,,,是,,,,,,,,
+6,gasdensity,瓦斯爆炸区浓度,double,,,是,,,,,,,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D30002_D(一维瓦斯灾源添加修改).csv

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

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D30003_A(一维瓦斯灾源删除).csv

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

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D30003_D(一维瓦斯灾源删除).csv

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