water新版

dbscript/init/generate/03-functionInit.sql

@@ -59,6 +59,8 @@ INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D1
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10015', '基础系统','物理属性据删除',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10016', '基础系统','监测点结果获取',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10017', '基础系统','求解任务信息',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10018', '基础系统','监测点结果获取',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10019', '基础系统','监测点结果批量获取',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10020', '基础系统','瓦斯灾源查询',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10021', '基础系统','瓦斯灾源添加修改',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('D10022', '基础系统','瓦斯灾源删除',true);

generated/com/miniframe/generate/business/system/model/D10018BaseModel.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_D10018;
+import com.miniframe.generate.comm.system.D_D10018;
+
+/**
+ * 系统服务,“监测点结果获取”模型类（不要维护，重新生成将覆盖）。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class D10018BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_D10018 a_d10018;//上行体
+	D_D10018 d_d10018;//下行体
+
+	public D10018BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_d10018=new A_D10018();
+		d_d10018=new D_D10018();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_d10018.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_D10018.class);
+		this.a_d10018 = UtilTools.map2Obj(bodyMap, A_D10018.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_d10018));
+
+		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_D10018 getA_d10018() {
+		return a_d10018;
+	}
+
+	public void setA_d10018(A_D10018 a_d10018) {
+		this.a_d10018=a_d10018;
+	}
+
+	public D_D10018 getD_d10018() {
+		return this.d_d10018;
+	}
+
+	public void setD_d10018(D_D10018 d_d10018) {
+		this.d_d10018=d_d10018;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

generated/com/miniframe/generate/business/system/model/D10019BaseModel.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_D10019;
+import com.miniframe.generate.comm.system.D_D10019;
+
+/**
+ * 系统服务,“监测点结果批量获取”模型类（不要维护，重新生成将覆盖）。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class D10019BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_SYSTEMHEAD a_systemhead;//上行头
+	D_SYSTEMHEAD d_systemhead;//下行头
+	A_D10019 a_d10019;//上行体
+	D_D10019 d_d10019;//下行体
+
+	public D10019BaseModel(){
+		a_systemhead=new A_SYSTEMHEAD();
+		d_systemhead=new D_SYSTEMHEAD();
+		a_d10019=new A_D10019();
+		d_d10019=new D_D10019();
+	}
+
+	public void validater() throws Exception {
+		this.a_systemhead.validater();
+		this.a_d10019.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_D10019.class);
+		this.a_d10019 = UtilTools.map2Obj(bodyMap, A_D10019.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_d10019));
+
+		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_D10019 getA_d10019() {
+		return a_d10019;
+	}
+
+	public void setA_d10019(A_D10019 a_d10019) {
+		this.a_d10019=a_d10019;
+	}
+
+	public D_D10019 getD_d10019() {
+		return this.d_d10019;
+	}
+
+	public void setD_d10019(D_D10019 d_d10019) {
+		this.d_d10019=d_d10019;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

generated/com/miniframe/generate/comm/httpclientapater/D10018Client.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_D10018;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.D10018BaseModel;
+
+public class D10018Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10018Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->监测点结果获取((D10018)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10018BaseModel execute(D10018BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10018BaseModel execute(D10018BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(D10018BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10018BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("D10018");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_d10018()));
+		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_D10018 d_d10018 =  UtilTools.map2Obj(outMap, D_D10018.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_d10018(d_d10018);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10018BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10018BaseModel execute(D10018BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

generated/com/miniframe/generate/comm/httpclientapater/D10019Client.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_D10019;
+import com.miniframe.generate.comm.system.D_SYSTEMHEAD;
+
+import com.miniframe.generate.business.system.model.D10019BaseModel;
+
+public class D10019Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10019Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->监测点结果批量获取((D10019)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10019BaseModel execute(D10019BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10019BaseModel execute(D10019BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(D10019BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10019BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_systemhead().getTransCode())){
+			model.getA_systemhead().setTransCode("D10019");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_systemhead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_d10019()));
+		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_D10019 d_d10019 =  UtilTools.map2Obj(outMap, D_D10019.class);
+			model.setD_systemhead(d_systemhead);
+			model.setD_d10019(d_d10019);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(D10019BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public D10019BaseModel execute(D10019BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

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

@@ -0,0 +1,38 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 监测点结果获取
+ */
+public class A_D10018 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;
+	}
+	int step;//步数
+	/**
+	 *步数
+	 */
+	public void setStep(int step) {
+		this.step=step;
+	}
+	/**
+	 *步数
+	 */
+	public int getStep() {
+		return this.step;
+	}
+}

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

