dev

meas-system/src/main/java/com/meas/system/controller/MeasDataResultsController.java

@@ -95,4 +95,13 @@ public class MeasDataResultsController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(measDataResultsService.deleteMeasDataResultsByIds(ids));
     }
+
+    /**
+     * 获取数据结果详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('meas:dataResults:query')")
+    @GetMapping(value = "/getInfoByEnvDataId/{envDataId}")
+    public AjaxResult getInfoByEnvDataId(@PathVariable("envDataId") Long envDataId) {
+        return success(measDataResultsService.selectMeasDataResultsByEnvDataId(envDataId));
+    }
 }

meas-system/src/main/java/com/meas/system/controller/MeasEnvDataController.java

@@ -73,7 +73,7 @@ public class MeasEnvDataController extends BaseController {
     @Log(title = "测量环境数据", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody MeasEnvData measEnvData) {
-        return toAjax(measEnvDataService.insertMeasEnvData(measEnvData));
+        return success(measEnvDataService.insertMeasEnvData(measEnvData));
     }
 
     /**

meas-system/src/main/java/com/meas/system/controller/MeasSpectralRadiationController.java

@@ -95,4 +95,11 @@ public class MeasSpectralRadiationController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(measSpectralRadiationService.deleteMeasSpectralRadiationByIds(ids));
     }
+
+
+    @PreAuthorize("@ss.hasPermi('meas:radiation:query')")
+    @GetMapping(value = "/getInfoByEnvDataId/{envDataId}")
+    public AjaxResult selectResultsByEnvDataId(@PathVariable("envDataId") Long envDataId) {
+        return success(measSpectralRadiationService.selectResultsByEnvDataId(envDataId));
+    }
 }

meas-system/src/main/java/com/meas/system/controller/MeasThermalImagerTestDataController.java

@@ -95,4 +95,10 @@ public class MeasThermalImagerTestDataController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(measThermalImagerTestDataService.deleteMeasThermalImagerTestDataByIds(ids));
     }
+
+    @PreAuthorize("@ss.hasPermi('meas:thermalImagerTesDdata:query')")
+    @GetMapping(value = "/getInfoByEnvDataId/{envDataId}")
+    public AjaxResult selectResultsByEnvDataId(@PathVariable("envDataId") Long envDataId) {
+        return success(measThermalImagerTestDataService.selectResultsByEnvDataId(envDataId));
+    }
 }

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

@@ -25,6 +25,9 @@ public class MeasBatch extends BaseEntity {
     @Excel(name = "发动机型号ID")
     private Long engineId;
 
+    @Excel(name = "发动机型号")
+    private Long engineModel;
+
     /**
      * 测量批次
      */
@@ -47,6 +50,14 @@ public class MeasBatch extends BaseEntity {
         this.engineId = engineId;
     }
 
+    public Long getEngineModel() {
+        return engineModel;
+    }
+
+    public void setEngineModel(Long engineModel) {
+        this.engineModel = engineModel;
+    }
+
     public String getMeasurementBatch() {
         return measurementBatch;
     }
@@ -57,14 +68,11 @@ public class MeasBatch extends BaseEntity {
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("engineId", getEngineId())
-                .append("measurementBatch", getMeasurementBatch())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .toString();
+        return "MeasBatch{" +
+                "id=" + id +
+                ", engineId=" + engineId +
+                ", engineModel=" + engineModel +
+                ", measurementBatch='" + measurementBatch + '\'' +
+                '}';
     }
 }

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

