Merge branch 'dev_ALlen' into dev-rmd

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

@@ -37,7 +37,7 @@ public class MimeTypeUtils {
             // pdf
             "pdf",
             // special
-            "x_t","str"
+            "x_t","str","lgm"
     };
 
     public static String getExtension(String prefix) {

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

@@ -85,7 +85,7 @@ public class MeasSpectralRadiation extends BaseEntity {
      * 标定温度
      */
     @Excel(name = "标定温度")
-    private Long calTemp;
+    private String calTemp;
 
     /**
      * 标定曲线
@@ -207,11 +207,11 @@ public class MeasSpectralRadiation extends BaseEntity {
         this.backgroundData = backgroundData;
     }
 
-    public Long getCalTemp() {
+    public String getCalTemp() {
         return calTemp;
     }
 
-    public void setCalTemp(Long calTemp) {
+    public void setCalTemp(String calTemp) {
         this.calTemp = calTemp;
     }
 

sql/meas.sql

@@ -491,7 +491,7 @@ CREATE TABLE `meas_spectral_radiation`  (
   `lens_f_view` decimal(8, 2) NOT NULL COMMENT '镜头视场角',
   `gain` int(11) NOT NULL COMMENT '增益',
   `background_data` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '背景数据',
-  `cal_temp` int(11) NULL DEFAULT NULL COMMENT '标定温度',
+  `cal_temp` varchar(4000) NULL DEFAULT NULL COMMENT '标定温度',
   `cal_curve` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标定曲线',
   `raw_data` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '原始数据',
   `radiance_1` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '辐射亮度（3~5μm）',