流设置添加2种新类型

dbscript/init/generate/03-functionInit.sql

@@ -69,6 +69,8 @@ INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MD
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0070', '西工大系统','FSI添加修改',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0071', '西工大系统','FSI删除',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0072', '西工大系统','bdf文件解析',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0073', '西工大系统','来流设置',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0074', '西工大系统','流出修改设置求解组件到求解组件',true);
 -- 基础系统
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('A00000', '基础系统','获取图片验证码',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('A00001', '基础系统','获取短信验证码',true);

generated/com/miniframe/generate/business/mdo/model/MDO0073BaseModel.java

@@ -0,0 +1,112 @@
+package com.miniframe.generate.business.mdo.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.mdo.A_MDOHEAD;
+import com.miniframe.generate.comm.mdo.D_MDOHEAD;
+import com.miniframe.generate.comm.mdo.A_MDO0073;
+import com.miniframe.generate.comm.mdo.D_MDO0073;
+
+/**
+ * 系统服务,“来流设置”模型类（不要维护，重新生成将覆盖）。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class MDO0073BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_MDOHEAD a_mdohead;//上行头
+	D_MDOHEAD d_mdohead;//下行头
+	A_MDO0073 a_mdo0073;//上行体
+	D_MDO0073 d_mdo0073;//下行体
+
+	public MDO0073BaseModel(){
+		a_mdohead=new A_MDOHEAD();
+		d_mdohead=new D_MDOHEAD();
+		a_mdo0073=new A_MDO0073();
+		d_mdo0073=new D_MDO0073();
+	}
+
+	public void validater() throws Exception {
+		this.a_mdohead.validater();
+		this.a_mdo0073.validater();
+	}
+
+	public void setTransMap(Map map) throws Exception {
+		Map headMap = HttpMapFormater.format(map, A_MDOHEAD.class);
+		this.a_mdohead = UtilTools.map2Obj(headMap, A_MDOHEAD.class);
+		Map bodyMap = HttpMapFormater.format(map, A_MDO0073.class);
+		this.a_mdo0073 = UtilTools.map2Obj(bodyMap, A_MDO0073.class);
+	}
+
+	public Map getTransMap() throws Exception {
+		Map reMap = new LinkedHashMap();
+
+		if(UtilTools.isNullOrBlank((this.d_mdohead).getTransCode())){
+			(this.d_mdohead).setTransCode((this.a_mdohead).getTransCode());
+		}
+		if(UtilTools.isNullOrBlank((this.d_mdohead).getChannelNo())){
+			(this.d_mdohead).setChannelNo((this.a_mdohead).getChannelNo());
+		}
+		if(UtilTools.isNullOrBlank((this.d_mdohead).getUserId())){
+			(this.d_mdohead).setUserId((this.a_mdohead).getUserId());
+		}
+        if(UtilTools.isNullOrBlank((this.d_mdohead).getTransTime())){
+            (this.d_mdohead).setTransTime(DateTimeFormatter.ofPattern(AppGlobalVariableSysconfig.DATETIMEFORMAT).format(ZonedDateTime.now()));
+        }
+
+		reMap.putAll(UtilTools.obj2Map(this.d_mdohead));
+		reMap.putAll(UtilTools.obj2Map(this.d_mdo0073));
+
+		return reMap;
+	}
+
+	public A_MDOHEAD getA_mdohead() {
+		return this.a_mdohead;
+	}
+
+	public void setA_mdohead(A_MDOHEAD a_mdohead) {
+		this.a_mdohead=a_mdohead;
+	}
+
+	public D_MDOHEAD getD_mdohead() {
+		return d_mdohead;
+	}
+
+	public void setD_mdohead(D_MDOHEAD d_mdohead) {
+		this.d_mdohead=d_mdohead;
+	}
+
+	public A_MDO0073 getA_mdo0073() {
+		return a_mdo0073;
+	}
+
+	public void setA_mdo0073(A_MDO0073 a_mdo0073) {
+		this.a_mdo0073=a_mdo0073;
+	}
+
+	public D_MDO0073 getD_mdo0073() {
+		return this.d_mdo0073;
+	}
+
+	public void setD_mdo0073(D_MDO0073 d_mdo0073) {
+		this.d_mdo0073=d_mdo0073;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

generated/com/miniframe/generate/business/mdo/model/MDO0074BaseModel.java

@@ -0,0 +1,112 @@
+package com.miniframe.generate.business.mdo.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.mdo.A_MDOHEAD;
+import com.miniframe.generate.comm.mdo.D_MDOHEAD;
+import com.miniframe.generate.comm.mdo.A_MDO0074;
+import com.miniframe.generate.comm.mdo.D_MDO0074;
+
+/**
+ * 系统服务,“流出修改设置求解组件到求解组件”模型类（不要维护，重新生成将覆盖）。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class MDO0074BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_MDOHEAD a_mdohead;//上行头
+	D_MDOHEAD d_mdohead;//下行头
+	A_MDO0074 a_mdo0074;//上行体
+	D_MDO0074 d_mdo0074;//下行体
+
+	public MDO0074BaseModel(){
+		a_mdohead=new A_MDOHEAD();
+		d_mdohead=new D_MDOHEAD();
+		a_mdo0074=new A_MDO0074();
+		d_mdo0074=new D_MDO0074();
+	}
+
+	public void validater() throws Exception {
+		this.a_mdohead.validater();
+		this.a_mdo0074.validater();
+	}
+
+	public void setTransMap(Map map) throws Exception {
+		Map headMap = HttpMapFormater.format(map, A_MDOHEAD.class);
+		this.a_mdohead = UtilTools.map2Obj(headMap, A_MDOHEAD.class);
+		Map bodyMap = HttpMapFormater.format(map, A_MDO0074.class);
+		this.a_mdo0074 = UtilTools.map2Obj(bodyMap, A_MDO0074.class);
+	}
+
+	public Map getTransMap() throws Exception {
+		Map reMap = new LinkedHashMap();
+
+		if(UtilTools.isNullOrBlank((this.d_mdohead).getTransCode())){
+			(this.d_mdohead).setTransCode((this.a_mdohead).getTransCode());
+		}
+		if(UtilTools.isNullOrBlank((this.d_mdohead).getChannelNo())){
+			(this.d_mdohead).setChannelNo((this.a_mdohead).getChannelNo());
+		}
+		if(UtilTools.isNullOrBlank((this.d_mdohead).getUserId())){
+			(this.d_mdohead).setUserId((this.a_mdohead).getUserId());
+		}
+        if(UtilTools.isNullOrBlank((this.d_mdohead).getTransTime())){
+            (this.d_mdohead).setTransTime(DateTimeFormatter.ofPattern(AppGlobalVariableSysconfig.DATETIMEFORMAT).format(ZonedDateTime.now()));
+        }
+
+		reMap.putAll(UtilTools.obj2Map(this.d_mdohead));
+		reMap.putAll(UtilTools.obj2Map(this.d_mdo0074));
+
+		return reMap;
+	}
+
+	public A_MDOHEAD getA_mdohead() {
+		return this.a_mdohead;
+	}
+
+	public void setA_mdohead(A_MDOHEAD a_mdohead) {
+		this.a_mdohead=a_mdohead;
+	}
+
+	public D_MDOHEAD getD_mdohead() {
+		return d_mdohead;
+	}
+
+	public void setD_mdohead(D_MDOHEAD d_mdohead) {
+		this.d_mdohead=d_mdohead;
+	}
+
+	public A_MDO0074 getA_mdo0074() {
+		return a_mdo0074;
+	}
+
+	public void setA_mdo0074(A_MDO0074 a_mdo0074) {
+		this.a_mdo0074=a_mdo0074;
+	}
+
+	public D_MDO0074 getD_mdo0074() {
+		return this.d_mdo0074;
+	}
+
+	public void setD_mdo0074(D_MDO0074 d_mdo0074) {
+		this.d_mdo0074=d_mdo0074;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

generated/com/miniframe/generate/comm/httpmdoapater/MDO0073Client.java

@@ -0,0 +1,99 @@
+package com.miniframe.generate.comm.httpmdoapater;
+
+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.mdo.D_MDO0073;
+import com.miniframe.generate.comm.mdo.D_MDOHEAD;
+
+import com.miniframe.generate.business.mdo.model.MDO0073BaseModel;
+
+public class MDO0073Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(MDO0073Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->来流设置((MDO0073)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MDO0073BaseModel execute(MDO0073BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MDO0073BaseModel execute(MDO0073BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(MDO0073BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(MDO0073BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_mdohead().getTransCode())){
+			model.getA_mdohead().setTransCode("MDO0073");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_mdohead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_mdo0073()));
+		if(extMap!=null && extMap.size()>0){
+			inMap.putAll(extMap);
+		}
+
+		Transmitter httpmdoApater = (Transmitter) UtilTools.getBean("httpmdoApater");
+		MFHttpRespInfo respInfo;
+		if(UtilTools.isNotNullAndBlank(url)){
+			respInfo = httpmdoApater.doPostDataToRespInfo(inMap,url);
+		}else{
+			respInfo = httpmdoApater.doPostDataToRespInfo(inMap);
+		}
+
+		if(respInfo!=null) {
+			Map outMap=respInfo.getParamMap();
+			D_MDOHEAD d_mdohead =  UtilTools.map2Obj(outMap, D_MDOHEAD.class);
+			D_MDO0073 d_mdo0073 =  UtilTools.map2Obj(outMap, D_MDO0073.class);
+			model.setD_mdohead(d_mdohead);
+			model.setD_mdo0073(d_mdo0073);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(MDO0073BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MDO0073BaseModel execute(MDO0073BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

generated/com/miniframe/generate/comm/httpmdoapater/MDO0074Client.java

@@ -0,0 +1,99 @@
+package com.miniframe.generate.comm.httpmdoapater;
+
+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.mdo.D_MDO0074;
+import com.miniframe.generate.comm.mdo.D_MDOHEAD;
+
+import com.miniframe.generate.business.mdo.model.MDO0074BaseModel;
+
+public class MDO0074Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(MDO0074Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->流出修改设置求解组件到求解组件((MDO0074)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MDO0074BaseModel execute(MDO0074BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MDO0074BaseModel execute(MDO0074BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(MDO0074BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(MDO0074BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_mdohead().getTransCode())){
+			model.getA_mdohead().setTransCode("MDO0074");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_mdohead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_mdo0074()));
+		if(extMap!=null && extMap.size()>0){
+			inMap.putAll(extMap);
+		}
+
+		Transmitter httpmdoApater = (Transmitter) UtilTools.getBean("httpmdoApater");
+		MFHttpRespInfo respInfo;
+		if(UtilTools.isNotNullAndBlank(url)){
+			respInfo = httpmdoApater.doPostDataToRespInfo(inMap,url);
+		}else{
+			respInfo = httpmdoApater.doPostDataToRespInfo(inMap);
+		}
+
+		if(respInfo!=null) {
+			Map outMap=respInfo.getParamMap();
+			D_MDOHEAD d_mdohead =  UtilTools.map2Obj(outMap, D_MDOHEAD.class);
+			D_MDO0074 d_mdo0074 =  UtilTools.map2Obj(outMap, D_MDO0074.class);
+			model.setD_mdohead(d_mdohead);
+			model.setD_mdo0074(d_mdo0074);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(MDO0074BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MDO0074BaseModel execute(MDO0074BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

generated/com/miniframe/generate/comm/mdo/A_MDO0073.java

@@ -0,0 +1,38 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.mdo;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 来流设置
+ */
+public class A_MDO0073 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String comid;//组件ID
+	/**
+	 *组件ID
+	 */
+	public void setComid(String comid) {
+		this.comid=comid;
+	}
+	/**
+	 *组件ID
+	 */
+	public String getComid() {
+		return this.comid;
+	}
+	String comtype;//组件类型 3-ADFLOW组件 5-TACS
+	/**
+	 *组件类型 3-ADFLOW组件 5-TACS
+	 */
+	public void setComtype(String comtype) {
+		this.comtype=comtype;
+	}
+	/**
+	 *组件类型 3-ADFLOW组件 5-TACS
+	 */
+	public String getComtype() {
+		return this.comtype;
+	}
+}

