求解

definitionsrc/returncode/returncode-business.properties

@@ -67,3 +67,4 @@ MDO000007 = \u8F93\u51FA\u53C2\u6570\u4E0D\u5B58\u5728\uFF01
 MDO000008 = \u8FDB\u5316\u4F18\u5316\u5668\u53C2\u6570\u4E0D\u5B58\u5728\uFF01
 MDO000009 = \u6C42\u89E3\u914D\u7F6E\u6587\u4EF6\u751F\u6210\u5931\u8D25\uFF01
 MDO000010 = \u6C42\u89E3\u5931\u8D25\uFF01
+MDO000011 = \u6C42\u89E3\u5668\u7C7B\u578B\u7F3A\u5931\uFF01

definitionsrc/returncode/returncode-business_zh_CN.properties

@@ -67,3 +67,4 @@ MDO000007 = \u8F93\u51FA\u53C2\u6570\u4E0D\u5B58\u5728\uFF01
 MDO000008 = \u8FDB\u5316\u4F18\u5316\u5668\u53C2\u6570\u4E0D\u5B58\u5728\uFF01
 MDO000009 = \u6C42\u89E3\u914D\u7F6E\u6587\u4EF6\u751F\u6210\u5931\u8D25\uFF01
 MDO000010 = \u6C42\u89E3\u5931\u8D25\uFF01
+MDO000011 = \u6C42\u89E3\u5668\u7C7B\u578B\u7F3A\u5931\uFF01

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

@@ -87,4 +87,17 @@ public class A_MDO0002 extends BaseMapModel implements Serializable {
 	public String getFlow() {
 		return this.flow;
 	}
+	String stype;//求解器类型
+	/**
+	 *求解器类型
+	 */
+	public void setStype(String stype) {
+		this.stype=stype;
+	}
+	/**
+	 *求解器类型
+	 */
+	public String getStype() {
+		return this.stype;
+	}
 }

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

@@ -113,4 +113,17 @@ public class D_MDO0001_ROWS_RECODE extends BaseMapModel implements Serializable
 	public String getFlow() {
 		return this.flow;
 	}
+	String stype;//求解器类型
+	/**
+	 *求解器类型
+	 */
+	public void setStype(String stype) {
+		this.stype=stype;
+	}
+	/**
+	 *求解器类型
+	 */
+	public String getStype() {
+		return this.stype;
+	}
 }

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

@@ -113,4 +113,17 @@ public class D_MDO0004 extends BaseMapModel implements Serializable {
 	public String getFlow() {
 		return this.flow;
 	}
+	String stype;//求解器类型
+	/**
+	 *求解器类型
+	 */
+	public void setStype(String stype) {
+		this.stype=stype;
+	}
+	/**
+	 *求解器类型
+	 */
+	public String getStype() {
+		return this.stype;
+	}
 }

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

@@ -139,4 +139,17 @@ public class D_MDO0005_ROWS_RECODE extends BaseMapModel implements Serializable
 	public String getImage2() {
 		return this.image2;
 	}
+	String stype;//求解器类型
+	/**
+	 *求解器类型
+	 */
+	public void setStype(String stype) {
+		this.stype=stype;
+	}
+	/**
+	 *求解器类型
+	 */
+	public String getStype() {
+		return this.stype;
+	}
 }

generated/validator/resources_a_mdo0002Form_validator.properties

@@ -4,4 +4,5 @@ a_mdo0002.remark = \u63CF\u8FF0
 a_mdo0002.image = \u56FE\u7247base64
 a_mdo0002.isshare = \u5171\u4EAB
 a_mdo0002.flow = \u6D41\u7A0B\u56FE
+a_mdo0002.stype = \u6C42\u89E3\u5668\u7C7B\u578B
 a_mdo0002Form = true

generated/validator/resources_a_mdo0002Form_validator_zh_CN.properties

@@ -4,4 +4,5 @@ a_mdo0002.remark = \u63CF\u8FF0
 a_mdo0002.image = \u56FE\u7247base64
 a_mdo0002.isshare = \u5171\u4EAB
 a_mdo0002.flow = \u6D41\u7A0B\u56FE
+a_mdo0002.stype = \u6C42\u89E3\u5668\u7C7B\u578B
 a_mdo0002Form = true