@@ -47,6 +47,16 @@ public class MeasDataResults extends BaseEntity {
      */
     private String measurementBatch;
 
+    /**
+     * 发动机状态
+     */
+    private String engineStatus;
+
+    /**
+     * 角度
+     */
+    private String angle;
+
     /**
      * 光谱辐射强度3~5μm
      */
@@ -119,6 +129,22 @@ public class MeasDataResults extends BaseEntity {
         this.measurementBatch = measurementBatch;
     }
 
+    public String getEngineStatus() {
+        return engineStatus;
+    }
+
+    public void setEngineStatus(String engineStatus) {
+        this.engineStatus = engineStatus;
+    }
+
+    public String getAngle() {
+        return angle;
+    }
+
+    public void setAngle(String angle) {
+        this.angle = angle;
+    }
+
     public String getSpecIrr1() {
         return specIrr1;
     }
@@ -160,6 +186,8 @@ public class MeasDataResults extends BaseEntity {
                 ", geometryFiles='" + geometryFiles + '\'' +
                 ", geometryImage='" + geometryImage + '\'' +
                 ", measurementBatch='" + measurementBatch + '\'' +
+                ", engineStatus='" + engineStatus + '\'' +
+                ", angle='" + angle + '\'' +
                 ", specIrr1='" + specIrr1 + '\'' +
                 ", specIrr2='" + specIrr2 + '\'' +
                 ", specBandIrr1=" + specBandIrr1 +

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

@@ -29,6 +29,12 @@ public class MeasEnvData extends BaseEntity {
     @Excel(name = "测量批次id")
     private Long measurementBatchId;
 
+//  测量批次号
+    private String measurementBatch;
+//  发动机号
+    private String model;
+
+
     /**
      * 发动机状态
      */
@@ -200,26 +206,40 @@ public class MeasEnvData extends BaseEntity {
         this.concentration = concentration;
     }
 
+    public String getMeasurementBatch() {
+        return measurementBatch;
+    }
+
+    public void setMeasurementBatch(String measurementBatch) {
+        this.measurementBatch = measurementBatch;
+    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public void setModel(String model) {
+        this.model = model;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("measurementBatchId", getMeasurementBatchId())
-                .append("engineStatus", getEngineStatus())
-                .append("angle", getAngle())
-                .append("turbinePostTemp", getTurbinePostTemp())
-                .append("testDistance", getTestDistance())
-                .append("time", getTime())
-                .append("location", getLocation())
-                .append("atmosPress", getAtmosPress())
-                .append("temperature", getTemperature())
-                .append("windSpeed", getWindSpeed())
-                .append("humidity", getHumidity())
-                .append("concentration", getConcentration())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .toString();
+        return "MeasEnvData{" +
+                "id=" + id +
+                ", measurementBatchId=" + measurementBatchId +
+                ", measurementBatch='" + measurementBatch + '\'' +
+                ", model=" + model +
+                ", engineStatus='" + engineStatus + '\'' +
+                ", angle='" + angle + '\'' +
+                ", turbinePostTemp='" + turbinePostTemp + '\'' +
+                ", testDistance=" + testDistance +
+                ", time=" + time +
+                ", location='" + location + '\'' +
+                ", atmosPress=" + atmosPress +
+                ", temperature=" + temperature +
+                ", windSpeed=" + windSpeed +
+                ", humidity=" + humidity +
+                ", concentration=" + concentration +
+                '}';
     }
 }

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

@@ -27,6 +27,36 @@ public class MeasSpectralRadiation extends BaseEntity {
     @Excel(name = "测量环境id")
     private Long measurementBatchId;
 
+    /**
+     * 发动机型号
+     */
+    private String engineModel;
+
+    /**
+     * 几何模型文件
+     */
+    private String geometryFiles;
+
+    /**
+     * 几何模型图片
+     */
+    private String geometryImage;
+
+    /**
+     * 测量批次
+     */
+    private String measurementBatch;
+
+    /**
+     * 发动机状态
+     */
+    private String engineStatus;
+
+    /**
+     * 角度
+     */
+    private String angle;
+
     /**
      * 型号
      */
@@ -97,6 +127,54 @@ public class MeasSpectralRadiation extends BaseEntity {
         this.measurementBatchId = measurementBatchId;
     }
 
+    public String getEngineModel() {
+        return engineModel;
+    }
+
+    public void setEngineModel(String engineModel) {
+        this.engineModel = engineModel;
+    }
+
+    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 getEngineStatus() {
+        return engineStatus;
+    }
+
+    public void setEngineStatus(String engineStatus) {
+        this.engineStatus = engineStatus;
+    }
+
+    public String getAngle() {
+        return angle;
+    }
+
+    public void setAngle(String angle) {
+        this.angle = angle;
+    }
+
     public String getModel() {
         return model;
     }
@@ -171,22 +249,24 @@ public class MeasSpectralRadiation extends BaseEntity {
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("measurementBatchId", getMeasurementBatchId())
-                .append("model", getModel())
-                .append("lensFView", getLensFView())
-                .append("gain", getGain())
-                .append("backgroundData", getBackgroundData())
-                .append("calTemp", getCalTemp())
-                .append("calCurve", getCalCurve())
-                .append("rawData", getRawData())
-                .append("radiance1", getRadiance1())
-                .append("radiance2", getRadiance2())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .toString();
+        return "MeasSpectralRadiation{" +
+                "id=" + id +
+                ", measurementBatchId=" + measurementBatchId +
+                ", engineModel='" + engineModel + '\'' +
+                ", geometryFiles='" + geometryFiles + '\'' +
+                ", geometryImage='" + geometryImage + '\'' +
+                ", measurementBatch='" + measurementBatch + '\'' +
+                ", engineStatus='" + engineStatus + '\'' +
+                ", angle='" + angle + '\'' +
+                ", model='" + model + '\'' +
+                ", lensFView=" + lensFView +
+                ", gain=" + gain +
+                ", backgroundData='" + backgroundData + '\'' +
+                ", calTemp=" + calTemp +
+                ", calCurve='" + calCurve + '\'' +
+                ", rawData='" + rawData + '\'' +
+                ", radiance1='" + radiance1 + '\'' +
+                ", radiance2='" + radiance2 + '\'' +
+                '}';
     }
 }

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

@@ -25,6 +25,36 @@ public class MeasThermalImagerTestData extends BaseEntity {
     @Excel(name = "测量环境id")
     private Long measurementBatchId;
 
+    /**
+     * 发动机型号
+     */
+    private String engineModel;
+
+    /**
+     * 几何模型文件
+     */
+    private String geometryFiles;
+
+    /**
+     * 几何模型图片
+     */
+    private String geometryImage;
+
+    /**
+     * 测量批次
+     */
+    private String measurementBatch;
+
+    /**
+     * 发动机状态
+     */
+    private String engineStatus;
+
+    /**
+     * 角度
+     */
+    private String angle;
+
     /**
      * 型号
      */
@@ -101,6 +131,54 @@ public class MeasThermalImagerTestData extends BaseEntity {
         this.measurementBatchId = measurementBatchId;
     }
 
+    public String getEngineModel() {
+        return engineModel;
+    }
+
+    public void setEngineModel(String engineModel) {
+        this.engineModel = engineModel;
+    }
+
+    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 getEngineStatus() {
+        return engineStatus;
+    }
+
+    public void setEngineStatus(String engineStatus) {
+        this.engineStatus = engineStatus;
+    }
+
+    public String getAngle() {
+        return angle;
+    }
+
+    public void setAngle(String angle) {
+        this.angle = angle;
+    }
+
     public String getModel() {
         return model;
     }
@@ -183,23 +261,25 @@ public class MeasThermalImagerTestData extends BaseEntity {
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("measurementBatchId", getMeasurementBatchId())
-                .append("model", getModel())
-                .append("lensFView", getLensFView())
-                .append("filterNo", getFilterNo())
-                .append("fps", getFps())
-                .append("spectralBand", getSpectralBand())
-                .append("integrationTime", getIntegrationTime())
-                .append("tempCal", getTempCal())
-                .append("radiance", getRadiance())
-                .append("radIllumination", getRadIllumination())
-                .append("radTemp", getRadTemp())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .toString();
+        return "MeasThermalImagerTestData{" +
+                "id=" + id +
+                ", measurementBatchId=" + measurementBatchId +
+                ", engineModel='" + engineModel + '\'' +
+                ", geometryFiles='" + geometryFiles + '\'' +
+                ", geometryImage='" + geometryImage + '\'' +
+                ", measurementBatch='" + measurementBatch + '\'' +
+                ", engineStatus='" + engineStatus + '\'' +
+                ", angle='" + angle + '\'' +
+                ", model='" + model + '\'' +
+                ", lensFView='" + lensFView + '\'' +
+                ", filterNo='" + filterNo + '\'' +
+                ", fps='" + fps + '\'' +
+                ", spectralBand='" + spectralBand + '\'' +
+                ", integrationTime=" + integrationTime +
+                ", tempCal='" + tempCal + '\'' +
+                ", radiance='" + radiance + '\'' +
+                ", radIllumination='" + radIllumination + '\'' +
+                ", radTemp='" + radTemp + '\'' +
+                '}';
     }
 }

meas-system/src/main/java/com/meas/system/mapper/MeasDataResultsMapper.java

@@ -58,4 +58,6 @@ public interface MeasDataResultsMapper {
      * @return 结果
      */
     public int deleteMeasDataResultsByIds(Long[] ids);
+
+    MeasDataResults selectMeasDataResultsByEnvDataId(Long envDataId);
 }

meas-system/src/main/java/com/meas/system/mapper/MeasSpectralRadiationMapper.java

@@ -58,4 +58,6 @@ public interface MeasSpectralRadiationMapper {
      * @return 结果
      */
     public int deleteMeasSpectralRadiationByIds(Long[] ids);
+
+    MeasSpectralRadiation selectResultsByEnvDataId(Long envDataId);
 }

meas-system/src/main/java/com/meas/system/mapper/MeasThermalImagerTestDataMapper.java

@@ -58,4 +58,6 @@ public interface MeasThermalImagerTestDataMapper {
      * @return 结果
      */
     public int deleteMeasThermalImagerTestDataByIds(Long[] ids);
+
+    MeasThermalImagerTestData selectResultsByEnvDataId(Long envDataId);
 }

meas-system/src/main/java/com/meas/system/service/IMeasDataResultsService.java

@@ -58,4 +58,6 @@ public interface IMeasDataResultsService {
      * @return 结果
      */
     public int deleteMeasDataResultsById(Long id);
+
+    MeasDataResults selectMeasDataResultsByEnvDataId(Long envDataId);
 }

meas-system/src/main/java/com/meas/system/service/IMeasEnvDataService.java

@@ -33,7 +33,7 @@ public interface IMeasEnvDataService {
      * @param measEnvData 测量环境数据
      * @return 结果
      */
-    public int insertMeasEnvData(MeasEnvData measEnvData);
+    public MeasEnvData insertMeasEnvData(MeasEnvData measEnvData);
 
     /**
      * 修改测量环境数据

meas-system/src/main/java/com/meas/system/service/IMeasSpectralRadiationService.java

@@ -58,4 +58,6 @@ public interface IMeasSpectralRadiationService {
      * @return 结果
      */
     public int deleteMeasSpectralRadiationById(Long id);
+
+    MeasSpectralRadiation selectResultsByEnvDataId(Long envDataId);
 }

meas-system/src/main/java/com/meas/system/service/IMeasThermalImagerTestDataService.java

@@ -58,4 +58,6 @@ public interface IMeasThermalImagerTestDataService {
      * @return 结果
      */
     public int deleteMeasThermalImagerTestDataById(Long id);
+
+    MeasThermalImagerTestData selectResultsByEnvDataId(Long envDataId);
 }

meas-system/src/main/java/com/meas/system/service/impl/MeasDataResultsServiceImpl.java

@@ -87,4 +87,9 @@ public class MeasDataResultsServiceImpl implements IMeasDataResultsService {
     public int deleteMeasDataResultsById(Long id) {
         return measDataResultsMapper.deleteMeasDataResultsById(id);
     }
+
+    @Override
+    public MeasDataResults selectMeasDataResultsByEnvDataId(Long envDataId) {
+        return measDataResultsMapper.selectMeasDataResultsByEnvDataId(envDataId);
+    }
 }

meas-system/src/main/java/com/meas/system/service/impl/MeasEnvDataServiceImpl.java

@@ -49,9 +49,14 @@ public class MeasEnvDataServiceImpl implements IMeasEnvDataService {
      * @return 结果
      */
     @Override
-    public int insertMeasEnvData(MeasEnvData measEnvData) {
+    public MeasEnvData insertMeasEnvData(MeasEnvData measEnvData) {
         measEnvData.setCreateTime(DateUtils.getNowDate());
-        return measEnvDataMapper.insertMeasEnvData(measEnvData);
+        int i = measEnvDataMapper.insertMeasEnvData(measEnvData);
+        if (i > 0) {
+            return measEnvData;
+        } else {
+            return null;
+        }
     }
 
     /**

meas-system/src/main/java/com/meas/system/service/impl/MeasSpectralRadiationServiceImpl.java

@@ -87,4 +87,9 @@ public class MeasSpectralRadiationServiceImpl implements IMeasSpectralRadiationS
     public int deleteMeasSpectralRadiationById(Long id) {
         return measSpectralRadiationMapper.deleteMeasSpectralRadiationById(id);
     }
+
+    @Override
+    public MeasSpectralRadiation selectResultsByEnvDataId(Long envDataId) {
+        return measSpectralRadiationMapper.selectResultsByEnvDataId(envDataId);
+    }
 }

meas-system/src/main/java/com/meas/system/service/impl/MeasThermalImagerTestDataServiceImpl.java

@@ -87,4 +87,9 @@ public class MeasThermalImagerTestDataServiceImpl implements IMeasThermalImagerT
     public int deleteMeasThermalImagerTestDataById(Long id) {
         return measThermalImagerTestDataMapper.deleteMeasThermalImagerTestDataById(id);
     }
+
+    @Override
+    public MeasThermalImagerTestData selectResultsByEnvDataId(Long envDataId) {
+        return measThermalImagerTestDataMapper.selectResultsByEnvDataId(envDataId);
+    }
 }

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

@@ -7,6 +7,7 @@
     <resultMap type="MeasBatch" id="MeasBatchResult">
         <result property="id" column="id"/>
         <result property="engineId" column="engine_id"/>
+        <result property="engineModel" column="engine_model"/>
         <result property="measurementBatch" column="measurement_batch"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -15,14 +16,26 @@
     </resultMap>
 
     <sql id="selectMeasBatchVo">
-        select id, engine_id, measurement_batch, create_by, create_time, update_by, update_time from meas_batch
+        SELECT
+            mb.id,
+            mb.engine_id,
+            mem.model,
+            mb.measurement_batch,
+            mb.create_by,
+            mb.create_time,
+            mb.update_by,
+            mb.update_time
+        FROM
+            meas_batch mb
+        LEFT JOIN meas_engine_model mem on mb.engine_id = mem.id
     </sql>
 
     <select id="selectMeasBatchList" parameterType="MeasBatch" resultMap="MeasBatchResult">
         <include refid="selectMeasBatchVo"/>
         <where>
-            <if test="engineId != null ">and engine_id = #{engineId}</if>
-            <if test="measurementBatch != null  and measurementBatch != ''">and measurement_batch =
+            <if test="engineId != null ">and mb.engine_id = #{engineId}</if>
+            <if test="engineModel != null ">and mem.engine_model = #{engineModel}</if>
+            <if test="measurementBatch != null  and measurementBatch != ''">and mb.measurement_batch =
                 #{measurementBatch}
             </if>
         </where>
@@ -30,7 +43,7 @@
 
     <select id="selectMeasBatchById" parameterType="Long" resultMap="MeasBatchResult">
         <include refid="selectMeasBatchVo"/>
-        where id = #{id}
+        where mb.id = #{id}
     </select>
 
     <insert id="insertMeasBatch" parameterType="MeasBatch">

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

@@ -11,6 +11,8 @@
         <result property="geometryFiles" column="geometry_files"/>
         <result property="geometryImage" column="geometry_image"/>
         <result property="measurementBatch" column="measurement_batch"/>
+        <result property="engineStatus" column="measurement_batch"/>
+        <result property="angle" column="angle"/>
         <result property="specIrr1" column="spec_irr_1"/>
         <result property="specIrr2" column="spec_irr_2"/>
         <result property="specBandIrr1" column="spec_band_irr_1"/>
@@ -22,26 +24,48 @@
     </resultMap>
 
     <sql id="selectMeasDataResultsVo">
-        select id, measurement_batch_id, spec_irr_1, spec_irr_2, spec_band_irr_1, spec_band_irr_2, create_by,
-        create_time, update_by, update_time from meas_data_results
+        SELECT
+            mdr.id,
+            med.id measurement_batch_id,
+            mem.model,
+            mem.geometry_files,
+            mem.geometry_image,
+            mb.measurement_batch,
+            med.engine_status,
+            med.angle,
+            mdr.spec_irr_1,
+            mdr.spec_irr_2,
+            mdr.spec_band_irr_1,
+            mdr.spec_band_irr_2,
+            mdr.create_by,
+            mdr.create_time,
+            mdr.update_by,
+            mdr.update_time
+        FROM
+            meas_env_data med
+        LEFT JOIN meas_data_results mdr ON mdr.measurement_batch_id = med.id
+        LEFT JOIN meas_batch mb ON med.measurement_batch_id = mb.id
+        LEFT JOIN meas_engine_model mem ON mb.engine_id = mem.id
     </sql>
 
     <select id="selectMeasDataResultsList" parameterType="MeasDataResults" resultMap="MeasDataResultsResult">
         <include refid="selectMeasDataResultsVo"/>
         <where>
-            <if test="measurementBatchId != null  and measurementBatchId != ''">and measurement_batch_id =
-                #{measurementBatchId}
+            <if test="measurementBatch != null  and measurementBatch != ''">and mdr.measurement_batch = #{measurementBatch}</if>
+            <if test="model != null  and model != ''">and med.model =
+                #{model}
             </if>
-            <if test="specIrr1 != null  and specIrr1 != ''">and spec_irr_1 = #{specIrr1}</if>
-            <if test="specIrr2 != null  and specIrr2 != ''">and spec_irr_2 = #{specIrr2}</if>
-            <if test="specBandIrr1 != null ">and spec_band_irr_1 = #{specBandIrr1}</if>
-            <if test="specBandIrr2 != null ">and spec_band_irr_2 = #{specBandIrr2}</if>
+            <if test="engineStatus != null  and engineStatus != ''">and mdr.engine_status = #{engineStatus}</if>
+            <if test="angle != null  and angle != ''">and mdr.angle = #{angle}</if>
+            <if test="specIrr2 != null  and specIrr2 != ''">and mdr.spec_irr_2 = #{specIrr2}</if>
+            <if test="specBandIrr1 != null ">and mdr.spec_band_irr_1 = #{specBandIrr1}</if>
+            <if test="specBandIrr2 != null ">and mdr.spec_band_irr_2 = #{specBandIrr2}</if>
         </where>
     </select>
 
     <select id="selectMeasDataResultsById" parameterType="Long" resultMap="MeasDataResultsResult">
         <include refid="selectMeasDataResultsVo"/>
-        where id = #{id}
+        where mdr.id = #{id}
     </select>
 
     <insert id="insertMeasDataResults" parameterType="MeasDataResults">
@@ -100,4 +124,8 @@
             #{id}
         </foreach>
     </delete>
+    <select id="selectMeasDataResultsByEnvDataId" parameterType="Long" resultMap="MeasDataResultsResult">
+        <include refid="selectMeasDataResultsVo"/>
+        where med.id = #{id}
+    </select>
 </mapper>

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

@@ -7,6 +7,8 @@
     <resultMap type="MeasEnvData" id="MeasEnvDataResult">
         <result property="id" column="id"/>
         <result property="measurementBatchId" column="measurement_batch_id"/>
+        <result property="measurementBatch" column="measurement_batch"/>
+        <result property="model" column="model"/>
         <result property="engineStatus" column="engine_status"/>
         <result property="angle" column="angle"/>
         <result property="turbinePostTemp" column="turbine_post_temp"/>
@@ -25,9 +27,30 @@
     </resultMap>
 
     <sql id="selectMeasEnvDataVo">
-        select id, measurement_batch_id, engine_status, angle, turbine_post_temp, test_distance, time, location,
-        atmos_press, temperature, wind_speed, humidity, concentration, create_by, create_time, update_by, update_time
-        from meas_env_data
+        SELECT
+            med.id,
+            med.measurement_batch_id,
+            mb.measurement_batch,
+            mem.model,
+            med.engine_status,
+            med.angle,
+            med.turbine_post_temp,
+            med.test_distance,
+            med.time,
+            med.location,
+            med.atmos_press,
+            med.temperature,
+            med.wind_speed,
+            med.humidity,
+            med.concentration,
+            med.create_by,
+            med.create_time,
+            med.update_by,
+            med.update_time
+        FROM
+            meas_env_data med
+        LEFT JOIN meas_batch mb ON med.measurement_batch_id = mb.id
+        LEFT JOIN meas_engine_model mem ON mb.engine_id = mem.id
     </sql>
 
     <select id="selectMeasEnvDataList" parameterType="MeasEnvData" resultMap="MeasEnvDataResult">
@@ -50,7 +73,7 @@
 
     <select id="selectMeasEnvDataById" parameterType="Long" resultMap="MeasEnvDataResult">
         <include refid="selectMeasEnvDataVo"/>
-        where id = #{id}
+        where med.id = #{id}
     </select>
 
     <insert id="insertMeasEnvData" parameterType="MeasEnvData">

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

@@ -7,6 +7,12 @@
     <resultMap type="MeasSpectralRadiation" id="MeasSpectralRadiationResult">
         <result property="id" column="id"/>
         <result property="measurementBatchId" column="measurement_batch_id"/>
+        <result property="engineModel" column="engine_model"/>
+        <result property="geometryFiles" column="geometry_files"/>
+        <result property="geometryImage" column="geometry_image"/>
+        <result property="measurementBatch" column="measurement_batch"/>
+        <result property="engineStatus" column="measurement_batch"/>
+        <result property="angle" column="angle"/>
         <result property="model" column="model"/>
         <result property="lensFView" column="lens_f_view"/>
         <result property="gain" column="gain"/>
@@ -23,14 +29,47 @@
     </resultMap>
 
     <sql id="selectMeasSpectralRadiationVo">
-        select id, measurement_batch_id, model, lens_f_view, gain, background_data, cal_temp, cal_curve, raw_data,
-        radiance_1, radiance_2, create_by, create_time, update_by, update_time from meas_spectral_radiation
+        SELECT
+            msr.id,
+            med.id measurement_batch_id,
+            mem.model engine_model,
+            mem.geometry_files,
+            mem.geometry_image,
+            mb.measurement_batch,
+            med.engine_status,
+            med.angle,
+            msr.model,
+            msr.lens_f_view,
+            msr.gain,
+            msr.background_data,
+            msr.cal_temp,
+            msr.cal_curve,
+            msr.raw_data,
+            msr.radiance_1,
+            msr.radiance_2,
+            msr.create_by,
+            msr.create_time,
+            msr.update_by,
+            msr.update_time
+        FROM
+            meas_env_data med
+        LEFT JOIN meas_spectral_radiation msr ON msr.measurement_batch_id = med.id
+        LEFT JOIN meas_batch mb ON med.measurement_batch_id = mb.id
+        LEFT JOIN meas_engine_model mem ON mb.engine_id = mem.id
     </sql>
 
     <select id="selectMeasSpectralRadiationList" parameterType="MeasSpectralRadiation"
             resultMap="MeasSpectralRadiationResult">
         <include refid="selectMeasSpectralRadiationVo"/>
         <where>
+
+            <if test="measurementBatch != null  and measurementBatch != ''">and mdr.measurement_batch = #{measurementBatch}</if>
+            <if test="engineModel != null  and engineModel != ''">and med.model =
+                #{engineModel}
+            </if>
+            <if test="engineStatus != null  and engineStatus != ''">and mdr.engine_status = #{engineStatus}</if>
+            <if test="angle != null  and angle != ''">and mdr.angle = #{angle}</if>
+
             <if test="measurementBatchId != null ">and measurement_batch_id = #{measurementBatchId}</if>
             <if test="model != null  and model != ''">and model = #{model}</if>
             <if test="lensFView != null ">and lens_f_view = #{lensFView}</if>
@@ -46,7 +85,7 @@
 
     <select id="selectMeasSpectralRadiationById" parameterType="Long" resultMap="MeasSpectralRadiationResult">
         <include refid="selectMeasSpectralRadiationVo"/>
-        where id = #{id}
+        where msr.id = #{id}
     </select>
 
     <insert id="insertMeasSpectralRadiation" parameterType="MeasSpectralRadiation">
@@ -118,4 +157,9 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectResultsByEnvDataId" parameterType="Long" resultMap="MeasSpectralRadiationResult">
+        <include refid="selectMeasSpectralRadiationVo"/>
+        where med.id = #{id}
+    </select>
 </mapper>

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

@@ -7,6 +7,13 @@
     <resultMap type="MeasThermalImagerTestData" id="MeasThermalImagerTestDataResult">
         <result property="id" column="id"/>
         <result property="measurementBatchId" column="measurement_batch_id"/>
+        <result property="engineModel" column="engine_model"/>
+        <result property="geometryFiles" column="geometry_files"/>
+        <result property="geometryImage" column="geometry_image"/>
+        <result property="measurementBatch" column="measurement_batch"/>
+        <result property="engineStatus" column="measurement_batch"/>
+        <result property="angle" column="angle"/>
+        <result property="model" column="model"/>
         <result property="model" column="model"/>
         <result property="lensFView" column="lens_f_view"/>
         <result property="filterNo" column="filter_no"/>
@@ -24,9 +31,34 @@
     </resultMap>
 
     <sql id="selectMeasThermalImagerTestDataVo">
-        select id, measurement_batch_id, model, lens_f_view, filter_no, fps, spectral_band, integration_time, temp_cal,
-        radiance, rad_illumination, rad_temp, create_by, create_time, update_by, update_time from
-        meas_thermal_imager_test_data
+        SELECT
+            mtitd.id,
+            med.id measurement_batch_id,
+            mem.model engine_model,
+            mem.geometry_files,
+            mem.geometry_image,
+            mb.measurement_batch,
+            med.engine_status,
+            med.angle,
+            mtitd.model,
+            mtitd.lens_f_view,
+            mtitd.filter_no,
+            mtitd.fps,
+            mtitd.spectral_band,
+            mtitd.integration_time,
+            mtitd.temp_cal,
+            mtitd.radiance,
+            mtitd.rad_illumination,
+            mtitd.rad_temp,
+            mtitd.create_by,
+            mtitd.create_time,
+            mtitd.update_by,
+            mtitd.update_time
+        FROM
+            meas_env_data med
+        LEFT JOIN meas_thermal_imager_test_data mtitd ON mtitd.measurement_batch_id = med.id
+        LEFT JOIN meas_batch mb ON med.measurement_batch_id = mb.id
+        LEFT JOIN meas_engine_model mem ON mb.engine_id = mem.id
     </sql>
 
     <select id="selectMeasThermalImagerTestDataList" parameterType="MeasThermalImagerTestData"
@@ -49,7 +81,7 @@
 
     <select id="selectMeasThermalImagerTestDataById" parameterType="Long" resultMap="MeasThermalImagerTestDataResult">
         <include refid="selectMeasThermalImagerTestDataVo"/>
-        where id = #{id}
+        where mtitd.id = #{id}
     </select>
 
     <insert id="insertMeasThermalImagerTestData" parameterType="MeasThermalImagerTestData">
@@ -124,4 +156,9 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectResultsByEnvDataId" parameterType="Long" resultMap="MeasThermalImagerTestDataResult">
+        <include refid="selectMeasThermalImagerTestDataVo"/>
+        where med.id = #{id}
+    </select>
 </mapper>