huangxingxing 6 ماه پیش
والد
کامیت
ddf6eebd0b
52فایلهای تغییر یافته به همراه2495 افزوده شده و 25 حذف شده
  1. 5 0
      dbscript/init/generate/01-appcodeInit.sql
  2. 7 0
      dbscript/init/generate/03-functionInit.sql
  3. 68 0
      definitionsrc/com/miniframe/generate/appcode/ComType.java
  4. 112 0
      generated/com/miniframe/generate/business/mdo/model/MDO0052BaseModel.java
  5. 112 0
      generated/com/miniframe/generate/business/mdo/model/MDO0053BaseModel.java
  6. 99 0
      generated/com/miniframe/generate/comm/httpmdoapater/MDO0052Client.java
  7. 99 0
      generated/com/miniframe/generate/comm/httpmdoapater/MDO0053Client.java
  8. 38 0
      generated/com/miniframe/generate/comm/mdo/A_MDO0052.java
  9. 25 0
      generated/com/miniframe/generate/comm/mdo/A_MDO0053.java
  10. 26 0
      generated/com/miniframe/generate/comm/mdo/D_MDO0052.java
  11. 90 0
      generated/com/miniframe/generate/comm/mdo/D_MDO0052_PARAMS_RECODE.java
  12. 12 0
      generated/com/miniframe/generate/comm/mdo/D_MDO0053.java
  13. 15 0
      generated/validateform/a_mdo0052Form.xml
  14. 12 0
      generated/validateform/d_mdo0053Form.xml
  15. 3 0
      generated/validator/resources_a_mdo0052Form_validator.properties
  16. 3 0
      generated/validator/resources_a_mdo0052Form_validator_zh_CN.properties
  17. 2 0
      generated/validator/resources_a_mdo0053Form_validator.properties
  18. 2 0
      generated/validator/resources_a_mdo0053Form_validator_zh_CN.properties
  19. 1 0
      generated/validator/resources_d_mdo0052Form_validator.properties
  20. 1 0
      generated/validator/resources_d_mdo0052Form_validator_zh_CN.properties
  21. 7 0
      generated/validator/resources_d_mdo0052_params_recodeForm_validator.properties
  22. 7 0
      generated/validator/resources_d_mdo0052_params_recodeForm_validator_zh_CN.properties
  23. 1 0
      generated/validator/resources_d_mdo0053Form_validator.properties
  24. 1 0
      generated/validator/resources_d_mdo0053Form_validator_zh_CN.properties
  25. 74 5
      modelsrc/com/miniframe/model/mdo/MdoProInoutPara.java
  26. 180 0
      modelsrc/com/miniframe/model/mdo/MdoProInoutParaSQLBuilder.java
  27. 92 0
      modelsrc/com/miniframe/model/mdo/MdoProjectConstraint.java
  28. 270 0
      modelsrc/com/miniframe/model/mdo/MdoProjectConstraintSQLBuilder.java
  29. 92 0
      modelsrc/com/miniframe/model/mdo/MdoProjectObjfun.java
  30. 270 0
      modelsrc/com/miniframe/model/mdo/MdoProjectObjfunSQLBuilder.java
  31. 69 0
      modelsrc/com/miniframe/model/mdo/MdoProjectVariate.java
  32. 210 0
      modelsrc/com/miniframe/model/mdo/MdoProjectVariateSQLBuilder.java
  33. 1 1
      modelsrc/com/miniframe/model/mdo/dbconfig/MapperConfig-mdo.xml
  34. 1 1
      modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml
  35. 0 1
      profiles/dev/application-dev.properties
  36. 0 1
      src/main/java/com/miniframe/bisiness/mdo/MDO0039Service.java
  37. 6 4
      src/main/java/com/miniframe/bisiness/mdo/MDO0041Service.java
  38. 2 0
      src/main/java/com/miniframe/bisiness/mdo/MDO0047Service.java
  39. 74 0
      src/main/java/com/miniframe/bisiness/mdo/MDO0052Service.java
  40. 142 0
      src/main/java/com/miniframe/bisiness/mdo/MDO0053Service.java
  41. 48 0
      src/main/java/com/miniframe/bisiness/system/SYSTEMService.java
  42. 88 0
      src/main/java/com/miniframe/mdo/component/CstCom.java
  43. 15 11
      src/main/java/com/miniframe/modo/temp/TemplateGenerator.java
  44. 44 0
      src/test/java/com/miniframe/comm/httpmdoapater/MDO0052Test.java
  45. 44 0
      src/test/java/com/miniframe/comm/httpmdoapater/MDO0053Test.java
  46. 6 0
      系统设计/数据定义/标准数据/ComType(组件类型).csv
  47. 3 1
      系统设计/数据定义/返 回 码/business(业务系统).csv
  48. 2 0
      系统设计/系统模块/MDO(西工大系统).csv
  49. 3 0
      系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0052_A(流查询).csv
  50. 8 0
      系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0052_D(流查询).csv
  51. 2 0
      系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0053_A(流修改).csv
  52. 1 0
      系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0053_D(流修改).csv

+ 5 - 0
dbscript/init/generate/01-appcodeInit.sql

@@ -31,6 +31,11 @@ INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_D
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('companyType12','service','companyType', 'liquidatingGroup', '11','破产清算组',12);
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('companyType13','service','companyType', 'foreignEnterprise', '12','外国企业',13);
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('companyType14','service','companyType', 'goverment', '13','政府',14);
+-- 组件类型
+INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('ComType1','service','ComType', 'CST', '0','cst组件',1);
+INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('ComType2','service','ComType', 'XFOIL', '1','xfoil组件',2);
+INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('ComType3','service','ComType', 'FFD', '2','ffd组件',3);
+INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('ComType4','service','ComType', 'ADFLOW', '3','adflow组件',4);
 -- 文件类型
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('fileType1','service','fileType', 'audio', '1','录音',1);
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('fileType2','service','fileType', 'image', '2','照片',2);

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

@@ -43,6 +43,13 @@ INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MD
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0044', '西工大系统','ffd参数添加修改',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0045', '西工大系统','ffd参数删除',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0046', '西工大系统','xfoil参数查询',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0047', '西工大系统','xfoil参数添加修改',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0048', '西工大系统','xfoil参数删除',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0049', '西工大系统','adflow参数查询',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0050', '西工大系统','adflow添加修改',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0051', '西工大系统','adflow删除',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0052', '西工大系统','流查询',true);
+INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('MDO0053', '西工大系统','流修改',true);
 -- 基础系统
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('SYSTEM', '基础系统','系统内部服务',true);
 INSERT INTO SYS_FUNCTION(FUNCTIONID, CLASSNAME, FUNCTIONNAME ,ENABLE)VALUES ('A00000', '基础系统','获取图片验证码',true);

+ 68 - 0
definitionsrc/com/miniframe/generate/appcode/ComType.java