generated/validator/resources_d_mdo0001_rows_recodeForm_validator.properties

@@ -6,4 +6,5 @@ d_mdo0001_rows_recode.createtime = \u521B\u5EFA\u65F6\u95F4
 d_mdo0001_rows_recode.updatetime = \u66F4\u65B0\u65F6\u95F4
 d_mdo0001_rows_recode.isshare = 
 d_mdo0001_rows_recode.flow = \u6D41\u7A0B\u56FE
+d_mdo0001_rows_recode.stype = \u6C42\u89E3\u5668\u7C7B\u578B
 d_mdo0001_rows_recodeForm = true

generated/validator/resources_d_mdo0001_rows_recodeForm_validator_zh_CN.properties

@@ -6,4 +6,5 @@ d_mdo0001_rows_recode.createtime = \u521B\u5EFA\u65F6\u95F4
 d_mdo0001_rows_recode.updatetime = \u66F4\u65B0\u65F6\u95F4
 d_mdo0001_rows_recode.isshare = 
 d_mdo0001_rows_recode.flow = \u6D41\u7A0B\u56FE
+d_mdo0001_rows_recode.stype = \u6C42\u89E3\u5668\u7C7B\u578B
 d_mdo0001_rows_recodeForm = true

generated/validator/resources_d_mdo0004Form_validator.properties

@@ -6,4 +6,5 @@ d_mdo0004.createtime = \u521B\u5EFA\u65F6\u95F4
 d_mdo0004.updatetime = \u66F4\u65B0\u65F6\u95F4
 d_mdo0004.isshare = 
 d_mdo0004.flow = \u6D41\u7A0B\u56FE
+d_mdo0004.stype = \u6C42\u89E3\u5668\u7C7B\u578B
 d_mdo0004Form = true

generated/validator/resources_d_mdo0004Form_validator_zh_CN.properties

@@ -6,4 +6,5 @@ d_mdo0004.createtime = \u521B\u5EFA\u65F6\u95F4
 d_mdo0004.updatetime = \u66F4\u65B0\u65F6\u95F4
 d_mdo0004.isshare = 
 d_mdo0004.flow = \u6D41\u7A0B\u56FE
+d_mdo0004.stype = \u6C42\u89E3\u5668\u7C7B\u578B
 d_mdo0004Form = true

generated/validator/resources_d_mdo0005_rows_recodeForm_validator.properties

@@ -8,4 +8,5 @@ d_mdo0005_rows_recode.isshare =
 d_mdo0005_rows_recode.flow = \u6D41\u7A0B\u56FE
 d_mdo0005_rows_recode.type = 1-\u51FD\u6570\u4F18\u5316\u6A21\u72482-\u7FFC\u578B\u4F18\u5316\u6A21\u72483-\u673A\u7FFC\u4F18\u5316\u6A21\u7248
 d_mdo0005_rows_recode.image2 = \u56FE\u7247base64
+d_mdo0005_rows_recode.stype = \u6C42\u89E3\u5668\u7C7B\u578B
 d_mdo0005_rows_recodeForm = true

generated/validator/resources_d_mdo0005_rows_recodeForm_validator_zh_CN.properties

@@ -8,4 +8,5 @@ d_mdo0005_rows_recode.isshare =
 d_mdo0005_rows_recode.flow = \u6D41\u7A0B\u56FE
 d_mdo0005_rows_recode.type = 1-\u51FD\u6570\u4F18\u5316\u6A21\u72482-\u7FFC\u578B\u4F18\u5316\u6A21\u72483-\u673A\u7FFC\u4F18\u5316\u6A21\u7248
 d_mdo0005_rows_recode.image2 = \u56FE\u7247base64
+d_mdo0005_rows_recode.stype = \u6C42\u89E3\u5668\u7C7B\u578B
 d_mdo0005_rows_recodeForm = true

modelsrc/com/miniframe/model/mdo/MdoMod.java