generated/com/miniframe/generate/comm/mdo/A_MDO0074.java

@@ -0,0 +1,51 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.mdo;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 流出修改设置求解组件到求解组件
+ */
+public class A_MDO0074 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String comid;//组件ID
+	/**
+	 *组件ID
+	 */
+	public void setComid(String comid) {
+		this.comid=comid;
+	}
+	/**
+	 *组件ID
+	 */
+	public String getComid() {
+		return this.comid;
+	}
+	String comtype;//组件类型 1-XFOIL 3-ADFLOW组件 5-TACS
+	/**
+	 *组件类型 1-XFOIL 3-ADFLOW组件 5-TACS
+	 */
+	public void setComtype(String comtype) {
+		this.comtype=comtype;
+	}
+	/**
+	 *组件类型 1-XFOIL 3-ADFLOW组件 5-TACS
+	 */
+	public String getComtype() {
+		return this.comtype;
+	}
+	String paramstr;//参数ID-流类型1启用0关闭之间逗号分割 多条数据分号分隔
+	/**
+	 *参数ID-流类型1启用0关闭之间逗号分割 多条数据分号分隔
+	 */
+	public void setParamstr(String paramstr) {
+		this.paramstr=paramstr;
+	}
+	/**
+	 *参数ID-流类型1启用0关闭之间逗号分割 多条数据分号分隔
+	 */
+	public String getParamstr() {
+		return this.paramstr;
+	}
+}