@@ -0,0 +1,38 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 监测点结果批量获取
+ */
+public class A_D10019 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;
+	}
+	String chname;//监测点名称
+	/**
+	 *监测点名称
+	 */
+	public void setChname(String chname) {
+		this.chname=chname;
+	}
+	/**
+	 *监测点名称
+	 */
+	public String getChname() {
+		return this.chname;
+	}
+}

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

@@ -0,0 +1,39 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+import java.util.*;
+/**
+ * 监测点结果获取
+ */
+public class D_D10018 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	List <D_D10018_CODES_RECODE> codes;//数据
+	/**
+	 *数据
+	 */
+	public void setCodes(List <D_D10018_CODES_RECODE> codes) {
+		this.codes=codes;
+	}
+	/**
+	 *数据
+	 */
+	public List <D_D10018_CODES_RECODE> getCodes() {
+		return this.codes;
+	}
+	List <D_D10018_VALS_RECODE> vals;//数据
+	/**
+	 *数据
+	 */
+	public void setVals(List <D_D10018_VALS_RECODE> vals) {
+		this.vals=vals;
+	}
+	/**
+	 *数据
+	 */
+	public List <D_D10018_VALS_RECODE> getVals() {
+		return this.vals;
+	}
+}

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

@@ -0,0 +1,103 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 监测点结果获取->数据
+ */
+public class D_D10018_CHVALS_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String chname;//监测点名称
+	/**
+	 *监测点名称
+	 */
+	public void setChname(String chname) {
+		this.chname=chname;
+	}
+	/**
+	 *监测点名称
+	 */
+	public String getChname() {
+		return this.chname;
+	}
+	String v1;//v1
+	/**
+	 *v1
+	 */
+	public void setV1(String v1) {
+		this.v1=v1;
+	}
+	/**
+	 *v1
+	 */
+	public String getV1() {
+		return this.v1;
+	}
+	String v2;//v2
+	/**
+	 *v2
+	 */
+	public void setV2(String v2) {
+		this.v2=v2;
+	}
+	/**
+	 *v2
+	 */
+	public String getV2() {
+		return this.v2;
+	}
+	String v3;//v3
+	/**
+	 *v3
+	 */
+	public void setV3(String v3) {
+		this.v3=v3;
+	}
+	/**
+	 *v3
+	 */
+	public String getV3() {
+		return this.v3;
+	}
+	String v4;//v4
+	/**
+	 *v4
+	 */
+	public void setV4(String v4) {
+		this.v4=v4;
+	}
+	/**
+	 *v4
+	 */
+	public String getV4() {
+		return this.v4;
+	}
+	String v5;//v5
+	/**
+	 *v5
+	 */
+	public void setV5(String v5) {
+		this.v5=v5;
+	}
+	/**
+	 *v5
+	 */
+	public String getV5() {
+		return this.v5;
+	}
+	String v6;//v6
+	/**
+	 *v6
+	 */
+	public void setV6(String v6) {
+		this.v6=v6;
+	}
+	/**
+	 *v6
+	 */
+	public String getV6() {
+		return this.v6;
+	}
+}

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

@@ -0,0 +1,25 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 监测点结果获取->数据
+ */
+public class D_D10018_COCODES_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String cocode;//物理量编号
+	/**
+	 *物理量编号
+	 */
+	public void setCocode(String cocode) {
+		this.cocode=cocode;
+	}
+	/**
+	 *物理量编号
+	 */
+	public String getCocode() {
+		return this.cocode;
+	}
+}

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

