adflow 求解

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

@@ -20,7 +20,7 @@ public class MdoProComval extends MiniserviceBaseModel implements Serializable {
     /**
      * 步数
      */
-    private String step;
+    private Integer step;
 
     /**
      * 变量
@@ -80,7 +80,7 @@ public class MdoProComval extends MiniserviceBaseModel implements Serializable {
      *
      * @return step - 步数
      */
-    public String getStep() {
+    public Integer getStep() {
         return step;
     }
 
@@ -89,8 +89,8 @@ public class MdoProComval extends MiniserviceBaseModel implements Serializable {
      *
      * @param step 步数
      */
-    public void setStep(String step) {
-        this.step = step == null ? null : step.trim();
+    public void setStep(Integer step) {
+        this.step = step;
     }
 
     /**

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

@@ -254,62 +254,52 @@ public class MdoProComvalSQLBuilder {
             return (Criteria) this;
         }
 
-        public Criteria andStepEqualTo(String value) {
+        public Criteria andStepEqualTo(Integer value) {
             addCriterion("step =", value, "step");
             return (Criteria) this;
         }
 
-        public Criteria andStepNotEqualTo(String value) {
+        public Criteria andStepNotEqualTo(Integer value) {
             addCriterion("step <>", value, "step");
             return (Criteria) this;
         }
 
-        public Criteria andStepGreaterThan(String value) {
+        public Criteria andStepGreaterThan(Integer value) {
             addCriterion("step >", value, "step");
             return (Criteria) this;
         }
 
-        public Criteria andStepGreaterThanOrEqualTo(String value) {
+        public Criteria andStepGreaterThanOrEqualTo(Integer value) {
             addCriterion("step >=", value, "step");
             return (Criteria) this;
         }
 
-        public Criteria andStepLessThan(String value) {
+        public Criteria andStepLessThan(Integer value) {
             addCriterion("step <", value, "step");
             return (Criteria) this;
         }
 
-        public Criteria andStepLessThanOrEqualTo(String value) {
+        public Criteria andStepLessThanOrEqualTo(Integer value) {
             addCriterion("step <=", value, "step");
             return (Criteria) this;
         }
 
-        public Criteria andStepLike(String value) {
-            addCriterion("step like", value, "step");
-            return (Criteria) this;
-        }
-
-        public Criteria andStepNotLike(String value) {
-            addCriterion("step not like", value, "step");
-            return (Criteria) this;
-        }
-
-        public Criteria andStepIn(List<String> values) {
+        public Criteria andStepIn(List<Integer> values) {
             addCriterion("step in", values, "step");
             return (Criteria) this;
         }
 
-        public Criteria andStepNotIn(List<String> values) {
+        public Criteria andStepNotIn(List<Integer> values) {
             addCriterion("step not in", values, "step");
             return (Criteria) this;
         }
 
-        public Criteria andStepBetween(String value1, String value2) {
+        public Criteria andStepBetween(Integer value1, Integer value2) {
             addCriterion("step between", value1, value2, "step");
             return (Criteria) this;
         }
 
-        public Criteria andStepNotBetween(String value1, String value2) {
+        public Criteria andStepNotBetween(Integer value1, Integer value2) {
             addCriterion("step not between", value1, value2, "step");
             return (Criteria) this;
         }

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 Tue Mar 18 14:03:32 CST 2025.
+    This file was generated on Fri Mar 21 10:48:41 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 Tue Mar 18 14:03:33 CST 2025.
+    This file was generated on Fri Mar 21 10:48:42 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

@@ -128,7 +128,7 @@ public class MDO0020Service extends MDO0020BaseModel implements ExecProcessFlow
 						MdoProComval comval =new MdoProComval();
 						comval.setId(UtilTools.getUUid());
 						comval.setPid(pid);
-						comval.setStep(step);
+						comval.setStep(Integer.valueOf(step));
 						comval.setVars(x_name);
 						comval.setVals(vals);
 						comvalDao.insert(comval);

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

@@ -31,13 +31,14 @@ public class MDO0021Service extends MDO0021BaseModel implements ExecProcessFlow
 		MdoProComvalSQLBuilder.Criteria sc = sb.createCriteria();
 		sc.andPidEqualTo(pid);
 		sc.andTypeEqualTo(type);
+		sb.setOrderByClause("step asc");
 		List<MdoProComval> comvals =comvalDao.selectByExample(sb);
 		List<D_MDO0021_ROWS_RECODE> rows =new ArrayList<>();
 		for (MdoProComval comval:comvals) {
 			D_MDO0021_ROWS_RECODE row =new D_MDO0021_ROWS_RECODE();
 			row.setComvid(comval.getId());
 			row.setPid(pid);
-			row.setStep(comval.getStep());
+			row.setStep(comval.getStep().toString());
 			row.setVals(comval.getVals());
 			row.setVars(comval.getVars());
 			rows.add(row);

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

@@ -365,7 +365,7 @@ public class MDO0039Service extends MDO0039BaseModel implements ExecProcessFlow
 						MdoProComval comval =new MdoProComval();
 						comval.setId(UtilTools.getUUid());
 						comval.setPid(pid);
-						comval.setStep(String.valueOf(step));
+						comval.setStep(step);
 						comval.setVars(x_name);
 						comval.setVals(tvals);
 						comvalDao.insert(comval);

src/main/java/com/miniframe/tools/file/AirfoilFileRead.java

@@ -50,7 +50,7 @@ public class AirfoilFileRead {
                     MdoProComval comval =new MdoProComval();
                     comval.setId(UtilTools.getUUid());
                     comval.setPid(pid);
-                    comval.setStep(String.valueOf(i));
+                    comval.setStep(i);
                     comval.setVars("v1 v2");
                     comval.setVals(tvals);
                     comval.setType(2);//"1-列表数据 2-几何数据 3-压力数据"

src/main/java/com/miniframe/tools/file/CpFileRead.java

@@ -51,7 +51,7 @@ public class CpFileRead {
                     MdoProComval comval =new MdoProComval();
                     comval.setId(UtilTools.getUUid());
                     comval.setPid(pid);
-                    comval.setStep(String.valueOf(i));
+                    comval.setStep(i);
                     comval.setVars(line1);
                     comval.setVals(tvals);
                     comval.setType(3);//"1-列表数据 2-几何数据 3-压力数据"

src/main/java/com/miniframe/tools/file/SurromdaoFileRead.java

@@ -50,7 +50,7 @@ public class SurromdaoFileRead {
                     MdoProComval comval =new MdoProComval();
                     comval.setId(UtilTools.getUUid());
                     comval.setPid(pid);
-                    comval.setStep(String.valueOf(i));
+                    comval.setStep(i);
                     comval.setVars(line1);
                     comval.setVals(tvals);
                     comval.setType(1);