generated/com/miniframe/generate/comm/mdo/D_MDO0073.java

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

generated/com/miniframe/generate/comm/mdo/D_MDO0074.java

@@ -0,0 +1,12 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.mdo;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 流出修改设置求解组件到求解组件
+ */
+public class D_MDO0074 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+}

generated/validateform/a_mdo0073Form.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_mdo0073Form">
+<field property="comid" depends="required">
+    <arg0 key="a_mdo0073.comid"/>
+</field>
+<field property="comtype" depends="required">
+    <arg0 key="a_mdo0073.comtype"/>
+</field>
+</form>
+</formset>
+</form-validation>

generated/validateform/a_mdo0074Form.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_mdo0074Form">
+<field property="comid" depends="required">
+    <arg0 key="a_mdo0074.comid"/>
+</field>
+<field property="comtype" depends="required">
+    <arg0 key="a_mdo0074.comtype"/>
+</field>
+</form>
+</formset>
+</form-validation>

generated/validator/resources_a_mdo0073Form_validator.properties

@@ -0,0 +1,3 @@
+a_mdo0073.comid = \u7EC4\u4EF6ID
+a_mdo0073.comtype = \u7EC4\u4EF6\u7C7B\u578B3-ADFLOW\u7EC4\u4EF65-TACS
+a_mdo0073Form = true

