浏览代码

FEM 求解

huangxingxing 2 年之前
父节点
当前提交
6d91659651

+ 48 - 0
modelsrc/com/miniframe/model/system/AdiModeling.java

@@ -58,6 +58,18 @@ public class AdiModeling extends MiniserviceBaseModel implements Serializable {
     @Column(name = "vtk_file")
     private String vtkFile;
 
+    /**
+     * FEM网格文件
+     */
+    @Column(name = "fem_grid_file")
+    private String femGridFile;
+
+    /**
+     * FEM文件类型
+     */
+    @Column(name = "fem_grid_file_type")
+    private String femGridFileType;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -221,4 +233,40 @@ public class AdiModeling extends MiniserviceBaseModel implements Serializable {
     public void setVtkFile(String vtkFile) {
         this.vtkFile = vtkFile == null ? null : vtkFile.trim();
     }
+
+    /**
+     * 获取FEM网格文件
+     *
+     * @return fem_grid_file - FEM网格文件
+     */
+    public String getFemGridFile() {
+        return femGridFile;
+    }
+
+    /**
+     * 设置FEM网格文件
+     *
+     * @param femGridFile FEM网格文件
+     */
+    public void setFemGridFile(String femGridFile) {
+        this.femGridFile = femGridFile == null ? null : femGridFile.trim();
+    }
+
+    /**
+     * 获取FEM文件类型
+     *
+     * @return fem_grid_file_type - FEM文件类型
+     */
+    public String getFemGridFileType() {
+        return femGridFileType;
+    }
+
+    /**
+     * 设置FEM文件类型
+     *
+     * @param femGridFileType FEM文件类型
+     */
+    public void setFemGridFileType(String femGridFileType) {
+        this.femGridFileType = femGridFileType == null ? null : femGridFileType.trim();
+    }
 }

+ 140 - 0
modelsrc/com/miniframe/model/system/AdiModelingSQLBuilder.java

@@ -733,6 +733,146 @@ public class AdiModelingSQLBuilder {
             addCriterion("vtk_file not between", value1, value2, "vtkFile");
             return (Criteria) this;
         }
+
+        public Criteria andFemGridFileIsNull() {
+            addCriterion("fem_grid_file is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileIsNotNull() {
+            addCriterion("fem_grid_file is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileEqualTo(String value) {
+            addCriterion("fem_grid_file =", value, "femGridFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileNotEqualTo(String value) {
+            addCriterion("fem_grid_file <>", value, "femGridFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileGreaterThan(String value) {
+            addCriterion("fem_grid_file >", value, "femGridFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileGreaterThanOrEqualTo(String value) {
+            addCriterion("fem_grid_file >=", value, "femGridFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileLessThan(String value) {
+            addCriterion("fem_grid_file <", value, "femGridFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileLessThanOrEqualTo(String value) {
+            addCriterion("fem_grid_file <=", value, "femGridFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileLike(String value) {
+            addCriterion("fem_grid_file like", value, "femGridFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileNotLike(String value) {
+            addCriterion("fem_grid_file not like", value, "femGridFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileIn(List<String> values) {
+            addCriterion("fem_grid_file in", values, "femGridFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileNotIn(List<String> values) {
+            addCriterion("fem_grid_file not in", values, "femGridFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileBetween(String value1, String value2) {
+            addCriterion("fem_grid_file between", value1, value2, "femGridFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileNotBetween(String value1, String value2) {
+            addCriterion("fem_grid_file not between", value1, value2, "femGridFile");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileTypeIsNull() {
+            addCriterion("fem_grid_file_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileTypeIsNotNull() {
+            addCriterion("fem_grid_file_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileTypeEqualTo(String value) {
+            addCriterion("fem_grid_file_type =", value, "femGridFileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileTypeNotEqualTo(String value) {
+            addCriterion("fem_grid_file_type <>", value, "femGridFileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileTypeGreaterThan(String value) {
+            addCriterion("fem_grid_file_type >", value, "femGridFileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("fem_grid_file_type >=", value, "femGridFileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileTypeLessThan(String value) {
+            addCriterion("fem_grid_file_type <", value, "femGridFileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileTypeLessThanOrEqualTo(String value) {
+            addCriterion("fem_grid_file_type <=", value, "femGridFileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileTypeLike(String value) {
+            addCriterion("fem_grid_file_type like", value, "femGridFileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileTypeNotLike(String value) {
+            addCriterion("fem_grid_file_type not like", value, "femGridFileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileTypeIn(List<String> values) {
+            addCriterion("fem_grid_file_type in", values, "femGridFileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileTypeNotIn(List<String> values) {
+            addCriterion("fem_grid_file_type not in", values, "femGridFileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileTypeBetween(String value1, String value2) {
+            addCriterion("fem_grid_file_type between", value1, value2, "femGridFileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFemGridFileTypeNotBetween(String value1, String value2) {
+            addCriterion("fem_grid_file_type not between", value1, value2, "femGridFileType");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 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 Mon May 08 11:23:35 CST 2023.
+    This file was generated on Wed May 10 10:02:30 CST 2023.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

+ 5 - 5
src/main/java/com/miniframe/bisiness/system/FEM001Service.java

@@ -43,7 +43,7 @@ public class FEM001Service extends FEM001BaseModel implements ExecProcessFlow {
 			AdiModeling modeling =new AdiModeling();
 			modeling.setId(UtilTools.getUUid());
 			modeling.setPid(pid);
-			modeling.setGridFile(gridFileId);
+			modeling.setFemGridFile(gridFileId);
 			modeling.setGridFileType("bdf");
 			modeling.setUid(usrId);
 
@@ -52,13 +52,13 @@ public class FEM001Service extends FEM001BaseModel implements ExecProcessFlow {
 			modelingMapper.insert(modeling);
 		}else{
 			AdiModeling modeling =modelings.get(0);
-			if(!gridFileId.equals(modeling.getGridFile())) {
-				CaeFileUtils.deleFile(modeling.getGridFile());
+			if(!gridFileId.equals(modeling.getFemGridFile())) {
+				CaeFileUtils.deleFile(modeling.getFemGridFile());
 			}
 			CaeFileUtils.deleFile(modeling.getVtkFile());
 
-			modeling.setGridFile(gridFileId);
-			modeling.setGridFileType("bdf");
+			modeling.setFemGridFile(gridFileId);
+			modeling.setFemGridFileType("bdf");
 
 			String vtkfileId = bdfToVtk(gridFileId, usrId, sysFileDAO);
 			modeling.setVtkFile(vtkfileId);

+ 1 - 1
src/main/java/com/miniframe/solverconfig/fem/FEMPath.java

@@ -42,7 +42,7 @@ public class FEMPath {
         fileMove(nmlFile,exePath+MFConstant.separator+"fem_analysis.in");
 //        SysFile mapbcFile= fileMapper.selectByPrimaryKey(config.getMapbcFile());
 //        fileMove(mapbcFile,exeInPath+MFConstant.separator+"fem.bdf");
-        SysFile grid= fileMapper.selectByPrimaryKey(modeling.getGridFile());
+        SysFile grid= fileMapper.selectByPrimaryKey(modeling.getFemGridFile());
         fileMove(grid,exeInPath+MFConstant.separator+"fem.bdf");
     }