Browse Source

用户邮箱验证码

huangxingxing 3 months ago
parent
commit
52722e67b8

+ 13 - 0
generated/com/miniframe/generate/comm/mdo/D_MDO0021_ROWS_RECODE.java

@@ -74,4 +74,17 @@ public class D_MDO0021_ROWS_RECODE extends BaseMapModel implements Serializable
 	public String getPid() {
 		return this.pid;
 	}
+	int gser;//分组编号
+	/**
+	 *分组编号
+	 */
+	public void setGser(int gser) {
+		this.gser=gser;
+	}
+	/**
+	 *分组编号
+	 */
+	public int getGser() {
+		return this.gser;
+	}
 }

+ 1 - 0
generated/validator/resources_d_mdo0021_rows_recodeForm_validator.properties

@@ -3,4 +3,5 @@ d_mdo0021_rows_recode.step = \u6B65\u6570
 d_mdo0021_rows_recode.vars = \u53D8\u91CF
 d_mdo0021_rows_recode.vals = \u6570\u636E
 d_mdo0021_rows_recode.pid = \u9879\u76EE
+d_mdo0021_rows_recode.gser = \u5206\u7EC4\u7F16\u53F7
 d_mdo0021_rows_recodeForm = true

+ 1 - 0
generated/validator/resources_d_mdo0021_rows_recodeForm_validator_zh_CN.properties

@@ -3,4 +3,5 @@ d_mdo0021_rows_recode.step = \u6B65\u6570
 d_mdo0021_rows_recode.vars = \u53D8\u91CF
 d_mdo0021_rows_recode.vals = \u6570\u636E
 d_mdo0021_rows_recode.pid = \u9879\u76EE
+d_mdo0021_rows_recode.gser = \u5206\u7EC4\u7F16\u53F7
 d_mdo0021_rows_recodeForm = true

+ 23 - 0
modelsrc/com/miniframe/model/mdo/MdoProComval.java