generated/validator/resources_a_mdo0073Form_validator_zh_CN.properties

@@ -0,0 +1,3 @@
+a_mdo0073.comid = \u7EC4\u4EF6ID
+a_mdo0073.comtype = \u7EC4\u4EF6\u7C7B\u578B3-ADFLOW\u7EC4\u4EF65-TACS
+a_mdo0073Form = true

generated/validator/resources_a_mdo0074Form_validator.properties

@@ -0,0 +1,4 @@
+a_mdo0074.comid = \u7EC4\u4EF6ID
+a_mdo0074.comtype = \u7EC4\u4EF6\u7C7B\u578B1-XFOIL3-ADFLOW\u7EC4\u4EF65-TACS
+a_mdo0074.paramstr = \u53C2\u6570ID-\u6D41\u7C7B\u578B1\u542F\u75280\u5173\u95ED\u4E4B\u95F4\u9017\u53F7\u5206\u5272\u591A\u6761\u6570\u636E\u5206\u53F7\u5206\u9694
+a_mdo0074Form = true

generated/validator/resources_a_mdo0074Form_validator_zh_CN.properties

@@ -0,0 +1,4 @@
+a_mdo0074.comid = \u7EC4\u4EF6ID
+a_mdo0074.comtype = \u7EC4\u4EF6\u7C7B\u578B1-XFOIL3-ADFLOW\u7EC4\u4EF65-TACS
+a_mdo0074.paramstr = \u53C2\u6570ID-\u6D41\u7C7B\u578B1\u542F\u75280\u5173\u95ED\u4E4B\u95F4\u9017\u53F7\u5206\u5272\u591A\u6761\u6570\u636E\u5206\u53F7\u5206\u9694
+a_mdo0074Form = true

