fix form 测量批次id to 测量环境id

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

@@ -22,11 +22,31 @@ public class MeasDataResults extends BaseEntity {
     private Long id;
 
     /**
-     * 测量批次id
+     * 测量环境id
      */
-    @Excel(name = "测量批次id")
+    @Excel(name = "测量环境id")
     private String measurementBatchId;
 
+    /**
+     * 发动机型号
+     */
+    private String model;
+
+    /**
+     * 几何模型文件
+     */
+    private String geometryFiles;
+
+    /**
+     * 几何模型图片
+     */
+    private String geometryImage;
+
+    /**
+     * 测量批次
+     */
+    private String measurementBatch;
+
     /**
      * 光谱辐射强度3~5μm
      */
@@ -67,6 +87,38 @@ public class MeasDataResults extends BaseEntity {
         this.measurementBatchId = measurementBatchId;
     }
 
+    public String getModel() {
+        return model;
+    }
+
+    public void setModel(String model) {
+        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;
+    }
+
+    public String getMeasurementBatch() {
+        return measurementBatch;
+    }
+
+    public void setMeasurementBatch(String measurementBatch) {
+        this.measurementBatch = measurementBatch;
+    }
+
     public String getSpecIrr1() {
         return specIrr1;
     }
@@ -101,17 +153,17 @@ public class MeasDataResults extends BaseEntity {
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("measurementBatchId", getMeasurementBatchId())
-                .append("specIrr1", getSpecIrr1())
-                .append("specIrr2", getSpecIrr2())
-                .append("specBandIrr1", getSpecBandIrr1())
-                .append("specBandIrr2", getSpecBandIrr2())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .toString();
+        return "MeasDataResults{" +
+                "id=" + id +
+                ", measurementBatchId='" + measurementBatchId + '\'' +
+                ", model='" + model + '\'' +
+                ", geometryFiles='" + geometryFiles + '\'' +
+                ", geometryImage='" + geometryImage + '\'' +
+                ", measurementBatch='" + measurementBatch + '\'' +
+                ", specIrr1='" + specIrr1 + '\'' +
+                ", specIrr2='" + specIrr2 + '\'' +
+                ", specBandIrr1=" + specBandIrr1 +
+                ", specBandIrr2=" + specBandIrr2 +
+                '}';
     }
 }

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