@@ -0,0 +1,25 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 监测点结果获取->数据
+ */
+public class D_D10018_CODES_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String code;//物理量编号
+	/**
+	 *物理量编号
+	 */
+	public void setCode(String code) {
+		this.code=code;
+	}
+	/**
+	 *物理量编号
+	 */
+	public String getCode() {
+		return this.code;
+	}
+}

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

@@ -0,0 +1,39 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+import java.util.*;
+/**
+ * 监测点结果批量获取
+ */
+public class D_D10019 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	List <D_D10019_STEPTIMES_RECODE> steptimes;//横坐标
+	/**
+	 *横坐标
+	 */
+	public void setSteptimes(List <D_D10019_STEPTIMES_RECODE> steptimes) {
+		this.steptimes=steptimes;
+	}
+	/**
+	 *横坐标
+	 */
+	public List <D_D10019_STEPTIMES_RECODE> getSteptimes() {
+		return this.steptimes;
+	}
+	List <D_D10019_ROWS_RECODE> rows;//数据
+	/**
+	 *数据
+	 */
+	public void setRows(List <D_D10019_ROWS_RECODE> rows) {
+		this.rows=rows;
+	}
+	/**
+	 *数据
+	 */
+	public List <D_D10019_ROWS_RECODE> getRows() {
+		return this.rows;
+	}
+}

generated/validateform/a_d10018Form.xml

@@ -0,0 +1,15 @@
+<?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_d10018Form">
+<field property="aid" depends="required">
+    <arg0 key="a_d10018.aid"/>
+</field>
+<field property="step" depends="required">
+    <arg0 key="a_d10018.step"/>
+</field>
+</form>
+</formset>
+</form-validation>

generated/validateform/a_d10019Form.xml

@@ -0,0 +1,15 @@
+<?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_d10019Form">
+<field property="aid" depends="required">
+    <arg0 key="a_d10019.aid"/>
+</field>
+<field property="chname" depends="required">
+    <arg0 key="a_d10019.chname"/>
+</field>
+</form>
+</formset>
+</form-validation>

generated/validator/resources_a_d10018Form_validator.properties

@@ -0,0 +1,3 @@
+a_d10018.aid = \u4E8B\u6545ID
+a_d10018.step = \u6B65\u6570
+a_d10018Form = true

generated/validator/resources_a_d10018Form_validator_zh_CN.properties

@@ -0,0 +1,3 @@
+a_d10018.aid = \u4E8B\u6545ID
+a_d10018.step = \u6B65\u6570
+a_d10018Form = true

generated/validator/resources_a_d10019Form_validator.properties

@@ -0,0 +1,3 @@
+a_d10019.aid = \u4E8B\u6545ID
+a_d10019.chname = \u76D1\u6D4B\u70B9\u540D\u79F0
+a_d10019Form = true

generated/validator/resources_a_d10019Form_validator_zh_CN.properties

@@ -0,0 +1,3 @@
+a_d10019.aid = \u4E8B\u6545ID
+a_d10019.chname = \u76D1\u6D4B\u70B9\u540D\u79F0
+a_d10019Form = true

generated/validator/resources_d_d10018Form_validator.properties

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

generated/validator/resources_d_d10018Form_validator_zh_CN.properties

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

generated/validator/resources_d_d10018_chvals_recodeForm_validator.properties

@@ -0,0 +1,8 @@
+d_d10018_chvals_recode.chname = \u76D1\u6D4B\u70B9\u540D\u79F0
+d_d10018_chvals_recode.v1 = v1
+d_d10018_chvals_recode.v2 = v2
+d_d10018_chvals_recode.v3 = v3
+d_d10018_chvals_recode.v4 = v4
+d_d10018_chvals_recode.v5 = v5
+d_d10018_chvals_recode.v6 = v6
+d_d10018_chvals_recodeForm = true