generated/validator/resources_d_mdo0073Form_validator.properties

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

generated/validator/resources_d_mdo0073Form_validator_zh_CN.properties

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

generated/validator/resources_d_mdo0074Form_validator.properties

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

generated/validator/resources_d_mdo0074Form_validator_zh_CN.properties

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

src/main/java/com/miniframe/bisiness/mdo/MDO0039Service.java

@@ -187,7 +187,7 @@ public class MDO0039Service extends MDO0039BaseModel implements ExecProcessFlow
 		surrMonitor.start();
 		FileMonitor crmMonitor = new FileMonitor(1000);
 		CRMFileListener crml = new CRMFileListener(pid);
-		crmMonitor.monitor("/cephfs/mdo/"+pid+"/in/myid_0/ADflow/results/aerodynamic", crml);
+		crmMonitor.monitor("/cephfs/mdo/"+pid+"/in/myid_0/aeroelastic/results/aerodynamic", crml);
 		crmMonitor.start();
 
 		LogService.addLog(pid,"求解——————————————————开始");
@@ -237,7 +237,7 @@ public class MDO0039Service extends MDO0039BaseModel implements ExecProcessFlow
 				surrMonitor.stop();
 				SurromdaoFileRead.readFile(new File("/cephfs/mdo/"+pid+"/in/myid_0/surromdao_history_all.dat"),pid);
 				crmMonitor.stop();
-				CRMFileRead.readFile(new File("/cephfs/mdo/"+pid+"/in/myid_0/ADflow/results/aerodynamic/CRM_final_000_slices.dat"),pid);
+				CRMFileRead.readFile(new File("/cephfs/mdo/"+pid+"/in/myid_0/aeroelastic/results/aerodynamic/CRM_final_000_slices.dat"),pid);
 			} catch (Exception e) {
 				e.printStackTrace();
 			}

src/main/java/com/miniframe/bisiness/mdo/MDO0044Service.java

@@ -70,7 +70,8 @@ public class MDO0044Service extends MDO0044BaseModel implements ExecProcessFlow
 			ffdDao.insert(f);
 		}
 		ProFfdCstService.delCst(pid);