@@ -0,0 +1,68 @@
+package com.miniframe.generate.appcode;
+
+/**
+ * 组件类型
+ */
+public enum ComType {
+
+	CST("CST", "0", "cst组件"),
+	XFOIL("XFOIL", "1", "xfoil组件"),
+	FFD("FFD", "2", "ffd组件"),
+	ADFLOW("ADFLOW", "3", "adflow组件");
+
+	// 成员变量
+	private String index; // value
+	private String name; // key
+	private String desc; // 描述
+	
+	/**
+	 * 构造方法
+	 * @param name
+	 * @param index
+	 * @param desc
+	 */
+	private ComType(String name, String index, String desc) {
+		this.name = name;
+		this.index = index;
+		this.desc = desc;
+	}
+
+	/**
+	 * 通过index获取对象
+	 * 
+	 * @param index
+	 * @return
+	 */
+	public static ComType getComType(String index) {
+		for (ComType c : ComType.values()) {
+			if (c.getIndex().equals(index)) {
+				return c;
+			}
+		}
+		return null;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getIndex() {
+		return index;
+	}
+
+	public void setIndex(String index) {
+		this.index = index;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+}

+ 112 - 0
generated/com/miniframe/generate/business/mdo/model/MDO0052BaseModel.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_MDO0052;
+import com.miniframe.generate.comm.mdo.D_MDO0052;
+
+/**
+ * 系统服务,“流查询”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class MDO0052BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_MDOHEAD a_mdohead;//上行头
+	D_MDOHEAD d_mdohead;//下行头
+	A_MDO0052 a_mdo0052;//上行体
+	D_MDO0052 d_mdo0052;//下行体
+
+	public MDO0052BaseModel(){
+		a_mdohead=new A_MDOHEAD();
+		d_mdohead=new D_MDOHEAD();
+		a_mdo0052=new A_MDO0052();
+		d_mdo0052=new D_MDO0052();
+	}
+
+	public void validater() throws Exception {
+		this.a_mdohead.validater();
+		this.a_mdo0052.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_MDO0052.class);
+		this.a_mdo0052 = UtilTools.map2Obj(bodyMap, A_MDO0052.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_mdo0052));
+
+		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_MDO0052 getA_mdo0052() {
+		return a_mdo0052;
+	}
+
+	public void setA_mdo0052(A_MDO0052 a_mdo0052) {
+		this.a_mdo0052=a_mdo0052;
+	}
+
+	public D_MDO0052 getD_mdo0052() {
+		return this.d_mdo0052;
+	}
+
+	public void setD_mdo0052(D_MDO0052 d_mdo0052) {
+		this.d_mdo0052=d_mdo0052;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 112 - 0
generated/com/miniframe/generate/business/mdo/model/MDO0053BaseModel.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_MDO0053;
+import com.miniframe.generate.comm.mdo.D_MDO0053;
+
+/**
+ * 系统服务,“流修改”模型类(不要维护,重新生成将覆盖)。
+ */
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class MDO0053BaseModel extends BaseMapModel {
+
+	private static final long serialVersionUID = -1326184831746814093L;
+
+	A_MDOHEAD a_mdohead;//上行头
+	D_MDOHEAD d_mdohead;//下行头
+	A_MDO0053 a_mdo0053;//上行体
+	D_MDO0053 d_mdo0053;//下行体
+
+	public MDO0053BaseModel(){
+		a_mdohead=new A_MDOHEAD();
+		d_mdohead=new D_MDOHEAD();
+		a_mdo0053=new A_MDO0053();
+		d_mdo0053=new D_MDO0053();
+	}
+
+	public void validater() throws Exception {
+		this.a_mdohead.validater();
+		this.a_mdo0053.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_MDO0053.class);
+		this.a_mdo0053 = UtilTools.map2Obj(bodyMap, A_MDO0053.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_mdo0053));
+
+		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_MDO0053 getA_mdo0053() {
+		return a_mdo0053;
+	}
+
+	public void setA_mdo0053(A_MDO0053 a_mdo0053) {
+		this.a_mdo0053=a_mdo0053;
+	}
+
+	public D_MDO0053 getD_mdo0053() {
+		return this.d_mdo0053;
+	}
+
+	public void setD_mdo0053(D_MDO0053 d_mdo0053) {
+		this.d_mdo0053=d_mdo0053;
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return UtilTools.obj2Json(this,true);
+		} catch (IOException e) {
+			return "";
+		}
+	}
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpmdoapater/MDO0052Client.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_MDO0052;
+import com.miniframe.generate.comm.mdo.D_MDOHEAD;
+
+import com.miniframe.generate.business.mdo.model.MDO0052BaseModel;
+
+public class MDO0052Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(MDO0052Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->流查询((MDO0052)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MDO0052BaseModel execute(MDO0052BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MDO0052BaseModel execute(MDO0052BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(MDO0052BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(MDO0052BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_mdohead().getTransCode())){
+			model.getA_mdohead().setTransCode("MDO0052");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_mdohead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_mdo0052()));
+		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_MDO0052 d_mdo0052 =  UtilTools.map2Obj(outMap, D_MDO0052.class);
+			model.setD_mdohead(d_mdohead);
+			model.setD_mdo0052(d_mdo0052);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(MDO0052BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MDO0052BaseModel execute(MDO0052BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

+ 99 - 0
generated/com/miniframe/generate/comm/httpmdoapater/MDO0053Client.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_MDO0053;
+import com.miniframe.generate.comm.mdo.D_MDOHEAD;
+
+import com.miniframe.generate.business.mdo.model.MDO0053BaseModel;
+
+public class MDO0053Client {
+
+	private static final Logger logger = LoggerFactory.getLogger(MDO0053Client.class);
+	private MFHttpRespInfo respInfo;
+
+	public MFHttpRespInfo getRespInfo(){
+		return respInfo;
+	}
+
+	/**
+	 * 调用 [系统服务->流修改((MDO0053)]的通讯接口
+	 * @param model 接口模型
+	 * @param extMap 扩展输入
+	 * @param url 请求地址
+	 * @return model 接口模型
+	 * @throws Exception
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MDO0053BaseModel execute(MDO0053BaseModel model,final Map extMap,final String url) throws Exception {
+		this.executeToRespInfo(model,extMap,url);
+		return model;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MDO0053BaseModel execute(MDO0053BaseModel model,final Map extMap) throws Exception {
+		this.executeToRespInfo(model,extMap,null);
+		return model;
+	}
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MFHttpRespInfo executeToRespInfo(MDO0053BaseModel model,final Map extMap,final String url) throws Exception {
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(MDO0053BaseModel) - start");
+		}
+
+		if(UtilTools.isNullOrBlank(model.getA_mdohead().getTransCode())){
+			model.getA_mdohead().setTransCode("MDO0053");
+		}
+
+		Map inMap = new LinkedHashMap();
+		inMap.putAll(UtilTools.obj2Map(model.getA_mdohead()));
+		inMap.putAll(UtilTools.obj2Map(model.getA_mdo0053()));
+		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_MDO0053 d_mdo0053 =  UtilTools.map2Obj(outMap, D_MDO0053.class);
+			model.setD_mdohead(d_mdohead);
+			model.setD_mdo0053(d_mdo0053);
+
+
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("execute(MDO0053BaseModel) - end");
+		}
+
+        this.respInfo=respInfo;
+
+		return respInfo;
+	}
+
+
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public MDO0053BaseModel execute(MDO0053BaseModel model) throws Exception {
+		return this.execute(model,null,null);
+	}
+
+
+}

+ 38 - 0
generated/com/miniframe/generate/comm/mdo/A_MDO0052.java

@@ -0,0 +1,38 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.mdo;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 流查询
+ */
+public class A_MDO0052 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String pid;//项目ID
+	/**
+	 *项目ID
+	 */
+	public void setPid(String pid) {
+		this.pid=pid;
+	}
+	/**
+	 *项目ID
+	 */
+	public String getPid() {
+		return this.pid;
+	}
+	String comid;//组件ID
+	/**
+	 *组件ID
+	 */
+	public void setComid(String comid) {
+		this.comid=comid;
+	}
+	/**
+	 *组件ID
+	 */
+	public String getComid() {
+		return this.comid;
+	}
+}

+ 25 - 0
generated/com/miniframe/generate/comm/mdo/A_MDO0053.java

@@ -0,0 +1,25 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.mdo;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 流修改
+ */
+public class A_MDO0053 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String paramstr;//参数ID-流分析-流类型之间逗号分割 多条数据分号分隔
+	/**
+	 *参数ID-流分析-流类型之间逗号分割 多条数据分号分隔
+	 */
+	public void setParamstr(String paramstr) {
+		this.paramstr=paramstr;
+	}
+	/**
+	 *参数ID-流分析-流类型之间逗号分割 多条数据分号分隔
+	 */
+	public String getParamstr() {
+		return this.paramstr;
+	}
+}

+ 26 - 0
generated/com/miniframe/generate/comm/mdo/D_MDO0052.java

@@ -0,0 +1,26 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.mdo;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+import java.util.*;
+/**
+ * 流查询
+ */
+public class D_MDO0052 extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	List <D_MDO0052_PARAMS_RECODE> params;//分析参数数据
+	/**
+	 *分析参数数据
+	 */
+	public void setParams(List <D_MDO0052_PARAMS_RECODE> params) {
+		this.params=params;
+	}
+	/**
+	 *分析参数数据
+	 */
+	public List <D_MDO0052_PARAMS_RECODE> getParams() {
+		return this.params;
+	}
+}

+ 90 - 0
generated/com/miniframe/generate/comm/mdo/D_MDO0052_PARAMS_RECODE.java

@@ -0,0 +1,90 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.mdo;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 流查询->分析参数数据
+ */
+public class D_MDO0052_PARAMS_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String paramid;//参数ID
+	/**
+	 *参数ID
+	 */
+	public void setParamid(String paramid) {
+		this.paramid=paramid;
+	}
+	/**
+	 *参数ID
+	 */
+	public String getParamid() {
+		return this.paramid;
+	}
+	String code;//编号
+	/**
+	 *编号
+	 */
+	public void setCode(String code) {
+		this.code=code;
+	}
+	/**
+	 *编号
+	 */
+	public String getCode() {
+		return this.code;
+	}
+	String name;//名称
+	/**
+	 *名称
+	 */
+	public void setName(String name) {
+		this.name=name;
+	}
+	/**
+	 *名称
+	 */
+	public String getName() {
+		return this.name;
+	}
+	int comtype;//组件类型
+	/**
+	 *组件类型
+	 */
+	public void setComtype(int comtype) {
+		this.comtype=comtype;
+	}
+	/**
+	 *组件类型
+	 */
+	public int getComtype() {
+		return this.comtype;
+	}
+	int steamflag;//流分析 1 启用 0 关闭
+	/**
+	 *流分析 1 启用 0 关闭
+	 */
+	public void setSteamflag(int steamflag) {
+		this.steamflag=steamflag;
+	}
+	/**
+	 *流分析 1 启用 0 关闭
+	 */
+	public int getSteamflag() {
+		return this.steamflag;
+	}
+	int steamtype;//流分析类型 1 约束条件 2优化目标
+	/**
+	 *流分析类型 1 约束条件 2优化目标
+	 */
+	public void setSteamtype(int steamtype) {
+		this.steamtype=steamtype;
+	}
+	/**
+	 *流分析类型 1 约束条件 2优化目标
+	 */
+	public int getSteamtype() {
+		return this.steamtype;
+	}
+}

+ 12 - 0
generated/com/miniframe/generate/comm/mdo/D_MDO0053.java

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

+ 15 - 0
generated/validateform/a_mdo0052Form.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_mdo0052Form">
+<field property="pid" depends="required">
+    <arg0 key="a_mdo0052.pid"/>
+</field>
+<field property="comid" depends="required">
+    <arg0 key="a_mdo0052.comid"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 12 - 0
generated/validateform/d_mdo0053Form.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="d_mdo0053Form">
+<field property="pid" depends="required">
+    <arg0 key="d_mdo0053.pid"/>
+</field>
+</form>
+</formset>
+</form-validation>

+ 3 - 0
generated/validator/resources_a_mdo0052Form_validator.properties

@@ -0,0 +1,3 @@
+a_mdo0052.pid = \u9879\u76EEID
+a_mdo0052.comid = \u7EC4\u4EF6ID
+a_mdo0052Form = true

+ 3 - 0
generated/validator/resources_a_mdo0052Form_validator_zh_CN.properties

@@ -0,0 +1,3 @@
+a_mdo0052.pid = \u9879\u76EEID
+a_mdo0052.comid = \u7EC4\u4EF6ID
+a_mdo0052Form = true

+ 2 - 0
generated/validator/resources_a_mdo0053Form_validator.properties

@@ -0,0 +1,2 @@
+a_mdo0053.paramstr = \u53C2\u6570ID-\u6D41\u5206\u6790-\u6D41\u7C7B\u578B\u4E4B\u95F4\u9017\u53F7\u5206\u5272\u591A\u6761\u6570\u636E\u5206\u53F7\u5206\u9694
+a_mdo0053Form = true

+ 2 - 0
generated/validator/resources_a_mdo0053Form_validator_zh_CN.properties

@@ -0,0 +1,2 @@
+a_mdo0053.paramstr = \u53C2\u6570ID-\u6D41\u5206\u6790-\u6D41\u7C7B\u578B\u4E4B\u95F4\u9017\u53F7\u5206\u5272\u591A\u6761\u6570\u636E\u5206\u53F7\u5206\u9694
+a_mdo0053Form = true

+ 1 - 0
generated/validator/resources_d_mdo0052Form_validator.properties

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

+ 1 - 0
generated/validator/resources_d_mdo0052Form_validator_zh_CN.properties

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

+ 7 - 0
generated/validator/resources_d_mdo0052_params_recodeForm_validator.properties

@@ -0,0 +1,7 @@
+d_mdo0052_params_recode.paramid = \u53C2\u6570ID
+d_mdo0052_params_recode.code = \u7F16\u53F7
+d_mdo0052_params_recode.name = \u540D\u79F0
+d_mdo0052_params_recode.comtype = \u7EC4\u4EF6\u7C7B\u578B
+d_mdo0052_params_recode.steamflag = \u6D41\u5206\u67901\u542F\u75280\u5173\u95ED
+d_mdo0052_params_recode.steamtype = \u6D41\u5206\u6790\u7C7B\u578B1\u7EA6\u675F\u6761\u4EF62\u4F18\u5316\u76EE\u6807
+d_mdo0052_params_recodeForm = true

+ 7 - 0
generated/validator/resources_d_mdo0052_params_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,7 @@
+d_mdo0052_params_recode.paramid = \u53C2\u6570ID
+d_mdo0052_params_recode.code = \u7F16\u53F7
+d_mdo0052_params_recode.name = \u540D\u79F0
+d_mdo0052_params_recode.comtype = \u7EC4\u4EF6\u7C7B\u578B
+d_mdo0052_params_recode.steamflag = \u6D41\u5206\u67901\u542F\u75280\u5173\u95ED
+d_mdo0052_params_recode.steamtype = \u6D41\u5206\u6790\u7C7B\u578B1\u7EA6\u675F\u6761\u4EF62\u4F18\u5316\u76EE\u6807
+d_mdo0052_params_recodeForm = true

+ 1 - 0
generated/validator/resources_d_mdo0053Form_validator.properties

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

+ 1 - 0
generated/validator/resources_d_mdo0053Form_validator_zh_CN.properties

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

+ 74 - 5
modelsrc/com/miniframe/model/mdo/MdoProInoutPara.java

@@ -15,7 +15,7 @@ public class MdoProInoutPara extends MiniserviceBaseModel implements Serializabl
     private String pid;
 
     /**
-     * xfoil 编号 or Adflow 编号
+     * 组件ID
      */
     private String fatherid;
 
@@ -44,6 +44,21 @@ public class MdoProInoutPara extends MiniserviceBaseModel implements Serializabl
      */
     private Integer type;
 
+    /**
+     * 组件类型
+     */
+    private Integer comtype;
+
+    /**
+     * 流分析 1 启用 0 关闭
+     */
+    private Integer steamflag;
+
+    /**
+     * 流分析类型 1 约束条件 2优化目标
+     */
+    private Integer steamtype;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -79,18 +94,18 @@ public class MdoProInoutPara extends MiniserviceBaseModel implements Serializabl
     }
 
     /**
-     * 获取xfoil 编号 or Adflow 编号
+     * 获取组件ID
      *
-     * @return fatherid - xfoil 编号 or Adflow 编号
+     * @return fatherid - 组件ID
      */
     public String getFatherid() {
         return fatherid;
     }
 
     /**
-     * 设置xfoil 编号 or Adflow 编号
+     * 设置组件ID
      *
-     * @param fatherid xfoil 编号 or Adflow 编号
+     * @param fatherid 组件ID
      */
     public void setFatherid(String fatherid) {
         this.fatherid = fatherid == null ? null : fatherid.trim();
@@ -185,4 +200,58 @@ public class MdoProInoutPara extends MiniserviceBaseModel implements Serializabl
     public void setType(Integer type) {
         this.type = type;
     }
+
+    /**
+     * 获取组件类型
+     *
+     * @return comtype - 组件类型
+     */
+    public Integer getComtype() {
+        return comtype;
+    }
+
+    /**
+     * 设置组件类型
+     *
+     * @param comtype 组件类型
+     */
+    public void setComtype(Integer comtype) {
+        this.comtype = comtype;
+    }
+
+    /**
+     * 获取流分析 1 启用 0 关闭
+     *
+     * @return steamflag - 流分析 1 启用 0 关闭
+     */
+    public Integer getSteamflag() {
+        return steamflag;
+    }
+
+    /**
+     * 设置流分析 1 启用 0 关闭
+     *
+     * @param steamflag 流分析 1 启用 0 关闭
+     */
+    public void setSteamflag(Integer steamflag) {
+        this.steamflag = steamflag;
+    }
+
+    /**
+     * 获取流分析类型 1 约束条件 2优化目标
+     *
+     * @return steamtype - 流分析类型 1 约束条件 2优化目标
+     */
+    public Integer getSteamtype() {
+        return steamtype;
+    }
+
+    /**
+     * 设置流分析类型 1 约束条件 2优化目标
+     *
+     * @param steamtype 流分析类型 1 约束条件 2优化目标
+     */
+    public void setSteamtype(Integer steamtype) {
+        this.steamtype = steamtype;
+    }
 }

+ 180 - 0
modelsrc/com/miniframe/model/mdo/MdoProInoutParaSQLBuilder.java

@@ -643,6 +643,186 @@ public class MdoProInoutParaSQLBuilder {
             addCriterion("type not between", value1, value2, "type");
             return (Criteria) this;
         }
+
+        public Criteria andComtypeIsNull() {
+            addCriterion("comtype is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeIsNotNull() {
+            addCriterion("comtype is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeEqualTo(Integer value) {
+            addCriterion("comtype =", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeNotEqualTo(Integer value) {
+            addCriterion("comtype <>", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeGreaterThan(Integer value) {
+            addCriterion("comtype >", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("comtype >=", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeLessThan(Integer value) {
+            addCriterion("comtype <", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeLessThanOrEqualTo(Integer value) {
+            addCriterion("comtype <=", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeIn(List<Integer> values) {
+            addCriterion("comtype in", values, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeNotIn(List<Integer> values) {
+            addCriterion("comtype not in", values, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeBetween(Integer value1, Integer value2) {
+            addCriterion("comtype between", value1, value2, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("comtype not between", value1, value2, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamflagIsNull() {
+            addCriterion("steamflag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamflagIsNotNull() {
+            addCriterion("steamflag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamflagEqualTo(Integer value) {
+            addCriterion("steamflag =", value, "steamflag");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamflagNotEqualTo(Integer value) {
+            addCriterion("steamflag <>", value, "steamflag");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamflagGreaterThan(Integer value) {
+            addCriterion("steamflag >", value, "steamflag");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamflagGreaterThanOrEqualTo(Integer value) {
+            addCriterion("steamflag >=", value, "steamflag");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamflagLessThan(Integer value) {
+            addCriterion("steamflag <", value, "steamflag");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamflagLessThanOrEqualTo(Integer value) {
+            addCriterion("steamflag <=", value, "steamflag");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamflagIn(List<Integer> values) {
+            addCriterion("steamflag in", values, "steamflag");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamflagNotIn(List<Integer> values) {
+            addCriterion("steamflag not in", values, "steamflag");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamflagBetween(Integer value1, Integer value2) {
+            addCriterion("steamflag between", value1, value2, "steamflag");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamflagNotBetween(Integer value1, Integer value2) {
+            addCriterion("steamflag not between", value1, value2, "steamflag");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamtypeIsNull() {
+            addCriterion("steamtype is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamtypeIsNotNull() {
+            addCriterion("steamtype is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamtypeEqualTo(Integer value) {
+            addCriterion("steamtype =", value, "steamtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamtypeNotEqualTo(Integer value) {
+            addCriterion("steamtype <>", value, "steamtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamtypeGreaterThan(Integer value) {
+            addCriterion("steamtype >", value, "steamtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamtypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("steamtype >=", value, "steamtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamtypeLessThan(Integer value) {
+            addCriterion("steamtype <", value, "steamtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamtypeLessThanOrEqualTo(Integer value) {
+            addCriterion("steamtype <=", value, "steamtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamtypeIn(List<Integer> values) {
+            addCriterion("steamtype in", values, "steamtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamtypeNotIn(List<Integer> values) {
+            addCriterion("steamtype not in", values, "steamtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamtypeBetween(Integer value1, Integer value2) {
+            addCriterion("steamtype between", value1, value2, "steamtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andSteamtypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("steamtype not between", value1, value2, "steamtype");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 92 - 0
modelsrc/com/miniframe/model/mdo/MdoProjectConstraint.java

@@ -42,6 +42,26 @@ public class MdoProjectConstraint extends MiniserviceBaseModel implements Serial
      */
     private String upper;
 
+    /**
+     * 分析参数ID
+     */
+    private String paraid;
+
+    /**
+     * 组件id
+     */
+    private String comid;
+
+    /**
+     * 组件类型
+     */
+    private Integer comtype;
+
+    /**
+     * 配置UID
+     */
+    private String uid;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -169,4 +189,76 @@ public class MdoProjectConstraint extends MiniserviceBaseModel implements Serial
     public void setUpper(String upper) {
         this.upper = upper == null ? null : upper.trim();
     }
+
+    /**
+     * 获取分析参数ID
+     *
+     * @return paraid - 分析参数ID
+     */
+    public String getParaid() {
+        return paraid;
+    }
+
+    /**
+     * 设置分析参数ID
+     *
+     * @param paraid 分析参数ID
+     */
+    public void setParaid(String paraid) {
+        this.paraid = paraid == null ? null : paraid.trim();
+    }
+
+    /**
+     * 获取组件id
+     *
+     * @return comid - 组件id
+     */
+    public String getComid() {
+        return comid;
+    }
+
+    /**
+     * 设置组件id
+     *
+     * @param comid 组件id
+     */
+    public void setComid(String comid) {
+        this.comid = comid == null ? null : comid.trim();
+    }
+
+    /**
+     * 获取组件类型
+     *
+     * @return comtype - 组件类型
+     */
+    public Integer getComtype() {
+        return comtype;
+    }
+
+    /**
+     * 设置组件类型
+     *
+     * @param comtype 组件类型
+     */
+    public void setComtype(Integer comtype) {
+        this.comtype = comtype;
+    }
+
+    /**
+     * 获取配置UID
+     *
+     * @return uid - 配置UID
+     */
+    public String getUid() {
+        return uid;
+    }
+
+    /**
+     * 设置配置UID
+     *
+     * @param uid 配置UID
+     */
+    public void setUid(String uid) {
+        this.uid = uid == null ? null : uid.trim();
+    }
 }

+ 270 - 0
modelsrc/com/miniframe/model/mdo/MdoProjectConstraintSQLBuilder.java

@@ -593,6 +593,276 @@ public class MdoProjectConstraintSQLBuilder {
             addCriterion("upper not between", value1, value2, "upper");
             return (Criteria) this;
         }
+
+        public Criteria andParaidIsNull() {
+            addCriterion("paraid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidIsNotNull() {
+            addCriterion("paraid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidEqualTo(String value) {
+            addCriterion("paraid =", value, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidNotEqualTo(String value) {
+            addCriterion("paraid <>", value, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidGreaterThan(String value) {
+            addCriterion("paraid >", value, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidGreaterThanOrEqualTo(String value) {
+            addCriterion("paraid >=", value, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidLessThan(String value) {
+            addCriterion("paraid <", value, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidLessThanOrEqualTo(String value) {
+            addCriterion("paraid <=", value, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidLike(String value) {
+            addCriterion("paraid like", value, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidNotLike(String value) {
+            addCriterion("paraid not like", value, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidIn(List<String> values) {
+            addCriterion("paraid in", values, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidNotIn(List<String> values) {
+            addCriterion("paraid not in", values, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidBetween(String value1, String value2) {
+            addCriterion("paraid between", value1, value2, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidNotBetween(String value1, String value2) {
+            addCriterion("paraid not between", value1, value2, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidIsNull() {
+            addCriterion("comid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidIsNotNull() {
+            addCriterion("comid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidEqualTo(String value) {
+            addCriterion("comid =", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidNotEqualTo(String value) {
+            addCriterion("comid <>", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidGreaterThan(String value) {
+            addCriterion("comid >", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidGreaterThanOrEqualTo(String value) {
+            addCriterion("comid >=", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidLessThan(String value) {
+            addCriterion("comid <", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidLessThanOrEqualTo(String value) {
+            addCriterion("comid <=", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidLike(String value) {
+            addCriterion("comid like", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidNotLike(String value) {
+            addCriterion("comid not like", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidIn(List<String> values) {
+            addCriterion("comid in", values, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidNotIn(List<String> values) {
+            addCriterion("comid not in", values, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidBetween(String value1, String value2) {
+            addCriterion("comid between", value1, value2, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidNotBetween(String value1, String value2) {
+            addCriterion("comid not between", value1, value2, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeIsNull() {
+            addCriterion("comtype is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeIsNotNull() {
+            addCriterion("comtype is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeEqualTo(Integer value) {
+            addCriterion("comtype =", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeNotEqualTo(Integer value) {
+            addCriterion("comtype <>", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeGreaterThan(Integer value) {
+            addCriterion("comtype >", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("comtype >=", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeLessThan(Integer value) {
+            addCriterion("comtype <", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeLessThanOrEqualTo(Integer value) {
+            addCriterion("comtype <=", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeIn(List<Integer> values) {
+            addCriterion("comtype in", values, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeNotIn(List<Integer> values) {
+            addCriterion("comtype not in", values, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeBetween(Integer value1, Integer value2) {
+            addCriterion("comtype between", value1, value2, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("comtype not between", value1, value2, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIsNull() {
+            addCriterion("uid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIsNotNull() {
+            addCriterion("uid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidEqualTo(String value) {
+            addCriterion("uid =", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotEqualTo(String value) {
+            addCriterion("uid <>", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThan(String value) {
+            addCriterion("uid >", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThanOrEqualTo(String value) {
+            addCriterion("uid >=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThan(String value) {
+            addCriterion("uid <", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThanOrEqualTo(String value) {
+            addCriterion("uid <=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLike(String value) {
+            addCriterion("uid like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotLike(String value) {
+            addCriterion("uid not like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIn(List<String> values) {
+            addCriterion("uid in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotIn(List<String> values) {
+            addCriterion("uid not in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidBetween(String value1, String value2) {
+            addCriterion("uid between", value1, value2, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotBetween(String value1, String value2) {
+            addCriterion("uid not between", value1, value2, "uid");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 92 - 0
modelsrc/com/miniframe/model/mdo/MdoProjectObjfun.java

@@ -52,6 +52,26 @@ public class MdoProjectObjfun extends MiniserviceBaseModel implements Serializab
      */
     private String reference;
 
+    /**
+     * 分析参数ID
+     */
+    private String paraid;
+
+    /**
+     * 组件id
+     */
+    private String comid;
+
+    /**
+     * 组件类型
+     */
+    private Integer comtype;
+
+    /**
+     * 配置UID
+     */
+    private String uid;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -215,4 +235,76 @@ public class MdoProjectObjfun extends MiniserviceBaseModel implements Serializab
     public void setReference(String reference) {
         this.reference = reference == null ? null : reference.trim();
     }
+
+    /**
+     * 获取分析参数ID
+     *
+     * @return paraid - 分析参数ID
+     */
+    public String getParaid() {
+        return paraid;
+    }
+
+    /**
+     * 设置分析参数ID
+     *
+     * @param paraid 分析参数ID
+     */
+    public void setParaid(String paraid) {
+        this.paraid = paraid == null ? null : paraid.trim();
+    }
+
+    /**
+     * 获取组件id
+     *
+     * @return comid - 组件id
+     */
+    public String getComid() {
+        return comid;
+    }
+
+    /**
+     * 设置组件id
+     *
+     * @param comid 组件id
+     */
+    public void setComid(String comid) {
+        this.comid = comid == null ? null : comid.trim();
+    }
+
+    /**
+     * 获取组件类型
+     *
+     * @return comtype - 组件类型
+     */
+    public Integer getComtype() {
+        return comtype;
+    }
+
+    /**
+     * 设置组件类型
+     *
+     * @param comtype 组件类型
+     */
+    public void setComtype(Integer comtype) {
+        this.comtype = comtype;
+    }
+
+    /**
+     * 获取配置UID
+     *
+     * @return uid - 配置UID
+     */
+    public String getUid() {
+        return uid;
+    }
+
+    /**
+     * 设置配置UID
+     *
+     * @param uid 配置UID
+     */
+    public void setUid(String uid) {
+        this.uid = uid == null ? null : uid.trim();
+    }
 }

+ 270 - 0
modelsrc/com/miniframe/model/mdo/MdoProjectObjfunSQLBuilder.java

@@ -733,6 +733,276 @@ public class MdoProjectObjfunSQLBuilder {
             addCriterion("reference not between", value1, value2, "reference");
             return (Criteria) this;
         }
+
+        public Criteria andParaidIsNull() {
+            addCriterion("paraid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidIsNotNull() {
+            addCriterion("paraid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidEqualTo(String value) {
+            addCriterion("paraid =", value, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidNotEqualTo(String value) {
+            addCriterion("paraid <>", value, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidGreaterThan(String value) {
+            addCriterion("paraid >", value, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidGreaterThanOrEqualTo(String value) {
+            addCriterion("paraid >=", value, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidLessThan(String value) {
+            addCriterion("paraid <", value, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidLessThanOrEqualTo(String value) {
+            addCriterion("paraid <=", value, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidLike(String value) {
+            addCriterion("paraid like", value, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidNotLike(String value) {
+            addCriterion("paraid not like", value, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidIn(List<String> values) {
+            addCriterion("paraid in", values, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidNotIn(List<String> values) {
+            addCriterion("paraid not in", values, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidBetween(String value1, String value2) {
+            addCriterion("paraid between", value1, value2, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andParaidNotBetween(String value1, String value2) {
+            addCriterion("paraid not between", value1, value2, "paraid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidIsNull() {
+            addCriterion("comid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidIsNotNull() {
+            addCriterion("comid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidEqualTo(String value) {
+            addCriterion("comid =", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidNotEqualTo(String value) {
+            addCriterion("comid <>", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidGreaterThan(String value) {
+            addCriterion("comid >", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidGreaterThanOrEqualTo(String value) {
+            addCriterion("comid >=", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidLessThan(String value) {
+            addCriterion("comid <", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidLessThanOrEqualTo(String value) {
+            addCriterion("comid <=", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidLike(String value) {
+            addCriterion("comid like", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidNotLike(String value) {
+            addCriterion("comid not like", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidIn(List<String> values) {
+            addCriterion("comid in", values, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidNotIn(List<String> values) {
+            addCriterion("comid not in", values, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidBetween(String value1, String value2) {
+            addCriterion("comid between", value1, value2, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidNotBetween(String value1, String value2) {
+            addCriterion("comid not between", value1, value2, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeIsNull() {
+            addCriterion("comtype is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeIsNotNull() {
+            addCriterion("comtype is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeEqualTo(Integer value) {
+            addCriterion("comtype =", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeNotEqualTo(Integer value) {
+            addCriterion("comtype <>", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeGreaterThan(Integer value) {
+            addCriterion("comtype >", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("comtype >=", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeLessThan(Integer value) {
+            addCriterion("comtype <", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeLessThanOrEqualTo(Integer value) {
+            addCriterion("comtype <=", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeIn(List<Integer> values) {
+            addCriterion("comtype in", values, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeNotIn(List<Integer> values) {
+            addCriterion("comtype not in", values, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeBetween(Integer value1, Integer value2) {
+            addCriterion("comtype between", value1, value2, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("comtype not between", value1, value2, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIsNull() {
+            addCriterion("uid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIsNotNull() {
+            addCriterion("uid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidEqualTo(String value) {
+            addCriterion("uid =", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotEqualTo(String value) {
+            addCriterion("uid <>", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThan(String value) {
+            addCriterion("uid >", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThanOrEqualTo(String value) {
+            addCriterion("uid >=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThan(String value) {
+            addCriterion("uid <", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThanOrEqualTo(String value) {
+            addCriterion("uid <=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLike(String value) {
+            addCriterion("uid like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotLike(String value) {
+            addCriterion("uid not like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIn(List<String> values) {
+            addCriterion("uid in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotIn(List<String> values) {
+            addCriterion("uid not in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidBetween(String value1, String value2) {
+            addCriterion("uid between", value1, value2, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotBetween(String value1, String value2) {
+            addCriterion("uid not between", value1, value2, "uid");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 69 - 0
modelsrc/com/miniframe/model/mdo/MdoProjectVariate.java

@@ -42,6 +42,21 @@ public class MdoProjectVariate extends MiniserviceBaseModel implements Serializa
      */
     private String remark;
 
+    /**
+     * 配置文件uid
+     */
+    private String uid;
+
+    /**
+     * 组件ID
+     */
+    private String comid;
+
+    /**
+     * 组件类型
+     */
+    private String comtype;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -169,4 +184,58 @@ public class MdoProjectVariate extends MiniserviceBaseModel implements Serializa
     public void setRemark(String remark) {
         this.remark = remark == null ? null : remark.trim();
     }
+
+    /**
+     * 获取配置文件uid
+     *
+     * @return uid - 配置文件uid
+     */
+    public String getUid() {
+        return uid;
+    }
+
+    /**
+     * 设置配置文件uid
+     *
+     * @param uid 配置文件uid
+     */
+    public void setUid(String uid) {
+        this.uid = uid == null ? null : uid.trim();
+    }
+
+    /**
+     * 获取组件ID
+     *
+     * @return comid - 组件ID
+     */
+    public String getComid() {
+        return comid;
+    }
+
+    /**
+     * 设置组件ID
+     *
+     * @param comid 组件ID
+     */
+    public void setComid(String comid) {
+        this.comid = comid == null ? null : comid.trim();
+    }
+
+    /**
+     * 获取组件类型
+     *
+     * @return comtype - 组件类型
+     */
+    public String getComtype() {
+        return comtype;
+    }
+
+    /**
+     * 设置组件类型
+     *
+     * @param comtype 组件类型
+     */
+    public void setComtype(String comtype) {
+        this.comtype = comtype == null ? null : comtype.trim();
+    }
 }

+ 210 - 0
modelsrc/com/miniframe/model/mdo/MdoProjectVariateSQLBuilder.java

@@ -593,6 +593,216 @@ public class MdoProjectVariateSQLBuilder {
             addCriterion("remark not between", value1, value2, "remark");
             return (Criteria) this;
         }
+
+        public Criteria andUidIsNull() {
+            addCriterion("uid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIsNotNull() {
+            addCriterion("uid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidEqualTo(String value) {
+            addCriterion("uid =", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotEqualTo(String value) {
+            addCriterion("uid <>", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThan(String value) {
+            addCriterion("uid >", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThanOrEqualTo(String value) {
+            addCriterion("uid >=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThan(String value) {
+            addCriterion("uid <", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThanOrEqualTo(String value) {
+            addCriterion("uid <=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLike(String value) {
+            addCriterion("uid like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotLike(String value) {
+            addCriterion("uid not like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIn(List<String> values) {
+            addCriterion("uid in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotIn(List<String> values) {
+            addCriterion("uid not in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidBetween(String value1, String value2) {
+            addCriterion("uid between", value1, value2, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotBetween(String value1, String value2) {
+            addCriterion("uid not between", value1, value2, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidIsNull() {
+            addCriterion("comid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidIsNotNull() {
+            addCriterion("comid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidEqualTo(String value) {
+            addCriterion("comid =", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidNotEqualTo(String value) {
+            addCriterion("comid <>", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidGreaterThan(String value) {
+            addCriterion("comid >", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidGreaterThanOrEqualTo(String value) {
+            addCriterion("comid >=", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidLessThan(String value) {
+            addCriterion("comid <", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidLessThanOrEqualTo(String value) {
+            addCriterion("comid <=", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidLike(String value) {
+            addCriterion("comid like", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidNotLike(String value) {
+            addCriterion("comid not like", value, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidIn(List<String> values) {
+            addCriterion("comid in", values, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidNotIn(List<String> values) {
+            addCriterion("comid not in", values, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidBetween(String value1, String value2) {
+            addCriterion("comid between", value1, value2, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComidNotBetween(String value1, String value2) {
+            addCriterion("comid not between", value1, value2, "comid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeIsNull() {
+            addCriterion("comtype is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeIsNotNull() {
+            addCriterion("comtype is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeEqualTo(String value) {
+            addCriterion("comtype =", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeNotEqualTo(String value) {
+            addCriterion("comtype <>", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeGreaterThan(String value) {
+            addCriterion("comtype >", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeGreaterThanOrEqualTo(String value) {
+            addCriterion("comtype >=", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeLessThan(String value) {
+            addCriterion("comtype <", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeLessThanOrEqualTo(String value) {
+            addCriterion("comtype <=", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeLike(String value) {
+            addCriterion("comtype like", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeNotLike(String value) {
+            addCriterion("comtype not like", value, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeIn(List<String> values) {
+            addCriterion("comtype in", values, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeNotIn(List<String> values) {
+            addCriterion("comtype not in", values, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeBetween(String value1, String value2) {
+            addCriterion("comtype between", value1, value2, "comtype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComtypeNotBetween(String value1, String value2) {
+            addCriterion("comtype not between", value1, value2, "comtype");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 1 - 1
modelsrc/com/miniframe/model/mdo/dbconfig/MapperConfig-mdo.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 Thu Feb 13 16:53:45 CST 2025.
+    This file was generated on Wed Mar 12 16:01:07 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/mdo/xml/MdoProjectMapper.xml" />

+ 1 - 1
modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml

@@ -5,7 +5,7 @@
     This file is generated by MyBatis Generator.
     This file is the shell of a Mapper Config file - in many cases you will need to add
       to this file before it is usable by MyBatis.
-    This file was generated on Thu Feb 13 16:53:47 CST 2025.
+    This file was generated on Wed Mar 12 16:01:07 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

+ 0 - 1
profiles/dev/application-dev.properties

@@ -31,7 +31,6 @@ eureka.instance.health-check-url-path=/monitor/health
 
 #=======================datasource\u914D\u7F6E================================
 spring.datasource.druid.driver-class-name=org.postgresql.Driver
-
 spring.datasource.druid.url=jdbc:postgresql://192.168.0.131:5432/airopt
 spring.datasource.druid.username=postgres
 spring.datasource.druid.password=postgres

+ 0 - 1
src/main/java/com/miniframe/bisiness/mdo/MDO0039Service.java

@@ -69,7 +69,6 @@ public class MDO0039Service extends MDO0039BaseModel implements ExecProcessFlow
 		String cpacsPath =TemplateGenerator.createcCpacsXml(pid);
 		//创建workflow
 		String workflowPath =TemplateGenerator.createcWorkflowXml(pid);
-
 		//创建problem.xml
 		TemplateGenerator.createProblemXml(pid);
 		//创建run.py

+ 6 - 4
src/main/java/com/miniframe/bisiness/mdo/MDO0041Service.java

@@ -7,6 +7,7 @@ import com.miniframe.bisiness.mdo.service.ProFfdCstService;
 import com.miniframe.core.ExecProcessFlow;
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.mdo.model.MDO0041BaseModel;
+import com.miniframe.mdo.component.CstCom;
 import com.miniframe.model.mdo.MdoProCst;
 import com.miniframe.model.mdo.MdoProCstSQLBuilder;
 import com.miniframe.model.mdo.MdoProFfdSQLBuilder;
@@ -36,9 +37,10 @@ public class MDO0041Service extends MDO0041BaseModel implements ExecProcessFlow
 		MdoProCstMapper cstDao = UtilTools.getBean(MdoProCstMapper.class);
 		MdoProCstSQLBuilder cstsb = new MdoProCstSQLBuilder();
 		cstsb.createCriteria().andPidEqualTo(pid);
+		MdoProCst c=null;
 		List<MdoProCst> cstList = cstDao.selectByExample(cstsb);
 		if(cstList !=null && !cstList.isEmpty()){//修改
-			MdoProCst c = cstList.get(0);
+			c = cstList.get(0);
 			c.setChecked(checked);
 			c.setCstn(cstn);
 			c.setPid(pid);
@@ -50,7 +52,7 @@ public class MDO0041Service extends MDO0041BaseModel implements ExecProcessFlow
 			c.setUpperb(upperb);
 			cstDao.updateByPrimaryKey(c);
 		}else{
-			MdoProCst c = new MdoProCst();
+			c = new MdoProCst();
 			c.setId(UtilTools.getUUid());
 			c.setChecked(checked);
 			c.setCstn(cstn);
@@ -63,9 +65,9 @@ public class MDO0041Service extends MDO0041BaseModel implements ExecProcessFlow
 			c.setUpperb(upperb);
 			cstDao.insert(c);
 		}
-		ProFfdCstService.delFfd(pid);
-
 
+		CstCom.saveVarByCst(c);
+		ProFfdCstService.delFfd(pid);
 	}
 	
 	/**

+ 2 - 0
src/main/java/com/miniframe/bisiness/mdo/MDO0047Service.java

@@ -3,6 +3,7 @@ package com.miniframe.bisiness.mdo;
 import com.miniframe.bisiness.mdo.service.ProXfoilAdflowService;
 import com.miniframe.core.ExecProcessFlow;
 import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.appcode.ComType;
 import com.miniframe.generate.business.mdo.model.MDO0047BaseModel;
 import com.miniframe.model.mdo.MdoProInoutPara;
 import com.miniframe.model.mdo.MdoProInoutParaSQLBuilder;
@@ -84,6 +85,7 @@ public class MDO0047Service extends MDO0047BaseModel implements ExecProcessFlow
 			p.setType(type);
 			p.setPid(x.getPid());
 			p.setFatherid(x.getId());
+			p.setComtype(Integer.valueOf(ComType.XFOIL.getIndex()));
 			xpDao.insert(p);
 		}
 	}

+ 74 - 0
src/main/java/com/miniframe/bisiness/mdo/MDO0052Service.java

@@ -0,0 +1,74 @@
+package com.miniframe.bisiness.mdo;
+
+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.mdo.model.MDO0052BaseModel;
+import com.miniframe.generate.comm.mdo.D_MDO0052_PARAMS_RECODE;
+import com.miniframe.model.mdo.MdoProInoutPara;
+import com.miniframe.model.mdo.MdoProInoutParaSQLBuilder;
+import com.miniframe.model.mdo.dao.MdoProInoutParaMapper;
+
+/**
+ * 西工大系统,“流查询”逻辑处理(重新生成不覆盖)。
+ */
+public class MDO0052Service extends MDO0052BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 西工大系统,“流查询”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		String pid = this.getA_mdo0052().getPid();
+		String comid = this.getA_mdo0052().getComid();
+		MdoProInoutParaMapper outDao = UtilTools.getBean(MdoProInoutParaMapper.class);
+		MdoProInoutParaSQLBuilder outsb = new MdoProInoutParaSQLBuilder();
+		MdoProInoutParaSQLBuilder.Criteria outsc = outsb.createCriteria();
+		outsc.andPidEqualTo(pid);
+		outsc.andFatheridEqualTo(comid);
+		outsc.andFlagEqualTo(2);
+		List<MdoProInoutPara> parList = outDao.selectByExample(outsb);
+		List<D_MDO0052_PARAMS_RECODE> rows = new ArrayList<>();
+		for (MdoProInoutPara p:parList) {
+			D_MDO0052_PARAMS_RECODE row = new D_MDO0052_PARAMS_RECODE();
+			row.setCode(p.getCode());
+			row.setParamid(p.getId());
+			row.setName(p.getName());
+			row.setSteamflag(p.getSteamflag());
+			row.setSteamtype(p.getSteamtype());
+			rows.add(row);
+		}
+		this.getD_mdo0052().setParams(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();
+	}
+
+}

+ 142 - 0
src/main/java/com/miniframe/bisiness/mdo/MDO0053Service.java

@@ -0,0 +1,142 @@
+package com.miniframe.bisiness.mdo;
+
+import java.util.List;
+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.MDO0053BaseModel;
+import com.miniframe.model.mdo.*;
+import com.miniframe.model.mdo.dao.MdoProInoutParaMapper;
+import com.miniframe.model.mdo.dao.MdoProjectConstraintMapper;
+import com.miniframe.model.mdo.dao.MdoProjectObjfunMapper;
+
+/**
+ * 西工大系统,“流修改”逻辑处理(重新生成不覆盖)。
+ */
+public class MDO0053Service extends MDO0053BaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 西工大系统,“流修改”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+		String paramstr  =this.getA_mdo0053().getParamstr();
+		String[] params = paramstr.split(";");
+		String comid =null;
+		Integer comtype =null;
+		for (String p:params) {
+			String[] pt = p.split(",");
+			String paramid = pt[0];
+			String streamflag = pt[1];
+			String streamtype =pt[2];
+			MdoProInoutParaMapper pdao = UtilTools.getBean(MdoProInoutParaMapper.class);
+			MdoProInoutPara para = pdao.selectByPrimaryKey(paramid);
+			if(para!=null){
+				comid = para.getFatherid();
+				comtype =para.getComtype();
+				para.setSteamflag(Integer.valueOf(streamflag));
+				para.setSteamtype(Integer.valueOf(streamtype));
+				pdao.updateByPrimaryKey(para);
+			}
+		}
+		deleComAndFum(comid);
+		saveConAndFun(comid, comtype);
+
+	}
+
+	private void deleComAndFum(String comid) {
+		MdoProjectConstraintMapper cdao = UtilTools.getBean(MdoProjectConstraintMapper.class);
+		MdoProjectConstraintSQLBuilder csb = new MdoProjectConstraintSQLBuilder();
+		MdoProjectConstraintSQLBuilder.Criteria csc = csb.createCriteria();
+		csc.andComidEqualTo(comid);
+		cdao.deleteByExample(csb);
+		MdoProjectObjfunMapper fdao = UtilTools.getBean(MdoProjectObjfunMapper.class);
+		MdoProjectObjfunSQLBuilder fsb = new MdoProjectObjfunSQLBuilder();
+		MdoProjectObjfunSQLBuilder.Criteria fsc =fsb.createCriteria();
+		fsc.andComidEqualTo(comid);
+		fdao.deleteByExample(fsb);
+	}
+
+	private void saveConAndFun(String comid, Integer comtype) {
+		MdoProInoutParaMapper pdao = UtilTools.getBean(MdoProInoutParaMapper.class);
+		MdoProInoutParaSQLBuilder psb = new MdoProInoutParaSQLBuilder();
+		MdoProInoutParaSQLBuilder.Criteria psc = psb.createCriteria();
+		psc.andFatheridEqualTo(comid);
+		psc.andComtypeEqualTo(comtype);
+		psc.andSteamflagEqualTo(1);
+		List<MdoProInoutPara>  pList = pdao.selectByExample(psb);
+		for (MdoProInoutPara p: pList) {
+			if(p.getSteamtype()==1){//约束条件
+				MdoProjectConstraintMapper cdao = UtilTools.getBean(MdoProjectConstraintMapper.class);
+				MdoProjectConstraint c = new MdoProjectConstraint();
+				c.setId(UtilTools.getUUid());
+				c.setName(p.getName());
+				c.setReference(p.getValue());
+				c.setComid(comid);
+				c.setComtype(comtype);
+				c.setParaid(p.getId());
+				c.setUid(getUidByComTyeAndPcode(comtype.toString(),p.getCode()));
+				c.setPid(p.getPid());
+				c.setCon("1");
+				c.setLower("None");
+				c.setUpper("None");
+				cdao.insert(c);
+			}
+			if(p.getSteamtype()==2){//优化目标
+				MdoProjectObjfunMapper fdao = UtilTools.getBean(MdoProjectObjfunMapper.class);
+				MdoProjectObjfun f = new MdoProjectObjfun();
+				f.setId(UtilTools.getUUid());
+				f.setName(p.getName());
+				f.setReference(p.getValue());
+				f.setComid(comid);
+				f.setComtype(comtype);
+				f.setParaid(p.getId());
+				fdao.insert(f);
+			}
+		}
+	}
+
+	public static String getUidByComTyeAndPcode(String comtype,String pcode){
+		if(comtype.equals(ComType.XFOIL.getIndex())){
+			return "/CPACS/toolspecific/CFD/XFOIL/evalFuncs/"+pcode;
+		}
+		if(comtype.equals(ComType.ADFLOW.getIndex())){
+			return "/cpacs/toolspecific/CFD/ADflow/evalFuncs/force/"+pcode;
+		}
+		return "";
+	}
+
+
+
+
+
+	/**
+	 * 西工大系统,“流修改”业务前处理
+ 	 */
+	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();
+	}
+
+}

+ 48 - 0
src/main/java/com/miniframe/bisiness/system/SYSTEMService.java

@@ -0,0 +1,48 @@
+package com.miniframe.bisiness.system;
+
+import java.util.Map;
+import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.generate.business.system.model.SYSTEMBaseModel;
+
+/**
+ * 基础系统,“系统内部服务”逻辑处理(重新生成不覆盖)。
+ */
+public class SYSTEMService extends SYSTEMBaseModel implements ExecProcessFlow {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+		
+	/**
+	 * 基础系统,“系统内部服务”业务核心处理
+ 	 */
+	public void transExecute() throws Exception {
+	
+	}
+	
+	/**
+	 * 基础系统,“系统内部服务”业务前处理
+ 	 */
+	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();
+	}
+
+}

+ 88 - 0
src/main/java/com/miniframe/mdo/component/CstCom.java

@@ -0,0 +1,88 @@
+package com.miniframe.mdo.component;
+
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.appcode.ComType;
+import com.miniframe.model.mdo.MdoProCst;
+import com.miniframe.model.mdo.MdoProjectVariate;
+import com.miniframe.model.mdo.MdoProjectVariateSQLBuilder;
+import com.miniframe.model.mdo.dao.MdoProCstMapper;
+import com.miniframe.model.mdo.dao.MdoProjectVariateMapper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CstCom {
+
+    /**
+     * 更新cst
+     * @param cst
+     */
+    public static void updatecstByVar(MdoProCst cst){
+        MdoProjectVariateMapper varDao = UtilTools.getBean(MdoProjectVariateMapper.class);
+        MdoProjectVariateSQLBuilder  varsb= new MdoProjectVariateSQLBuilder();
+        MdoProjectVariateSQLBuilder.Criteria varsc = varsb.createCriteria();
+        varsc.andComidEqualTo(cst.getId());
+        varsc.andComtypeEqualTo(ComType.CST.getIndex());
+        List< MdoProjectVariate> vars = varDao.selectByExample(varsb);
+        List<String> lowerbstr =new ArrayList<>();
+        List<String> upperbstr =new ArrayList<>();
+        for (MdoProjectVariate var:vars) {
+            if("lowerB".equals(var.getName())){
+                lowerbstr.add(var.getReference());
+            }
+            if("upperB".equals(var.getName())){
+                upperbstr.add(var.getReference());
+            }
+        }
+        cst.setUpperb(upperbstr.toString());
+        cst.setLowerb(lowerbstr.toString());
+        MdoProCstMapper cstDao = UtilTools.getBean(MdoProCstMapper.class);
+        cstDao.updateByPrimaryKey(cst);
+    }
+
+    /**
+     * 更新Var
+     * @param cst
+     * @throws Exception
+     */
+    public static void saveVarByCst(MdoProCst cst) throws Exception {
+        //删除该组件历史数据
+        deleVarByCst(cst);
+        String lowerbstr =cst.getLowerb();
+        String upperbstr =cst.getUpperb();
+        String[] lbs =lowerbstr.split(",");
+        MdoProjectVariateMapper varDao = UtilTools.getBean(MdoProjectVariateMapper.class);
+        for (int i =0;i<lbs.length;i++) {
+            MdoProjectVariate var =new MdoProjectVariate();
+            var.setComid(cst.getId());
+            var.setComtype(ComType.CST.getIndex());
+            var.setId(UtilTools.getUUid());
+            var.setReference(lbs[i]);
+            var.setPid(cst.getPid());
+            var.setName("lowerB");
+            var.setUid("/CPACS/vehicles/profiles/wingAirfoils/wingAirfoil/cst2D/lowerB");
+            varDao.insert(var);
+        }
+        String[] ubs =upperbstr.split(",");
+        for (int i =0;i<ubs.length;i++) {
+            MdoProjectVariate var =new MdoProjectVariate();
+            var.setComid(cst.getId());
+            var.setComtype(ComType.CST.getIndex());
+            var.setId(UtilTools.getUUid());
+            var.setReference(ubs[i]);
+            var.setPid(cst.getPid());
+            var.setUid("/CPACS/vehicles/profiles/wingAirfoils/wingAirfoil/cst2D/upperB");
+            var.setName("upperB");
+            varDao.insert(var);
+        }
+    }
+    private static void deleVarByCst(MdoProCst cst) {
+        MdoProjectVariateMapper varDao = UtilTools.getBean(MdoProjectVariateMapper.class);
+        MdoProjectVariateSQLBuilder  varsb= new MdoProjectVariateSQLBuilder();
+        MdoProjectVariateSQLBuilder.Criteria varsc = varsb.createCriteria();
+        varsc.andComidEqualTo(cst.getId());
+        varsc.andComtypeEqualTo(ComType.CST.getIndex());
+        varDao.deleteByExample(varsb);
+    }
+
+}

+ 15 - 11
src/main/java/com/miniframe/modo/temp/TemplateGenerator.java

@@ -57,6 +57,19 @@ public class TemplateGenerator {
         // 定义数据模型(Map)
         Map<String, Object> dataModel = new HashMap<>();
 
+        ProblemVo vo = findProblemVo(pid);
+
+        dataModel.put("vo",vo);
+//        dataModel.put("geoFilePath", BPATH + "/" + aid + "/" + jid + "/Geometry");
+        // 将数据模型传入模板进行处理
+        StringWriter writer = new StringWriter();
+        template.process(dataModel, writer);
+        FileWriter fileWriter = new FileWriter(LogService.BPATH + "/" + pid + "/in/problem.xml");
+        fileWriter.write(writer.toString());
+        fileWriter.close();
+    }
+
+    public static ProblemVo findProblemVo(String pid) throws IOException {
         ProblemVo vo = new ProblemVo();
         HeaderVo header =new HeaderVo();
         header.setName(pid);
@@ -74,18 +87,9 @@ public class TemplateGenerator {
         vo.setSurro(surro);
         MdoProGrad grad = findGrad(pid);
         vo.setGrad(grad);
-
         List<Solver> solvers = findSolvers(pid);
         vo.setSolvers(solvers);
-
-        dataModel.put("vo",vo);
-//        dataModel.put("geoFilePath", BPATH + "/" + aid + "/" + jid + "/Geometry");
-        // 将数据模型传入模板进行处理
-        StringWriter writer = new StringWriter();
-        template.process(dataModel, writer);
-        FileWriter fileWriter = new FileWriter(LogService.BPATH + "/" + pid + "/in/problem.xml");
-        fileWriter.write(writer.toString());
-        fileWriter.close();
+        return vo;
     }
 
     /**
@@ -402,7 +406,7 @@ public class TemplateGenerator {
             dv.setValue(values);
             dv.setLowerbound(lowerbounds);
             dv.setUpperbound(upperbounds);
-            dv.setuID("");//TODO 目前结构不清
+            dv.setuID(UtilTools.getUUid());//TODO 目前结构不清
             designVariables.add(dv);
         }
         return designVariables;

+ 44 - 0
src/test/java/com/miniframe/comm/httpmdoapater/MDO0052Test.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_MDO0052;
+import com.miniframe.generate.comm.httpmdoapater.MDO0052Client;
+import com.miniframe.generate.business.mdo.model.MDO0052BaseModel;
+
+public class MDO0052Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(MDO0052Test.class);
+
+	/**
+	 * 流查询,获取报文体
+	 * @return
+	 */
+	public static A_MDO0052 getA_mdo0052() {
+		A_MDO0052 a_mdo0052 = new A_MDO0052();
+
+		// ----------以下增加【流查询】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_mdo0052;
+	}
+	
+	/**
+	 * 运行客户端测试,流查询
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		MDO0052BaseModel model = new MDO0052BaseModel();
+		model.setA_mdohead(HttpmdoapaterUtil.getA_mdohead("MDO0052"));
+		model.setA_mdo0052(MDO0052Test.getA_mdo0052());
+		MDO0052Client client = new MDO0052Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

+ 44 - 0
src/test/java/com/miniframe/comm/httpmdoapater/MDO0053Test.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_MDO0053;
+import com.miniframe.generate.comm.httpmdoapater.MDO0053Client;
+import com.miniframe.generate.business.mdo.model.MDO0053BaseModel;
+
+public class MDO0053Test {
+
+	private static final Logger logger = LoggerFactory.getLogger(MDO0053Test.class);
+
+	/**
+	 * 流修改,获取报文体
+	 * @return
+	 */
+	public static A_MDO0053 getA_mdo0053() {
+		A_MDO0053 a_mdo0053 = new A_MDO0053();
+
+		// ----------以下增加【流修改】上行体赋值-------------
+
+
+
+		// ---------------------------------------------------
+		return a_mdo0053;
+	}
+	
+	/**
+	 * 运行客户端测试,流修改
+	 * 
+	 * @param args
+	 * @throws Exception
+	 */
+	public static void main(String[] args) throws Exception {
+		MDO0053BaseModel model = new MDO0053BaseModel();
+		model.setA_mdohead(HttpmdoapaterUtil.getA_mdohead("MDO0053"));
+		model.setA_mdo0053(MDO0053Test.getA_mdo0053());
+		MDO0053Client client = new MDO0053Client();
+		logger.error("客户端发送前总线:\r\n"+model);
+		model = client.execute(model);
+		logger.error("客户端发送后总线:\r\n"+model);
+	}
+}

+ 6 - 0
系统设计/数据定义/标准数据/ComType(组件类型).csv

@@ -0,0 +1,6 @@
+序号,代码编号,代码值,代码名称
+"1","CST","0","cst组件"
+"2","XFOIL","1","xfoil组件"
+"3","FFD","2","ffd组件"
+"4","ADFLOW","3","adflow组件"
+

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

@@ -74,4 +74,6 @@
 
 3000009,MDO000009,求解配置文件生成失败!,
 3000010,MDO000010,求解失败!,
-3000011,MDO000011,求解器类型缺失!,
+3000011,MDO000011,求解器类型缺失!,
+
+3000011,MDO000012,Cst 数据错误!,

+ 2 - 0
系统设计/系统模块/MDO(西工大系统).csv

@@ -52,6 +52,8 @@
 100050,MDO0050,adflow添加修改,service,
 100051,MDO0051,adflow删除,service,
 
+100052,MDO0052,流查询,service,
+100053,MDO0053,流修改,service,
 
 
 

+ 3 - 0
系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0052_A(流查询).csv

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

+ 8 - 0
系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0052_D(流查询).csv

@@ -0,0 +1,8 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,params,分析参数数据,list,,,,0,,,,,,,
+1.1,paramid,参数ID,string,,,,,,,,,,,
+1.2,code,编号,string,,,,,,,,,,,
+1.3,name,名称,string,,,,,,,,,,,
+1.4,comtype,组件类型,int,,,,,,,,,,,
+1.5,steamflag,流分析 1 启用 0 关闭,int,,,,,,,,,,,
+1.6,steamtype,流分析类型 1 约束条件 2优化目标,int,,,,,,,,,,,

+ 2 - 0
系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0053_A(流修改).csv

@@ -0,0 +1,2 @@
+序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
+1,paramstr,参数ID-流分析-流类型之间逗号分割 多条数据分号分隔,string,,,,,,,,,,,

+ 1 - 0
系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0053_D(流修改).csv

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