@@ -37,6 +37,11 @@ public class MdoProComval extends MiniserviceBaseModel implements Serializable {
      */
     private Integer type;
 
+    /**
+     * 分组编号
+     */
+    private Integer gser;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -146,4 +151,22 @@ public class MdoProComval extends MiniserviceBaseModel implements Serializable {
     public void setType(Integer type) {
         this.type = type;
     }
+
+    /**
+     * 获取分组编号
+     *
+     * @return gser - 分组编号
+     */
+    public Integer getGser() {
+        return gser;
+    }
+
+    /**
+     * 设置分组编号
+     *
+     * @param gser 分组编号
+     */
+    public void setGser(Integer gser) {
+        this.gser = gser;
+    }
 }

+ 60 - 0
modelsrc/com/miniframe/model/mdo/MdoProComvalSQLBuilder.java

@@ -503,6 +503,66 @@ public class MdoProComvalSQLBuilder {
             addCriterion("type not between", value1, value2, "type");
             return (Criteria) this;
         }
+
+        public Criteria andGserIsNull() {
+            addCriterion("gser is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGserIsNotNull() {
+            addCriterion("gser is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGserEqualTo(Integer value) {
+            addCriterion("gser =", value, "gser");
+            return (Criteria) this;
+        }
+
+        public Criteria andGserNotEqualTo(Integer value) {
+            addCriterion("gser <>", value, "gser");
+            return (Criteria) this;
+        }
+
+        public Criteria andGserGreaterThan(Integer value) {
+            addCriterion("gser >", value, "gser");
+            return (Criteria) this;
+        }
+
+        public Criteria andGserGreaterThanOrEqualTo(Integer value) {
+            addCriterion("gser >=", value, "gser");
+            return (Criteria) this;
+        }
+
+        public Criteria andGserLessThan(Integer value) {
+            addCriterion("gser <", value, "gser");
+            return (Criteria) this;
+        }
+
+        public Criteria andGserLessThanOrEqualTo(Integer value) {
+            addCriterion("gser <=", value, "gser");
+            return (Criteria) this;
+        }
+
+        public Criteria andGserIn(List<Integer> values) {
+            addCriterion("gser in", values, "gser");
+            return (Criteria) this;
+        }
+
+        public Criteria andGserNotIn(List<Integer> values) {
+            addCriterion("gser not in", values, "gser");
+            return (Criteria) this;
+        }
+
+        public Criteria andGserBetween(Integer value1, Integer value2) {
+            addCriterion("gser between", value1, value2, "gser");
+            return (Criteria) this;
+        }
+
+        public Criteria andGserNotBetween(Integer value1, Integer value2) {
+            addCriterion("gser not between", value1, value2, "gser");
+            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 Wed May 21 14:32:57 CST 2025.
+    This file was generated on Fri Jun 06 11:17:44 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 Wed May 21 14:32:58 CST 2025.
+    This file was generated on Fri Jun 06 11:17:45 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

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

@@ -41,6 +41,7 @@ public class MDO0021Service extends MDO0021BaseModel implements ExecProcessFlow
 			row.setStep(comval.getStep().toString());
 			row.setVals(comval.getVals());
 			row.setVars(comval.getVars());
+			row.setGser(comval.getGser()!=null?comval.getGser():0);
 			rows.add(row);
 //			LogService.addLog(pid, XiJsonUtil.objectToJson(comval));
 		}

+ 6 - 1
src/main/java/com/miniframe/tools/file/AdflowFileRead.java

@@ -42,6 +42,7 @@ public class AdflowFileRead {
         try (BufferedReader br = new BufferedReader(new FileReader(file))) {
             int size=0;
             int tel =0;//多个zone
+            int zoneid =0;
             // 逐行读取,直到文件末尾
             while ((line = br.readLine()) != null) {
                 line=line.trim().replaceAll("\\s+"," ").trim();//替换多个空格为一个空格
@@ -61,8 +62,9 @@ public class AdflowFileRead {
                 if(line.startsWith("Nodes")){
                     line=line.trim().replace("Nodes = ","");
                     size =Integer.valueOf(line.split(" ")[0]);
-                    tel=tel+100;
+                    tel=tel+1000000;
                     i=0;
+                    zoneid++;
                     continue;
                 }
                 if(line.startsWith("DATAPACKING")){
@@ -88,7 +90,9 @@ public class AdflowFileRead {
                         comval.setVals(vals[3]+" "+vals[4]);
                     }
                     comval.setType(2);//"1-列表数据 2-几何数据 3-压力数据"
+                    comval.setGser(zoneid);
                     comvalDao.insert(comval);
+
 //                    WebsocketEndPoint webs =  (WebsocketEndPoint) UtilTools.getBean("websocketEndPoint");
 //                    Gson gson = new Gson();
 //                    webs.sendMessageToUser(String.valueOf(pid),gson.toJson(comval));
@@ -100,6 +104,7 @@ public class AdflowFileRead {
                     comval2.setVars("x cp");
                     comval2.setVals(vals[6]+" "+vals[9]);
                     comval2.setType(3);//"1-列表数据 2-几何数据 3-压力数据"
+                    comval.setGser(zoneid);
                     comvalDao.insert(comval2);
 //                    webs.sendMessageToUser(String.valueOf(pid),gson.toJson(comval2));
                 }

+ 2 - 1
系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0021_D(求解过程变量数据获取).csv

@@ -4,4 +4,5 @@
 1.2,step,步数,string,,,,,,,,,,,
 1.3,vars,变量,string,,,,,,,,,,,
 1.4,vals,数据,string,,,,,,,,,,,
-1.5,pid,项目,string,,,,,,,,,,,
+1.5,pid,项目,string,,,,,,,,,,,
+1.6,gser,分组编号,int,,,,,,,,,,,