-		FfdCom.saveVarByFfd(f);
+		FfdCom.deleVarByFfd(f);
+//		FfdCom.saveVarByFfd(f);
 	}
 	
 	/**

src/main/java/com/miniframe/bisiness/mdo/MDO0067Service.java

@@ -96,7 +96,8 @@ public class MDO0067Service extends MDO0067BaseModel implements ExecProcessFlow
 			insetInoutPara(outParams, m.getId(),2,pid);
 		}
 
-		TacsCom.saveVarByTacs(m);
+//		TacsCom.saveVarByTacs(m);
+		TacsCom.deleVarByTacs(m);
 
 		this.getD_mdo0067().setTacsid(m.getId());
 	}

src/main/java/com/miniframe/bisiness/mdo/MDO0073Service.java

@@ -0,0 +1,72 @@
+package com.miniframe.bisiness.mdo;
+
+import java.util.Map;
+
+import com.deepoove.poi.data.SeriesRenderData;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.appcode.ComType;
+import com.miniframe.generate.business.mdo.model.MDO0073BaseModel;
+import com.miniframe.mdo.component.FfdCom;
+import com.miniframe.mdo.component.TacsCom;
+import com.miniframe.model.mdo.MdoProFfd;
+import com.miniframe.model.mdo.MdoProTacs;
+import com.miniframe.model.mdo.dao.MdoProFfdMapper;
+import com.miniframe.model.mdo.dao.MdoProTacsMapper;
+
+/**
+ * 西工大系统,“来流设置”逻辑处理（重新生成不覆盖）。
+ */
+public class MDO0073Service extends MDO0073BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 西工大系统,“来流设置”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+	 String comid =this.getA_mdo0073().getComid();
+	 String comtype =this.getA_mdo0073().getComtype();
+	 if(ComType.FFD.getIndex().equals(comtype)){
+		 MdoProFfdMapper ffdDao = UtilTools.getBean(MdoProFfdMapper.class);
+		 MdoProFfd ffd = ffdDao.selectByPrimaryKey(comid);
+		 if(ffd!=null){
+		 	FfdCom.saveVarByFfd(ffd);
+		 }
+	 }else if(ComType.TACS.getIndex().equals(comtype)){
+		 MdoProTacsMapper tacsDao = UtilTools.getBean(MdoProTacsMapper.class);
+		 MdoProTacs tasc = tacsDao.selectByPrimaryKey(comid);
+		 if(tasc!=null){
+			 TacsCom.saveVarByTacs(tasc);
+		 }
+	 }
+	}
+	
+	/**
+	 * 西工大系统,“来流设置”业务前处理
+ 	 */
+	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/mdo/MDO0074Service.java

@@ -0,0 +1,68 @@
+package com.miniframe.bisiness.mdo;
+
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.appcode.ComType;
+import com.miniframe.generate.business.mdo.model.MDO0074BaseModel;
+import com.miniframe.model.mdo.MdoProInoutPara;
+import com.miniframe.model.mdo.dao.MdoProInoutParaMapper;
+
+/**
+ * 西工大系统,“流出修改设置求解组件到求解组件”逻辑处理（重新生成不覆盖）。
+ */
+public class MDO0074Service extends MDO0074BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 西工大系统,“流出修改设置求解组件到求解组件”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		String comid = this.getA_mdo0074().getComid();
+		String comtype = this.getA_mdo0074().getComtype();
+		String paramstr =this.getA_mdo0074().getParamstr();
+		String[] params = paramstr.split(";");
+		for (String p:params) {
+			String[] pt = p.split(",");
+			String paramid = pt[0];
+			String streamflag = pt[1];
+			MdoProInoutParaMapper pdao = UtilTools.getBean(MdoProInoutParaMapper.class);
+			MdoProInoutPara para = pdao.selectByPrimaryKey(paramid);
+			if(para!=null){
+				para.setSteamflag(Integer.valueOf(streamflag));
+				para.setSteamtype(3);
+				pdao.updateByPrimaryKey(para);
+			}
+		}
+	}
+
+	
+	/**
+	 * 西工大系统,“流出修改设置求解组件到求解组件”业务前处理
+ 	 */
+	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/mdo/component/FfdCom.java

@@ -40,7 +40,7 @@ public class FfdCom {
         }
 
     }