generated/validator/resources_d_d10018_chvals_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,8 @@
+d_d10018_chvals_recode.chname = \u76D1\u6D4B\u70B9\u540D\u79F0
+d_d10018_chvals_recode.v1 = v1
+d_d10018_chvals_recode.v2 = v2
+d_d10018_chvals_recode.v3 = v3
+d_d10018_chvals_recode.v4 = v4
+d_d10018_chvals_recode.v5 = v5
+d_d10018_chvals_recode.v6 = v6
+d_d10018_chvals_recodeForm = true

generated/validator/resources_d_d10018_cocodes_recodeForm_validator.properties

@@ -0,0 +1,2 @@
+d_d10018_cocodes_recode.cocode = \u7269\u7406\u91CF\u7F16\u53F7
+d_d10018_cocodes_recodeForm = true

generated/validator/resources_d_d10018_cocodes_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+d_d10018_cocodes_recode.cocode = \u7269\u7406\u91CF\u7F16\u53F7
+d_d10018_cocodes_recodeForm = true

generated/validator/resources_d_d10018_codes_recodeForm_validator.properties

@@ -0,0 +1,2 @@
+d_d10018_codes_recode.code = \u7269\u7406\u91CF\u7F16\u53F7
+d_d10018_codes_recodeForm = true

generated/validator/resources_d_d10018_codes_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+d_d10018_codes_recode.code = \u7269\u7406\u91CF\u7F16\u53F7
+d_d10018_codes_recodeForm = true

generated/validator/resources_d_d10019Form_validator.properties

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

generated/validator/resources_d_d10019Form_validator_zh_CN.properties

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

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 14:41:28 CST 2024.
+    This file was generated on Fri Apr 12 15:38:41 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

@@ -305,9 +305,6 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 				throw  new BusinessException("EB3100014");
 			}
 		}
