Merge branch 'dev_ALlen' into dev-rmd

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

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

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

@@ -25,6 +25,36 @@ public class MeasTransmissionRate 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;
+
     /**
      * 原始数据
      */
@@ -83,18 +113,68 @@ public class MeasTransmissionRate extends BaseEntity {
         this.curve2 = curve2;
     }
 
+    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;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("measurementBatchId", getMeasurementBatchId())
-                .append("rawData", getRawData())
-                .append("curve1", getCurve1())
-                .append("curve2", getCurve2())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .toString();
+        return "MeasTransmissionRate{" +
+                "id=" + id +
+                ", measurementBatchId=" + measurementBatchId +
+                ", engineModel='" + engineModel + '\'' +
+                ", geometryFiles='" + geometryFiles + '\'' +
+                ", geometryImage='" + geometryImage + '\'' +
+                ", measurementBatch='" + measurementBatch + '\'' +
+                ", engineStatus='" + engineStatus + '\'' +
+                ", angle='" + angle + '\'' +
+                ", rawData='" + rawData + '\'' +
+                ", curve1='" + curve1 + '\'' +
+                ", curve2='" + curve2 + '\'' +
+                '}';
     }
 }

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

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

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

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

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

@@ -87,4 +87,9 @@ public class MeasTransmissionRateServiceImpl implements IMeasTransmissionRateSer
     public int deleteMeasTransmissionRateById(Long id) {
         return measTransmissionRateMapper.deleteMeasTransmissionRateById(id);
     }
+
+    @Override
+    public MeasTransmissionRate selectResultsByEnvDataId(Long envDataId) {
+        return measTransmissionRateMapper.selectResultsByEnvDataId(envDataId);
+    }
 }

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

@@ -17,8 +17,27 @@
     </resultMap>
 
     <sql id="selectMeasTransmissionRateVo">
-        select id, measurement_batch_id, raw_data, curve_1, curve_2, create_by, create_time, update_by, update_time from
-        meas_transmission_rate
+        SELECT
+            mtr.id,
+            med.id measurement_batch_id,
+            mem.model engine_model,
+            mem.geometry_files,
+            mem.geometry_image,
+            mb.measurement_batch,
+            med.engine_status,
+            med.angle,
+            mtr.raw_data,
+            mtr.curve_1,
+            mtr.curve_2,
+            mtr.create_by,
+            mtr.create_time,
+            mtr.update_by,
+            mtr.update_time
+        FROM
+            meas_env_data med
+        LEFT JOIN meas_transmission_rate mtr ON mtr.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="selectMeasTransmissionRateList" parameterType="MeasTransmissionRate"
@@ -34,7 +53,7 @@
 
     <select id="selectMeasTransmissionRateById" parameterType="Long" resultMap="MeasTransmissionRateResult">
         <include refid="selectMeasTransmissionRateVo"/>
-        where id = #{id}
+        where mtr.id = #{id}
     </select>
 
     <insert id="insertMeasTransmissionRate" parameterType="MeasTransmissionRate">
@@ -88,4 +107,10 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectResultsByEnvDataId" parameterType="Long" resultMap="MeasTransmissionRateResult">
+        <include refid="selectMeasTransmissionRateVo"/>
+        where med.id = #{id}
+    </select>
+
 </mapper>