From 1fba49732fae0591cb228e6860755bd1239702ef Mon Sep 17 00:00:00 2001
From: zangch <zangch@mesnac.com>
Date: Fri, 23 Aug 2024 14:30:55 +0800
Subject: [PATCH] =?UTF-8?q?change=EF=BC=9A=E5=A2=9E=E6=B7=BB=E5=AF=B9?=
 =?UTF-8?q?=E9=9C=87=E5=8A=A8=E6=9B=B2=E7=BA=BF=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?EmsVibrationInstantMapper?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EmsVibrationInstantController.java        |  2 +-
 .../mapper/EmsVibrationInstantMapper.java     |  2 +-
 .../ems/record/EmsVibrationInstantMapper.xml  | 35 ++++++++++++-------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/os-ems/src/main/java/com/os/ems/record/controller/EmsVibrationInstantController.java b/os-ems/src/main/java/com/os/ems/record/controller/EmsVibrationInstantController.java
index 624b175..ed9b22a 100644
--- a/os-ems/src/main/java/com/os/ems/record/controller/EmsVibrationInstantController.java
+++ b/os-ems/src/main/java/com/os/ems/record/controller/EmsVibrationInstantController.java
@@ -105,7 +105,7 @@ public class EmsVibrationInstantController extends BaseController
     }
 
     /**
-     * 查询电实时数据
+     * 查询震动实时数据
      * @param emsVibrationInstant
      * @return
      */
diff --git a/os-ems/src/main/java/com/os/ems/record/mapper/EmsVibrationInstantMapper.java b/os-ems/src/main/java/com/os/ems/record/mapper/EmsVibrationInstantMapper.java
index d3dc180..dc52d21 100644
--- a/os-ems/src/main/java/com/os/ems/record/mapper/EmsVibrationInstantMapper.java
+++ b/os-ems/src/main/java/com/os/ems/record/mapper/EmsVibrationInstantMapper.java
@@ -61,7 +61,7 @@ public interface EmsVibrationInstantMapper
 
     /**mapper.java
      * 查询震动实时数据
-     * @param emsVibrationInstance
+     * @param emsVibrationInstant
      * @return
      */
     List<EmsVibrationInstant> selectVibrationInstantList(EmsVibrationInstant emsVibrationInstant);
diff --git a/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml b/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml
index c230b0f..3dc8cf8 100644
--- a/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml
+++ b/os-ems/src/main/resources/mapper/ems/record/EmsVibrationInstantMapper.xml
@@ -17,20 +17,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEmsVibrationInstantVo">
-        select objId, collectTime, sensor_id, speed, displacement, acceleration, temperature, recodeTime, remark from T_VibrationSensor_Data
+        select rdi.objId,
+               rdi.collectTime,
+               rdi.sensor_id,
+               rdi.speed,
+               rdi.displacement,
+               rdi.acceleration,
+               rdi.temperature,
+               rdi.recodeTime,
+               rdi.remark,
+               bmi.monitor_name
+        from T_VibrationSensor_Data rdi
+                 left join ems_base_monitor_info bmi on rdi.sensor_id = bmi.monitor_code
     </sql>
 
     <select id="selectVibrationInstantList" parameterType="EmsVibrationInstant" resultMap="EmsVibrationInstantResult">
         <include refid="selectEmsVibrationInstantVo"/>
         <where>
-            <if test="objId != null  and objId != ''">and rdi.obj_id = #{objId}</if>
-            <if test="monitorCode != null  and monitorCode != ''">and rdi.monitor_code = #{monitorCode}</if>
+            <if test="objId != null  and objId != ''">and rdi.objId = #{objId}</if>
+            <if test="sensorId != null  and sensorId != ''">and rdi.sensor_id = #{sensorId}</if>
             <if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
-                and rdi.collect_time between #{params.beginCollectTime} and #{params.endCollectTime}</if>
+                and rdi.collectTime between #{params.beginCollectTime} and #{params.endCollectTime}</if>
             <if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != ''">
-                and rdi.record_time between #{params.beginRecordTime} and #{params.endRecordTime}</if>
+                and rdi.collectTime between #{params.beginRecordTime} and #{params.endRecordTime}</if>
         </where>
-        order by rdi.collect_time
+        order by rdi.collectTime
     </select>
 
 
@@ -39,18 +50,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectEmsVibrationInstantVo"/>
         <where>  
             <if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''"> and collectTime between #{params.beginCollectTime} and #{params.endCollectTime}</if>
-            <if test="sensorId != null  and sensorId != ''"> and sensor_id = #{sensorId}</if>
-            <if test="speed != null "> and speed = #{speed}</if>
-            <if test="displacement != null "> and displacement = #{displacement}</if>
-            <if test="acceleration != null "> and acceleration = #{acceleration}</if>
-            <if test="temperature != null "> and temperature = #{temperature}</if>
+            <if test="sensorId != null  and sensorId != ''"> and rdi.sensor_id = #{sensorId}</if>
+            <if test="speed != null "> and rdi.speed = #{speed}</if>
+            <if test="displacement != null "> and rdi.displacement = #{displacement}</if>
+            <if test="acceleration != null "> and rdi.acceleration = #{acceleration}</if>
+            <if test="temperature != null "> and rdi.temperature = #{temperature}</if>
             <if test="params.beginRecodeTime != null and params.beginRecodeTime != '' and params.endRecodeTime != null and params.endRecodeTime != ''"> and recodeTime between #{params.beginRecodeTime} and #{params.endRecodeTime}</if>
         </where>
     </select>
     
     <select id="selectEmsVibrationInstantByObjId" parameterType="Long" resultMap="EmsVibrationInstantResult">
         <include refid="selectEmsVibrationInstantVo"/>
-        where objId = #{objId}
+        where rdi.objId = #{objId}
     </select>
         
     <insert id="insertEmsVibrationInstant" parameterType="EmsVibrationInstant" useGeneratedKeys="true" keyProperty="objId">