-
-
-
 		DChecknodeValMapper valMapper =UtilTools.getBean(DChecknodeValMapper.class);
 		DChecknodeValcodeMapper valcodeMapper =UtilTools.getBean(DChecknodeValcodeMapper.class);
 		for (DChecknodeVal nVal:nVals) {

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

@@ -0,0 +1,148 @@
+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.exception.BusinessException;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.system.model.D10018BaseModel;
+import com.miniframe.generate.comm.system.D_D10018_COCODES_RECODE;
+import com.miniframe.generate.comm.system.D_D10018_CODES_RECODE;
+import com.miniframe.generate.comm.system.D_D10018_VALS_RECODE;
+import com.miniframe.model.system.*;
+import com.miniframe.model.system.dao.DAccidentMapper;
+import com.miniframe.model.system.dao.DChecknodeValMapper;
+import com.miniframe.model.system.dao.DChecknodeValcodeMapper;
+import tk.mybatis.mapper.util.StringUtil;
+
+/**
+ * 基础系统,“监测点结果获取”逻辑处理（重新生成不覆盖）。
+ */
+public class D10018Service extends D10018BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“监测点结果获取”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		Integer aid= getA_d10018().getAid();
+		Integer step =getA_d10018().getStep();
+		DAccidentMapper accidentDao  = UtilTools.getBean(DAccidentMapper.class);
+		DAccident accident= accidentDao.selectByPrimaryKey(aid);
+		List<D_D10018_CODES_RECODE> codes =new ArrayList<>();
+		findValCode(aid, accident, codes);
+		List<D_D10018_VALS_RECODE> vals =new ArrayList<>();
+		findVal(aid, step, accident, vals);
+		this.getD_d10018().setCodes(codes);
+		this.getD_d10018().setVals(vals);
+
+	}
+
+	private void findVal(Integer aid, Integer step, DAccident accident, List<D_D10018_VALS_RECODE> vals) {
+		DChecknodeValMapper valMapper =UtilTools.getBean(DChecknodeValMapper.class);
+		DChecknodeValSQLBuilder sb = new DChecknodeValSQLBuilder();
+		DChecknodeValSQLBuilder.Criteria sc =sb.createCriteria();
+		sc.andAidEqualTo(aid);
+		sc.andJidEqualTo(accident.getJid());
+		sc.andStepEqualTo(step);
+		sb.setOrderByClause("id ASC");
+		List<DChecknodeVal> nVals = valMapper.selectByExample(sb);
+
+		for (DChecknodeVal nval:nVals) {
+			D_D10018_VALS_RECODE val =new D_D10018_VALS_RECODE();
+			val.setChname(nval.getChname());
+			val.setV1(nval.getV1());
+			val.setV2(nval.getV2());
+			val.setV3(nval.getV3());
+			val.setV4(nval.getV4());
+			val.setV5(nval.getV5());
+			val.setV6(nval.getV6());
+			vals.add(val);
+		}
+	}
+
+	private void findValCode(Integer aid, DAccident accident, List<D_D10018_CODES_RECODE> codes) throws BusinessException {
+		DChecknodeValcodeMapper valcodeMapper =UtilTools.getBean(DChecknodeValcodeMapper.class);
+		DChecknodeValcodeSQLBuilder codesb =new DChecknodeValcodeSQLBuilder();
+		DChecknodeValcodeSQLBuilder.Criteria codesc = codesb.createCriteria();
+		codesc.andAidEqualTo(aid);
+		codesc.andJidEqualTo(accident.getJid());
+
+		List<DChecknodeValcode> valcodes = valcodeMapper.selectByExample(codesb	);
+		if(valcodes.isEmpty()){
+			throw  new BusinessException("EB3100026");
+		}
+		DChecknodeValcode valcode =valcodes.get(0);
+
+		setCodes(valcode, codes);
+	}
+
+	private void setCodes(DChecknodeValcode valcode, List<D_D10018_CODES_RECODE> codes) {
+		if(!StringUtil.isEmpty(valcode.getValCode1()));
+		{
+			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
+			code.setCode(valcode.getValCode1());
+			codes.add(code);
+		}
+		if(!StringUtil.isEmpty(valcode.getValCode2()));
+		{
+			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
+			code.setCode(valcode.getValCode2());
+			codes.add(code);
+		}
+		if(!StringUtil.isEmpty(valcode.getValCode3()));
+		{
+			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
+			code.setCode(valcode.getValCode3());
+			codes.add(code);
+		}
+		if(!StringUtil.isEmpty(valcode.getValCode4()));
+		{
+			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
+			code.setCode(valcode.getValCode4());
+			codes.add(code);
+		}
+		if(!StringUtil.isEmpty(valcode.getValCode5()));
+		{
+			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
+			code.setCode(valcode.getValCode5());
+			codes.add(code);
+		}
+		if(!StringUtil.isEmpty(valcode.getValCode6()));
+		{
+			D_D10018_CODES_RECODE code =new D_D10018_CODES_RECODE();
+			code.setCode(valcode.getValCode6());
+			codes.add(code);
+		}
+	}
+
+	/**
+	 * 基础系统,“监测点结果获取”业务前处理
+ 	 */
+	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/D10019Service.java