@@ -64,6 +64,11 @@ public class MdoMod extends MiniserviceBaseModel implements Serializable {
      */
     private String image2;
 
+    /**
+     * 求解器类型
+     */
+    private String stype;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -267,4 +272,22 @@ public class MdoMod extends MiniserviceBaseModel implements Serializable {
     public void setImage2(String image2) {
         this.image2 = image2 == null ? null : image2.trim();
     }
+
+    /**
+     * 获取求解器类型
+     *
+     * @return stype - 求解器类型
+     */
+    public String getStype() {
+        return stype;
+    }
+
+    /**
+     * 设置求解器类型
+     *
+     * @param stype 求解器类型
+     */
+    public void setStype(String stype) {
+        this.stype = stype == null ? null : stype.trim();
+    }
 }

modelsrc/com/miniframe/model/mdo/MdoModSQLBuilder.java

@@ -834,6 +834,76 @@ public class MdoModSQLBuilder {
             addCriterion("image2 not between", value1, value2, "image2");
             return (Criteria) this;
         }
+
+        public Criteria andStypeIsNull() {
+            addCriterion("stype is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeIsNotNull() {
+            addCriterion("stype is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeEqualTo(String value) {
+            addCriterion("stype =", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeNotEqualTo(String value) {
+            addCriterion("stype <>", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeGreaterThan(String value) {
+            addCriterion("stype >", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeGreaterThanOrEqualTo(String value) {
+            addCriterion("stype >=", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeLessThan(String value) {
+            addCriterion("stype <", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeLessThanOrEqualTo(String value) {
+            addCriterion("stype <=", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeLike(String value) {
+            addCriterion("stype like", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeNotLike(String value) {
+            addCriterion("stype not like", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeIn(List<String> values) {
+            addCriterion("stype in", values, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeNotIn(List<String> values) {
+            addCriterion("stype not in", values, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeBetween(String value1, String value2) {
+            addCriterion("stype between", value1, value2, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeNotBetween(String value1, String value2) {
+            addCriterion("stype not between", value1, value2, "stype");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

modelsrc/com/miniframe/model/mdo/MdoProject.java

@@ -54,6 +54,11 @@ public class MdoProject extends MiniserviceBaseModel implements Serializable {
      */
     private String flow;
 
+    /**
+     * 求解器类型
+     */
+    private String stype;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -221,4 +226,22 @@ public class MdoProject extends MiniserviceBaseModel implements Serializable {
     public void setFlow(String flow) {
         this.flow = flow == null ? null : flow.trim();
     }
+
+    /**
+     * 获取求解器类型
+     *
+     * @return stype - 求解器类型
+     */
+    public String getStype() {
+        return stype;
+    }
+
+    /**
+     * 设置求解器类型
+     *
+     * @param stype 求解器类型
+     */
+    public void setStype(String stype) {
+        this.stype = stype == null ? null : stype.trim();
+    }
 }

modelsrc/com/miniframe/model/mdo/MdoProjectObjfun.java

@@ -23,7 +23,7 @@ public class MdoProjectObjfun extends MiniserviceBaseModel implements Serializab
     private String name;
 
     /**
-     * 优化方向
+     * 优化方向 -1 最大化 1 最小化
      */
     private String optdir;
 
@@ -109,18 +109,18 @@ public class MdoProjectObjfun extends MiniserviceBaseModel implements Serializab
     }
 
     /**
-     * 获取优化方向
+     * 获取优化方向 -1 最大化 1 最小化
      *
-     * @return optdir - 优化方向
+     * @return optdir - 优化方向 -1 最大化 1 最小化
      */
     public String getOptdir() {
         return optdir;
     }
 
     /**
-     * 设置优化方向
+     * 设置优化方向 -1 最大化 1 最小化
      *
-     * @param optdir 优化方向
+     * @param optdir 优化方向 -1 最大化 1 最小化
      */
     public void setOptdir(String optdir) {
         this.optdir = optdir == null ? null : optdir.trim();

modelsrc/com/miniframe/model/mdo/MdoProjectSQLBuilder.java

@@ -704,6 +704,76 @@ public class MdoProjectSQLBuilder {
             addCriterion("flow not between", value1, value2, "flow");
             return (Criteria) this;
         }
+
+        public Criteria andStypeIsNull() {
+            addCriterion("stype is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeIsNotNull() {
+            addCriterion("stype is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeEqualTo(String value) {
+            addCriterion("stype =", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeNotEqualTo(String value) {
+            addCriterion("stype <>", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeGreaterThan(String value) {
+            addCriterion("stype >", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeGreaterThanOrEqualTo(String value) {
+            addCriterion("stype >=", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeLessThan(String value) {
+            addCriterion("stype <", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeLessThanOrEqualTo(String value) {
+            addCriterion("stype <=", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeLike(String value) {
+            addCriterion("stype like", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeNotLike(String value) {
+            addCriterion("stype not like", value, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeIn(List<String> values) {
+            addCriterion("stype in", values, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeNotIn(List<String> values) {
+            addCriterion("stype not in", values, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeBetween(String value1, String value2) {
+            addCriterion("stype between", value1, value2, "stype");
+            return (Criteria) this;
+        }
+
+        public Criteria andStypeNotBetween(String value1, String value2) {
+            addCriterion("stype not between", value1, value2, "stype");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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 Sat Feb 08 12:00:57 CST 2025.
+    This file was generated on Sat Feb 08 18:09:36 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/mdo/xml/MdoProjectMapper.xml" />

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 Sat Feb 08 12:00:58 CST 2025.
+    This file was generated on Sat Feb 08 18:09:37 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

@@ -61,6 +61,7 @@ public class MDO0001Service extends MDO0001BaseModel implements ExecProcessFlow
 			row.setImage(p.getImage());
 			row.setIsshare(p.getIsshare().toString());
 			row.setRemark(p.getRemark());
+			row.setStype(p.getStype());
 			rows.add(row);
 		}
 

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

@@ -29,7 +29,9 @@ public class MDO0002Service extends MDO0002BaseModel implements ExecProcessFlow
 		String isshare =this.getA_mdo0002().getIsshare();
 		String image =this.getA_mdo0002().getImage();
 		String flow =this.getA_mdo0002().getFlow();
+		String stype =this.getA_mdo0002().getStype();
 		String uid=this.getA_mdohead().getUserId();
+
 		Date nowDate =XIDateTimeUtils.getNowDate();
 		MdoProjectMapper proDao =UtilTools.getBean(MdoProjectMapper.class);
 		if(StringUtil.isEmpty(pid)){//添加
@@ -44,6 +46,7 @@ public class MDO0002Service extends MDO0002BaseModel implements ExecProcessFlow
 			pro.setIsshare(Short.valueOf(isshare));
 			pro.setName(name);
 			pro.setRemark(remark);
+			pro.setStype(stype);
 			proDao.insert(pro);
 		}else{//修改
 			MdoProject pro = proDao.selectByPrimaryKey(pid);
@@ -58,6 +61,7 @@ public class MDO0002Service extends MDO0002BaseModel implements ExecProcessFlow
 			pro.setIsshare(Short.valueOf(isshare));
 			pro.setName(name);
 			pro.setRemark(remark);
+			pro.setStype(stype);
 			proDao.updateByPrimaryKey(pro);
 		}
 

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

@@ -49,6 +49,7 @@ public class MDO0004Service extends MDO0004BaseModel implements ExecProcessFlow
 		pro.setUid(uid);
 		pro.setCreateTime(nowDate);
 		pro.setUpdateTime(nowDate);
+		pro.setStype(mod.getStype());
 		proDao.insert(pro);
 
 		D_MDO0004 row =new D_MDO0004();
@@ -60,6 +61,7 @@ public class MDO0004Service extends MDO0004BaseModel implements ExecProcessFlow
 		row.setImage(pro.getImage());
 		row.setIsshare(pro.getIsshare().toString());
 		row.setRemark(pro.getRemark());
+		row.setStype(pro.getStype());
 		this.setD_mdo0004(row);
 	
 	}

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

@@ -61,6 +61,7 @@ public class MDO0005Service extends MDO0005BaseModel implements ExecProcessFlow
 			row.setRemark(mod.getRemark());
 			row.setType(mod.getType());
 			row.setImage2(mod.getImage2());
+			row.setStype(mod.getStype());
 			rows.add(row);
 		}
 

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

@@ -25,6 +25,7 @@ import com.miniframe.tools.docker.DockerExe;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import lombok.SneakyThrows;
+import tk.mybatis.mapper.util.StringUtil;
 
 /**
  * 西工大系统,“新版求解v2”逻辑处理（重新生成不覆盖）。
@@ -43,6 +44,9 @@ public class MDO0039Service extends MDO0039BaseModel implements ExecProcessFlow
 		if(pro==null){
 			throw new BusinessException("MDO000001");
 		}
+		if(StringUtil.isEmpty(pro.getStype())){
+			throw new BusinessException("MDO000011");
+		}
 		//创建文件路径
 		XIFileUtils.mkdir(LogService.BPATH);
 		XIFileUtils.mkdir(LogService.BPATH+"/"+pro.getId());

src/main/java/com/miniframe/modo/temp/TemplateGenerator.java

@@ -94,12 +94,15 @@ public class TemplateGenerator {
      */
     private static List<Solver> findSolvers(String pid) throws IOException {
         //TODO 目前只有函数求解器
+        MdoProjectMapper pDao = UtilTools.getBean(MdoProjectMapper.class);
+        MdoProject p = pDao.selectByPrimaryKey(pid);
         List<Solver> solvers =new ArrayList<>();
         //ptyon py.py 文件 写入
         String ppPath=writePython(pid);
         if(!StringUtil.isEmpty(ppPath)){
             Solver solver =new Solver();
             solver.setPythonPath(ppPath);
+            solver.setStype(p.getStype());
             solvers.add(solver);
         }
         return solvers;

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

@@ -4,7 +4,7 @@ public class Solver {
     private String cpacsPath;
     private String workflowPath;
     private String pythonPath;
-
+    private String stype;
     public String getCpacsPath() {
         return cpacsPath;
     }
@@ -28,4 +28,12 @@ public class Solver {
     public void setPythonPath(String pythonPath) {
         this.pythonPath = pythonPath;
     }
+
+    public String getStype() {
+        return stype;
+    }
+
+    public void setStype(String stype) {
+        this.stype = stype;
+    }
 }

src/main/resources/templates/problem.ftl

@@ -122,7 +122,7 @@
         <workflowPath/>
        </#if>
        <#if b.pythonPath??>
-        <pythonPath name="Forrester">${b.pythonPath}</pythonPath>
+        <pythonPath name="${b.stype}">${b.pythonPath}</pythonPath>
        <#else>
         <pythonPath/>
        </#if>

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

@@ -73,4 +73,5 @@
 3000008,MDO000008,进化优化器参数不存在！,
 
 3000009,MDO000009,求解配置文件生成失败！,
-3000010,MDO000010,求解失败！,
+3000010,MDO000010,求解失败！,
+3000011,MDO000011,求解器类型缺失！,

系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0001_D(工程查询).csv

@@ -8,4 +8,5 @@
 2.5,createtime,创建时间,string,,,,,,,,,,,
 2.6,updatetime,更新时间,string,,,,,,,,,,,
 2.7,isshare,,string,,,,,,,,,,,
-2.8,flow,流程图,string,,,,,,,,,,,
+2.8,flow,流程图,string,,,,,,,,,,,
+2.9,stype,求解器类型,string,,,,,,,,,,,

系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0002_A(工程添加修改).csv

@@ -5,3 +5,4 @@
 4,image,图片base64,string,,,,,,,,,,,
 5,isshare,共享,string,,1,是,,,,,,,,
 6,flow,流程图,string,,,,,,,,,,,
+7,stype,求解器类型,string,,,,,,,,,,,

系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0004_D(根据模板添加工程).csv

@@ -6,4 +6,5 @@
 5,createtime,创建时间,string,,,,,,,,,,,
 6,updatetime,更新时间,string,,,,,,,,,,,
 7,isshare,,string,,,,,,,,,,,
-8,flow,流程图,string,,,,,,,,,,,
+8,flow,流程图,string,,,,,,,,,,,
+9,stype,求解器类型,string,,,,,,,,,,,

系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0005_D(模板查询).csv

@@ -10,4 +10,5 @@
 2.7,isshare,,string,,,,,,,,,,,
 2.8,flow,流程图,string,,,,,,,,,,,
 2.9,type,1-函数优化模版 2-翼型优化模版 3-机翼优化模版,int,,,,,,,,,,,
-2.10,image2,图片base64,string,,,,,,,,,,,
+2.10,image2,图片base64,string,,,,,,,,,,,
+2.11,stype,求解器类型,string,,,,,,,,,,,