@@ -45,7 +45,7 @@ public class MeasEnvData extends BaseEntity {
      * 涡轮后温度
      */
     @Excel(name = "涡轮后温度")
-    private BigDecimal turbinePostTemp;
+    private String turbinePostTemp;
 
     /**
      * 测试距离
@@ -128,11 +128,11 @@ public class MeasEnvData extends BaseEntity {
         this.angle = angle;
     }
 
-    public BigDecimal getTurbinePostTemp() {
+    public String getTurbinePostTemp() {
         return turbinePostTemp;
     }
 
-    public void setTurbinePostTemp(BigDecimal turbinePostTemp) {
+    public void setTurbinePostTemp(String turbinePostTemp) {
         this.turbinePostTemp = turbinePostTemp;
     }
 

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

@@ -22,9 +22,9 @@ public class MeasSpectralRadiation extends BaseEntity {
     private Long id;
 
     /**
-     * 测量批次id
+     * 测量环境id
      */
-    @Excel(name = "测量批次id")
+    @Excel(name = "测量环境id")
     private Long measurementBatchId;
 
     /**

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

@@ -22,7 +22,7 @@ public class MeasThermalImagerTestData extends BaseEntity {
     /**
      * 测量环境id
      */
-    @Excel(name = "测量批次id")
+    @Excel(name = "测量环境id")
     private Long measurementBatchId;
 
     /**

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

@@ -20,9 +20,9 @@ public class MeasTransmissionRate extends BaseEntity {
     private Long id;
 
     /**
-     * 测量批次id
+     * 测量环境id
      */
-    @Excel(name = "测量批次id")
+    @Excel(name = "测量环境id")
     private Long measurementBatchId;
 
     /**

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

@@ -7,6 +7,10 @@
     <resultMap type="MeasDataResults" id="MeasDataResultsResult">
         <result property="id" column="id"/>
         <result property="measurementBatchId" column="measurement_batch_id"/>
+        <result property="model" column="model"/>
+        <result property="geometryFiles" column="geometry_files"/>
+        <result property="geometryImage" column="geometry_image"/>
+        <result property="measurementBatch" column="measurement_batch"/>
         <result property="specIrr1" column="spec_irr_1"/>
         <result property="specIrr2" column="spec_irr_2"/>
         <result property="specBandIrr1" column="spec_band_irr_1"/>

meas_web/src/views/meas/dataResults/index.vue

@@ -80,7 +80,7 @@
     <el-table v-loading="loading" :data="dataResultsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="测量批次id" align="center" prop="measurementBatchId" />
+      <el-table-column label="测量环境id" align="center" prop="measurementBatchId" />
       <el-table-column label="光谱辐射强度3~5μm" align="center" prop="specIrr1" />
       <el-table-column label="光谱辐射强度8~14μm" align="center" prop="specIrr2" />
       <el-table-column label="波段辐射强度3~5μm" align="center" prop="specBandIrr1" />
@@ -118,8 +118,8 @@
     <!-- 添加或修改数据结果对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
-        <el-form-item label="测量批次id" label-width="90px" prop="measurementBatchId">
-          <el-input v-model="form.measurementBatchId" placeholder="请输入测量批次id" />
+        <el-form-item label="测量环境id" label-width="90px" prop="measurementBatchId">
+          <el-input v-model="form.measurementBatchId" placeholder="请输入测量环境id" />
         </el-form-item>
         <el-form-item label="光谱辐射强度3~5μm" prop="specIrr1">
           <file-upload :fileSize="0" :limit="1" :fileType="['txt']" v-model="form.specIrr1"/>
@@ -182,8 +182,8 @@ export default {
       // 表单校验
       rules: {
         measurementBatchId:[
-          { required: true, message: "测量批次id不能为空"},
-          {type: 'number', message: '测量批次id必须为数字',trigger: 'blur'}
+          { required: true, message: "测量环境id不能为空"},
+          {type: 'number', message: '测量环境id必须为数字',trigger: 'blur'}
         ],
         specBandIrr1: [
           { pattern: /^(0(\.\d{1,2})?|[1-9]\d{0,2}(\.\d{1,2})?|1000(\.00?)?)$/, message: '请输入0.00-1000.00之间的数字,最多可保留两位小数',trigger: 'blur'}

meas_web/src/views/meas/radiation/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="测量批次id" label-width="90px" prop="measurementBatchId">
-        <el-input v-model="queryParams.measurementBatchId" placeholder="请输入测量批次id" clearable
+      <el-form-item label="测量环境id" label-width="90px" prop="measurementBatchId">
+        <el-input v-model="queryParams.measurementBatchId" placeholder="请输入测量环境id" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="型号" prop="model">
@@ -46,7 +46,7 @@
     <el-table v-loading="loading" :data="radiationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="测量批次id" align="center" prop="measurementBatchId" />
+      <el-table-column label="测量环境id" align="center" prop="measurementBatchId" />
       <el-table-column label="型号" align="center" prop="model" />
       <el-table-column label="镜头视场角" align="center" prop="lensFView" />
       <el-table-column label="增益" align="center" prop="gain" />
@@ -78,8 +78,8 @@
     <!-- 添加或修改光谱辐射对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="测量批次id" label-width="100px" prop="measurementBatchId">
-          <el-select v-model="form.measurementBatchId" placeholder="请选择测量批次id">
+        <el-form-item label="测量环境id" label-width="100px" prop="measurementBatchId">
+          <el-select v-model="form.measurementBatchId" placeholder="请选择测量环境id">
             <el-option v-for="item in measureBatchOptions" :key="item.id" :label="item.measurementBatch"
               :value="item.id">
               <span style="float: left">{{ item.id }}</span>
@@ -169,8 +169,8 @@ export default {
       // 表单校验
       rules: {
         measurementBatchId: [
-          { required: true, message: "测量批次id不能为空" },
-          { type: 'number', message: '测量批次id必须为数字', trigger: 'blur' }
+          { required: true, message: "测量环境id不能为空" },
+          { type: 'number', message: '测量环境id必须为数字', trigger: 'blur' }
         ],
         model: [
           { required: true, message: "型号不能为空", trigger: "blur" },

meas_web/src/views/meas/thermalImagerTesDdata/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="测量批次id" label-width="90px" prop="measurementBatchId">
+      <el-form-item label="测量环境id" label-width="90px" prop="measurementBatchId">
         <el-input
           v-model="queryParams.measurementBatchId"
-          placeholder="请输入测量批次id"
+          placeholder="请输入测量环境id"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -80,7 +80,7 @@
     <el-table v-loading="loading" :data="thermalImagerTesDdataList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="测量批次id" align="center" prop="measurementBatchId" />
+      <el-table-column label="测量环境id" align="center" prop="measurementBatchId" />
       <el-table-column label="型号" align="center" prop="model" />
       <el-table-column label="镜头视场角" align="center" prop="lensFView" />
       <el-table-column label="滤镜编号" align="center" prop="filterNo" />
@@ -128,8 +128,8 @@
     <!-- 添加或修改热像仪测试数据对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="测量批次id" prop="measurementBatchId">
-          <el-select v-model="form.measurementBatchId" placeholder="请选择测量批次id">
+        <el-form-item label="测量环境id" prop="measurementBatchId">
+          <el-select v-model="form.measurementBatchId" placeholder="请选择测量环境id">
             <el-option v-for="item in measureBatchOptions" :key="item.id" :label="item.measurementBatch"
               :value="item.id">
               <span style="float: left">{{ item.id }}</span>
@@ -211,8 +211,8 @@ export default {
       // 表单校验
       rules: {
         measurementBatchId:[
-          { required: true, message: "测量批次id不能为空"},
-          {type: 'number', message: '测量批次id必须为数字',trigger: 'blur'}
+          { required: true, message: "测量环境id不能为空"},
+          {type: 'number', message: '测量环境id必须为数字',trigger: 'blur'}
         ],
         model: [
           { required: true, message: "型号不能为空", trigger: "blur" },

meas_web/src/views/meas/transmissionRate/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="测量批次id" label-width="90px" prop="measurementBatchId">
+      <el-form-item label="测量环境id" label-width="90px" prop="measurementBatchId">
         <el-input
           v-model="queryParams.measurementBatchId"
-          placeholder="请输入测量批次id"
+          placeholder="请输入测量环境id"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -64,7 +64,7 @@
     <el-table v-loading="loading" :data="transmissionRateList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="测量批次id" align="center" prop="measurementBatchId" />
+      <el-table-column label="测量环境id" align="center" prop="measurementBatchId" />
       <el-table-column label="原始数据" align="center" prop="rawData" />
       <el-table-column label="透过率曲线3~5μm" align="center" prop="curve1" />
       <el-table-column label="透过率曲线8~14μm" align="center" prop="curve2" />
@@ -105,8 +105,8 @@
     <!-- 添加或修改透过率对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
-        <el-form-item label="测量批次id" prop="measurementBatchId">
-          <el-select v-model="form.measurementBatchId" placeholder="请选择测量批次id">
+        <el-form-item label="测量环境id" prop="measurementBatchId">
+          <el-select v-model="form.measurementBatchId" placeholder="请选择测量环境id">
             <el-option v-for="item in measureBatchOptions" :key="item.id" :label="item.measurementBatch"
               :value="item.id">
               <span style="float: left">{{ item.id }}</span>
@@ -172,8 +172,8 @@ export default {
       // 表单校验
       rules: {
         measurementBatchId:[
-          { required: true, message: "测量批次id不能为空"},
-          {type: 'number', message: '测量批次id必须为数字',trigger: 'blur'}
+          { required: true, message: "测量环境id不能为空"},
+          {type: 'number', message: '测量环境id必须为数字',trigger: 'blur'}
         ],
       },
       measureBatchOptions: []

sql/meas.sql

@@ -460,7 +460,7 @@ CREATE TABLE `meas_env_data`  (
   `measurement_batch_id` int(11) NOT NULL COMMENT '测量批次id',
   `engine_status` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '发动机状态',
   `angle` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角度',
-  `turbine_post_temp` decimal(8, 2) NOT NULL COMMENT '涡轮后温度',
+  `turbine_post_temp` varchar(255) COMMENT '涡轮后温度',
   `test_distance` decimal(8, 2) NULL DEFAULT NULL COMMENT '测试距离',
   `time` datetime NOT NULL COMMENT '时间',
   `location` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '地点',