Merge branch 'dev_ALlen' into dev-rmd

meas-common/src/main/java/com/meas/common/utils/file/MimeTypeUtils.java

@@ -35,7 +35,10 @@ public class MimeTypeUtils {
             // 视频格式
             "mp4", "avi", "rmvb",
             // pdf
-            "pdf"};
+            "pdf",
+            // special
+            "x_t","str"
+    };
 
     public static String getExtension(String prefix) {
         switch (prefix) {

meas-system/src/main/java/com/meas/system/domain/MeasEnvData.java

@@ -33,6 +33,15 @@ public class MeasEnvData extends BaseEntity {
     private String measurementBatch;
 //  发动机号
     private String model;
+    /**
+     * 几何模型文件
+     */
+    private String geometryFiles;
+
+    /**
+     * 几何模型图片
+     */
+    private String geometryImage;
 
 
     /**
@@ -222,13 +231,31 @@ public class MeasEnvData extends BaseEntity {
         this.model = model;
     }
 
+    public String getGeometryFiles() {
+        return geometryFiles;
+    }
+
+    public void setGeometryFiles(String geometryFiles) {
+        this.geometryFiles = geometryFiles;
+    }
+
+    public String getGeometryImage() {
+        return geometryImage;
+    }
+
+    public void setGeometryImage(String geometryImage) {
+        this.geometryImage = geometryImage;
+    }
+
     @Override
     public String toString() {
         return "MeasEnvData{" +
                 "id=" + id +
                 ", measurementBatchId=" + measurementBatchId +
                 ", measurementBatch='" + measurementBatch + '\'' +
-                ", model=" + model +
+                ", model='" + model + '\'' +
+                ", geometryFiles='" + geometryFiles + '\'' +
+                ", geometryImage='" + geometryImage + '\'' +
                 ", engineStatus='" + engineStatus + '\'' +
                 ", angle='" + angle + '\'' +
                 ", turbinePostTemp='" + turbinePostTemp + '\'' +

meas-system/src/main/resources/mapper/meas/MeasEnvDataMapper.xml

@@ -9,6 +9,8 @@
         <result property="measurementBatchId" column="measurement_batch_id"/>
         <result property="measurementBatch" column="measurement_batch"/>
         <result property="model" column="model"/>
+        <result property="geometryFiles" column="geometry_files"/>
+        <result property="geometryImage" column="geometry_image"/>
         <result property="engineStatus" column="engine_status"/>
         <result property="angle" column="angle"/>
         <result property="turbinePostTemp" column="turbine_post_temp"/>
@@ -32,6 +34,8 @@
             med.measurement_batch_id,
             mb.measurement_batch,
             mem.model,
+            mem.geometry_files,
+            mem.geometry_image,
             med.engine_status,
             med.angle,
             med.turbine_post_temp,