-    private static void deleVarByFfd(MdoProFfd ffd) {
+    public static void deleVarByFfd(MdoProFfd ffd) {
         MdoProjectVariateMapper varDao = UtilTools.getBean(MdoProjectVariateMapper.class);
         MdoProjectVariateSQLBuilder  varsb= new MdoProjectVariateSQLBuilder();
         MdoProjectVariateSQLBuilder.Criteria varsc = varsb.createCriteria();

src/main/java/com/miniframe/mdo/component/TacsCom.java

@@ -36,7 +36,7 @@ public class TacsCom {
         }
 
     }
-    private static void deleVarByTacs(MdoProTacs tacs) {
+    public static void deleVarByTacs(MdoProTacs tacs) {
         MdoProjectVariateMapper varDao = UtilTools.getBean(MdoProjectVariateMapper.class);
         MdoProjectVariateSQLBuilder  varsb= new MdoProjectVariateSQLBuilder();
         MdoProjectVariateSQLBuilder.Criteria varsc = varsb.createCriteria();

src/main/java/com/miniframe/modo/temp/problem/WorkflowVo.java

@@ -1,13 +1,11 @@
 package com.miniframe.modo.temp.problem;
 
+import com.miniframe.model.mdo.MdoProMathfunc;
+import lombok.Data;
+
+@Data
 public class WorkflowVo {
     private HeaderVo header;
+    private MdoProMathfunc func;
 
-    public HeaderVo getHeader() {
-        return header;
-    }
-
-    public void setHeader(HeaderVo header) {
-        this.header = header;
-    }
 }

src/test/java/com/miniframe/comm/httpmdoapater/MDO0073Test.java

@@ -0,0 +1,44 @@
+package com.miniframe.comm.httpmdoapater;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.miniframe.comm.httpmdoapater.HttpmdoapaterUtil;
+import com.miniframe.generate.comm.mdo.A_MDO0073;
+import com.miniframe.generate.comm.httpmdoapater.MDO0073Client;
+import com.miniframe.generate.business.mdo.model.MDO0073BaseModel;
+
+public class MDO0073Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(MDO0073Test.class);
+
+	/**
+	 * 来流设置，获取报文体
+	 * @return
+	 */
+	public static A_MDO0073 getA_mdo0073() {
+		A_MDO0073 a_mdo0073 = new A_MDO0073();
+
+		// ----------以下增加【来流设置】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_mdo0073;
+	}
+	
+	/**
+	 * 运行客户端测试，来流设置
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		MDO0073BaseModel model = new MDO0073BaseModel();
+		model.setA_mdohead(HttpmdoapaterUtil.getA_mdohead("MDO0073"));
+		model.setA_mdo0073(MDO0073Test.getA_mdo0073());
+		MDO0073Client client = new MDO0073Client();
+		logger.error("客户端发送前总线：\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线：\r\n"+model);
+	}
+}

src/test/java/com/miniframe/comm/httpmdoapater/MDO0074Test.java

@@ -0,0 +1,44 @@
+package com.miniframe.comm.httpmdoapater;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.miniframe.comm.httpmdoapater.HttpmdoapaterUtil;
+import com.miniframe.generate.comm.mdo.A_MDO0074;
+import com.miniframe.generate.comm.httpmdoapater.MDO0074Client;
+import com.miniframe.generate.business.mdo.model.MDO0074BaseModel;
+
+public class MDO0074Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(MDO0074Test.class);
+
+	/**
+	 * 流出修改设置求解组件到求解组件，获取报文体
+	 * @return
+	 */
+	public static A_MDO0074 getA_mdo0074() {
+		A_MDO0074 a_mdo0074 = new A_MDO0074();
+
+		// ----------以下增加【流出修改设置求解组件到求解组件】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_mdo0074;
+	}
+	
+	/**
+	 * 运行客户端测试，流出修改设置求解组件到求解组件
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		MDO0074BaseModel model = new MDO0074BaseModel();
+		model.setA_mdohead(HttpmdoapaterUtil.getA_mdohead("MDO0074"));
+		model.setA_mdo0074(MDO0074Test.getA_mdo0074());
+		MDO0074Client client = new MDO0074Client();
+		logger.error("客户端发送前总线：\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线：\r\n"+model);
+	}
+}

系统设计/系统模块/MDO(西工大系统).csv

@@ -80,3 +80,6 @@
 100071,MDO0071,FSI删除,service,
 
 100072,MDO0072,bdf文件解析,service,
+
+100073,MDO0073,来流设置,service,
+100074,MDO0074,流出修改设置求解组件到求解组件,service,

系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0073_A(来流设置).csv

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

系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0073_D(来流设置).csv

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

系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0074_A(流出修改设置求解组件到求解组件).csv

@@ -0,0 +1,4 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,comid,组件ID,string,,,是,,,,,,,,
+2,comtype,组件类型 1-XFOIL 3-ADFLOW组件 5-TACS,String,,,是,,,,,,,,
+3,paramstr,参数ID-流类型1启用0关闭之间逗号分割 多条数据分号分隔,string,,,,,,,,,,,

系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0074_D(流出修改设置求解组件到求解组件).csv

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