@@ -0,0 +1,209 @@
+package com.miniframe.bisiness.system;
+
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.exception.BusinessException;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.business.system.model.D10019BaseModel;
+import com.miniframe.generate.comm.system.D_D10019_ROWS_DATA_RECODE;
+import com.miniframe.generate.comm.system.D_D10019_ROWS_RECODE;
+import com.miniframe.generate.comm.system.D_D10019_STEPTIMES_RECODE;
+import com.miniframe.model.system.*;
+import com.miniframe.model.system.dao.DAccidentMapper;
+import com.miniframe.model.system.dao.DChecknodeValMapper;
+import com.miniframe.model.system.dao.DChecknodeValcodeMapper;
+import com.miniframe.model.system.dao.DJobMapper;
+import com.miniframe.tools.XIDateTimeUtils;
+import tk.mybatis.mapper.util.StringUtil;
+
+/**
+ * 基础系统,“监测点结果批量获取”逻辑处理（重新生成不覆盖）。
+ */
+public class D10019Service extends D10019BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“监测点结果批量获取”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		Integer aid= getA_d10019().getAid();
+		String chname =getA_d10019().getChname();
+		DAccidentMapper accidentDao  = UtilTools.getBean(DAccidentMapper.class);
+		DAccident accident= accidentDao.selectByPrimaryKey(aid);
+		if(accident==null){
+			throw  new BusinessException("EB3000002");
+		}
+		if(accident.getJid()==null||accident.getJid()==0){
+			throw  new BusinessException("EB3100012");
+		}
+		DJobMapper jobMapper =UtilTools.getBean(DJobMapper.class);
+		DJob job  =jobMapper.selectByPrimaryKey(accident.getJid());
+		if(job==null){
+			throw  new BusinessException("EB3100012");
+		}
+		List<D_D10019_STEPTIMES_RECODE> steptimes = new ArrayList<>();
+
+		findStepTime(job, steptimes);
+
+		List<D_D10019_ROWS_RECODE> rows =new ArrayList<>();
+		findRows(aid, chname, accident, job, rows);
+
+		this.getD_d10019().setSteptimes(steptimes);
+		this.getD_d10019().setRows(rows);
+
+	}
+
+	private void findRows(Integer aid, String chname, DAccident accident, DJob job, List<D_D10019_ROWS_RECODE> rows) throws BusinessException {
+		DChecknodeValcodeMapper valcodeMapper =UtilTools.getBean(DChecknodeValcodeMapper.class);
+		DChecknodeValcodeSQLBuilder codesb =new DChecknodeValcodeSQLBuilder();
+		DChecknodeValcodeSQLBuilder.Criteria codesc = codesb.createCriteria();
+		codesc.andAidEqualTo(aid);
+		codesc.andJidEqualTo(accident.getJid());
+
+		List<DChecknodeValcode> valcodes = valcodeMapper.selectByExample(codesb	);
+		if(valcodes.isEmpty()){
+			throw  new BusinessException("EB3100026");
+		}
+		DChecknodeValcode valcode =valcodes.get(0);
+		DChecknodeValMapper valMapper =UtilTools.getBean(DChecknodeValMapper.class);
+		DChecknodeValSQLBuilder sb =new DChecknodeValSQLBuilder();
+		DChecknodeValSQLBuilder.Criteria sc = sb.createCriteria();
+		sc.andAidEqualTo(aid);
+		sc.andJidEqualTo(job.getId());
+		sc.andChnameEqualTo(chname);
+		sb.setOrderByClause("step ASC");
+		List<DChecknodeVal> vals =new ArrayList<>();
+
+
+		if(!StringUtil.isEmpty(valcode.getValCode1())){
+			D_D10019_ROWS_RECODE row =new D_D10019_ROWS_RECODE();
+			row.setCode(valcode.getValCode1());
+			List<D_D10019_ROWS_DATA_RECODE> rowdatas =new ArrayList<>();
+			for (DChecknodeVal val:vals) {
+				D_D10019_ROWS_DATA_RECODE rowdata =new D_D10019_ROWS_DATA_RECODE();
+				rowdata.setVal(val.getV1());
+				rowdatas.add(rowdata);
+			}
+			row.setData(rowdatas);
+			rows.add(row);
+		}
+
+		if(!StringUtil.isEmpty(valcode.getValCode2())){
+			D_D10019_ROWS_RECODE row =new D_D10019_ROWS_RECODE();
+			row.setCode(valcode.getValCode2());
+			List<D_D10019_ROWS_DATA_RECODE> rowdatas =new ArrayList<>();
+			for (DChecknodeVal val:vals) {
+				D_D10019_ROWS_DATA_RECODE rowdata =new D_D10019_ROWS_DATA_RECODE();
+				rowdata.setVal(val.getV2());
+				rowdatas.add(rowdata);
+			}
+			row.setData(rowdatas);
+			rows.add(row);
+		}
+
+		if(!StringUtil.isEmpty(valcode.getValCode3())){
+			D_D10019_ROWS_RECODE row =new D_D10019_ROWS_RECODE();
+			row.setCode(valcode.getValCode3());
+			List<D_D10019_ROWS_DATA_RECODE> rowdatas =new ArrayList<>();
+			for (DChecknodeVal val:vals) {
+				D_D10019_ROWS_DATA_RECODE rowdata =new D_D10019_ROWS_DATA_RECODE();
+				rowdata.setVal(val.getV3());
+				rowdatas.add(rowdata);
+			}
+			row.setData(rowdatas);
+			rows.add(row);
+		}
+
+		if(!StringUtil.isEmpty(valcode.getValCode4())){
+			D_D10019_ROWS_RECODE row =new D_D10019_ROWS_RECODE();
+			row.setCode(valcode.getValCode4());
+			List<D_D10019_ROWS_DATA_RECODE> rowdatas =new ArrayList<>();
+			for (DChecknodeVal val:vals) {
+				D_D10019_ROWS_DATA_RECODE rowdata =new D_D10019_ROWS_DATA_RECODE();
+				rowdata.setVal(val.getV4());
+				rowdatas.add(rowdata);
+			}
+			row.setData(rowdatas);
+			rows.add(row);
+		}
+
+		if(!StringUtil.isEmpty(valcode.getValCode5())){
+			D_D10019_ROWS_RECODE row =new D_D10019_ROWS_RECODE();
+			row.setCode(valcode.getValCode5());
+			List<D_D10019_ROWS_DATA_RECODE> rowdatas =new ArrayList<>();
+			for (DChecknodeVal val:vals) {
+				D_D10019_ROWS_DATA_RECODE rowdata =new D_D10019_ROWS_DATA_RECODE();
+				rowdata.setVal(val.getV5());
+				rowdatas.add(rowdata);
+			}
+			row.setData(rowdatas);
+			rows.add(row);
+		}
+		if(!StringUtil.isEmpty(valcode.getValCode6())){
+			D_D10019_ROWS_RECODE row =new D_D10019_ROWS_RECODE();
+			row.setCode(valcode.getValCode6());
+			List<D_D10019_ROWS_DATA_RECODE> rowdatas =new ArrayList<>();
+			for (DChecknodeVal val:vals) {
+				D_D10019_ROWS_DATA_RECODE rowdata =new D_D10019_ROWS_DATA_RECODE();
+				rowdata.setVal(val.getV6());
+				rowdatas.add(rowdata);
+			}
+			row.setData(rowdatas);
+			rows.add(row);
+		}
+	}
+
+	private void findStepTime(DJob job, List<D_D10019_STEPTIMES_RECODE> steptimes) {
+		Integer stepnum = Integer.valueOf(job.getTotaltime())/Integer.valueOf(job.getReportstep());
+		for (int i = 1; i <= stepnum; i++) {
+			D_D10019_STEPTIMES_RECODE steptime =new D_D10019_STEPTIMES_RECODE();
+			steptime.setSteptime(getStepTimeByStep(job,i));
+			steptimes.add(steptime);
+		}
+	}
+
+
+	public String getStepTimeByStep(DJob job,Integer step) {
+		Date date=XIDateTimeUtils.getDateFromZonedStr(job.getAcctime());
+		Calendar calendar =Calendar.getInstance();
+		calendar.setTime(date);
+		calendar.add(Calendar.SECOND,step*Integer.valueOf(job.getReportstep()));
+		Date date2=calendar.getTime();
+		DateTimeFormatter timeFormatter =DateTimeFormatter.ofPattern("HH:mm");
+		String s =timeFormatter.format(ZonedDateTime.ofInstant(date2.toInstant(), ZoneId.systemDefault()));
+		return  s;
+	}
+	
+	/**
+	 * 基础系统,“监测点结果批量获取”业务前处理
+ 	 */
+	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/test/java/com/miniframe/comm/httpclientapater/D10018Test.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_D10018;
+import com.miniframe.generate.comm.httpclientapater.D10018Client;
+import com.miniframe.generate.business.system.model.D10018BaseModel;
+
+public class D10018Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10018Test.class);
+
+	/**
+	 * 监测点结果获取，获取报文体
+	 * @return
+	 */
+	public static A_D10018 getA_d10018() {
+		A_D10018 a_d10018 = new A_D10018();
+
+		// ----------以下增加【监测点结果获取】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_d10018;
+	}
+	
+	/**
+	 * 运行客户端测试，监测点结果获取
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		D10018BaseModel model = new D10018BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("D10018"));
+		model.setA_d10018(D10018Test.getA_d10018());
+		D10018Client client = new D10018Client();
+		logger.error("客户端发送前总线：\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线：\r\n"+model);
+	}
+}

src/test/java/com/miniframe/comm/httpclientapater/D10019Test.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_D10019;
+import com.miniframe.generate.comm.httpclientapater.D10019Client;
+import com.miniframe.generate.business.system.model.D10019BaseModel;
+
+public class D10019Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(D10019Test.class);
+
+	/**
+	 * 监测点结果批量获取，获取报文体
+	 * @return
+	 */
+	public static A_D10019 getA_d10019() {
+		A_D10019 a_d10019 = new A_D10019();
+
+		// ----------以下增加【监测点结果批量获取】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_d10019;
+	}
+	
+	/**
+	 * 运行客户端测试，监测点结果批量获取
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		D10019BaseModel model = new D10019BaseModel();
+		model.setA_systemhead(HttpclientapaterUtil.getA_systemhead("D10019"));
+		model.setA_d10019(D10019Test.getA_d10019());
+		D10019Client client = new D10019Client();
+		logger.error("客户端发送前总线：\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线：\r\n"+model);
+	}
+}

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

@@ -94,3 +94,6 @@
 3100024,EB3100024,瓦斯积聚区不存在！,
 
 3100025,EB3100025,边界文件格式错误！,
+3100026,EB3100026,监测点结果数据不存在！,
+
+3100027,EB3100027,求解未完成！,

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

@@ -60,14 +60,16 @@
 310016,D10016,监测点结果获取,service,
 310017,D10017,求解任务信息,service,
 
+310018,D10018,监测点结果获取,service,,
+310019,D10019,监测点结果批量获取,service,,
+
 
 310010,D10020,瓦斯灾源查询,service,,
 310011,D10021,瓦斯灾源添加修改,service,,
 310012,D10022,瓦斯灾源删除,service,,
-
 310010,D10023,瓦斯爆炸区查询,service,,
 310011,D10024,瓦斯爆炸区添加修改,service,,
 310012,D10025,瓦斯爆炸区删除,service,,
-
 310010,D10026,瓦斯积聚区查询,service,,
-310011,D10027,瓦斯积聚区修改,service,,
+310011,D10027,瓦斯积聚区修改,service,,
+

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10018_A(监测点结果获取).csv

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

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10018_D(监测点结果获取).csv

@@ -0,0 +1,11 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,codes,数据,list,,,,0,,,,,,,
+1.1,code,物理量编号,string,,,,,,,,,,,
+2,vals,数据,list,,,,0,,,,,,,
+2.1,chname,监测点名称,string,,,,,,,,,,,
+2.2,v1,v1,string,,,,,,,,,,,
+2.3,v2,v2,string,,,,,,,,,,,
+2.4,v3,v3,string,,,,,,,,,,,
+2.5,v4,v4,string,,,,,,,,,,,
+2.6,v5,v5,string,,,,,,,,,,,
+2.7,v6,v6,string,,,,,,,,,,,

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10019_A(监测点结果批量获取).csv

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

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10019_D(监测点结果批量获取).csv

@@ -0,0 +1,7 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,steptimes,横坐标,list,,,,0,,,,,,,
+1.1,steptime,时间步,string,,,,,,,,,,,
+2,rows,数据,list,,,,0,,,,,,,
+2.1,code,标量,string,,,,,,,,,,,
+2.2,data,数据,list,,,,0,,,,,,,
+2.2.1,val,数据,string,,,,0,,,,,,,