From 09b28c6b69f93acaa6ee11b4f83999e99e31ac82 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Sat, 14 Sep 2024 14:23:36 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E6=8C=AF=E5=8A=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9B=B2=E7=BA=BF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TVibrationsensorDataController.java       |   2 +-
 .../mapper/TVibrationsensorDataMapper.java    |   6 +
 .../service/ITVibrationsensorDataService.java |   7 +
 .../impl/TVibrationsensorDataServiceImpl.java |  10 +
 .../system/TArraytemperaturedataMapper.xml    | 204 +++++++++---------
 .../system/TVibrationsensorDataMapper.xml     |  12 ++
 6 files changed, 144 insertions(+), 97 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TVibrationsensorDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TVibrationsensorDataController.java
index 99c18be..63fc78b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TVibrationsensorDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TVibrationsensorDataController.java
@@ -148,7 +148,7 @@ public class TVibrationsensorDataController extends BaseController {
     @PostMapping("/sensorList")
     @ResponseBody
     public AjaxResult sensorList(TVibrationsensorData tVibrationsensorData) {
-        List<TVibrationsensorData> list = tVibrationsensorDataService.selectTVibrationsensorDataList(tVibrationsensorData);
+        List<TVibrationsensorData> list = tVibrationsensorDataService.selectTVibrationsensorDataListCurve(tVibrationsensorData);
         return AjaxResult.success(list);
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVibrationsensorDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVibrationsensorDataMapper.java
index 60aafba..a857752 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVibrationsensorDataMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVibrationsensorDataMapper.java
@@ -61,4 +61,10 @@ public interface TVibrationsensorDataMapper {
 
     List<TVibrationsensorData> selectRealTimeMonitor(TVibrationsensorData tVibrationsensorData);
 
+    /**
+     * 振动数据正向查询
+     * @param tVibrationsensorData
+     * @return
+     */
+    List<TVibrationsensorData> selectTVibrationsensorDataListCurve(TVibrationsensorData tVibrationsensorData);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITVibrationsensorDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITVibrationsensorDataService.java
index 1a1808c..ddf497e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITVibrationsensorDataService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITVibrationsensorDataService.java
@@ -66,4 +66,11 @@ public interface ITVibrationsensorDataService
      */
     public List<TVibrationsensorData> selectRealTimeMonitor(TVibrationsensorData tVibrationsensorData);
 
+    /**
+     * 振动数据曲线
+     * @param tVibrationsensorData
+     * @return
+     */
+    List<TVibrationsensorData> selectTVibrationsensorDataListCurve(TVibrationsensorData tVibrationsensorData);
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVibrationsensorDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVibrationsensorDataServiceImpl.java
index 36024a7..8dc9938 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVibrationsensorDataServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVibrationsensorDataServiceImpl.java
@@ -90,4 +90,14 @@ public class TVibrationsensorDataServiceImpl implements ITVibrationsensorDataSer
     public List<TVibrationsensorData> selectRealTimeMonitor(TVibrationsensorData tVibrationsensorData) {
         return tVibrationsensorDataMapper.selectRealTimeMonitor(tVibrationsensorData);
     }
+
+    /**
+     * 振动数据正向查询
+     * @param tVibrationsensorData
+     * @return
+     */
+    @Override
+    public List<TVibrationsensorData> selectTVibrationsensorDataListCurve(TVibrationsensorData tVibrationsensorData) {
+        return tVibrationsensorDataMapper.selectTVibrationsensorDataListCurve(tVibrationsensorData);
+    }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml
index 102e065..05a0bfc 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TArraytemperaturedataMapper.xml
@@ -1588,15 +1588,15 @@
     <select id="selectNewDataStreak" parameterType="TArraytemperaturedata"
             resultMap="TArraytemperaturedataResult">
         WITH RankedData AS (
-            SELECT *,
-                   ROW_NUMBER() OVER (PARTITION BY monitorId ORDER BY collectTime DESC) AS rn
-            FROM T_ArrayTemperatureData
-            WHERE collectTime > (GETDATE() - 1)
-        <if test="monitorId != null and monitorId != ''"> and monitorId like concat(#{monitorId}, '%') </if>
+        SELECT *,
+        ROW_NUMBER() OVER (PARTITION BY monitorId ORDER BY collectTime DESC) AS rn
+        FROM T_ArrayTemperatureData
+        WHERE collectTime > (GETDATE() - 1)
+        <if test="monitorId != null and monitorId != ''">and monitorId like concat(#{monitorId}, '%')</if>
         )
         SELECT m.monitorName,t.*
         FROM RankedData t
-                 left join T_Monitor m on m.monitorId = t.monitorId
+        left join T_Monitor m on m.monitorId = t.monitorId
         WHERE t.rn = 1
         ORDER BY monitorId
     </select>
@@ -3955,101 +3955,113 @@
     </delete>
 
     <delete id="deleteTArraytemperaturedataBycollectTime">
-        delete from T_ArrayTemperatureData where DATEADD(DAY, #{objId}, GETDATE()) > collectTime
+        delete
+        from T_ArrayTemperatureData
+        where DATEADD(DAY, #{objId}, GETDATE()) > collectTime
     </delete>
 
     <select id="getHighestPointTemperature" parameterType="TArraytemperaturedata" resultType="java.util.HashMap">
-        SELECT monitorId, collectTime, MAX(SiteValue) AS tempreture
-        FROM (
-                 SELECT monitorId, collectTime, SiteValue
-                 FROM T_ArrayTemperatureData
-                          UNPIVOT (
-                                   SiteValue FOR Site IN (
-                 Site1, Site2, Site3, Site4, Site5, Site6, Site7, Site8, Site9, Site10,
-                 Site11, Site12, Site13, Site14, Site15, Site16, Site17, Site18, Site19, Site20,
-                 Site21, Site22, Site23, Site24, Site25, Site26, Site27, Site28, Site29, Site30,
-                 Site31, Site32, Site33, Site34, Site35, Site36, Site37, Site38, Site39, Site40,
-                 Site41, Site42, Site43, Site44, Site45, Site46, Site47, Site48, Site49, Site50,
-                 Site51, Site52, Site53, Site54, Site55, Site56, Site57, Site58, Site59, Site60,
-                 Site61, Site62, Site63, Site64, Site65, Site66, Site67, Site68, Site69, Site70,
-                 Site71, Site72, Site73, Site74, Site75, Site76, Site77, Site78, Site79, Site80,
-                 Site81, Site82, Site83, Site84, Site85, Site86, Site87, Site88, Site89, Site90,
-                 Site91, Site92, Site93, Site94, Site95, Site96, Site97, Site98, Site99, Site100,
-                 Site101, Site102, Site103, Site104, Site105, Site106, Site107, Site108, Site109, Site110,
-                 Site111, Site112, Site113, Site114, Site115, Site116, Site117, Site118, Site119, Site120,
-                 Site121, Site122, Site123, Site124, Site125, Site126, Site127, Site128, Site129, Site130,
-                 Site131, Site132, Site133, Site134, Site135, Site136, Site137, Site138, Site139, Site140,
-                 Site141, Site142, Site143, Site144, Site145, Site146, Site147, Site148, Site149, Site150,
-                 Site151, Site152, Site153, Site154, Site155, Site156, Site157, Site158, Site159, Site160,
-                 Site161, Site162, Site163, Site164, Site165, Site166, Site167, Site168, Site169, Site170,
-                 Site171, Site172, Site173, Site174, Site175, Site176, Site177, Site178, Site179, Site180,
-                 Site181, Site182, Site183, Site184, Site185, Site186, Site187, Site188, Site189, Site190,
-                 Site191, Site192, Site193, Site194, Site195, Site196, Site197, Site198, Site199, Site200,
-                 Site201, Site202, Site203, Site204, Site205, Site206, Site207, Site208, Site209, Site210,
-                 Site211, Site212, Site213, Site214, Site215, Site216, Site217, Site218, Site219, Site220,
-                 Site221, Site222, Site223, Site224, Site225, Site226, Site227, Site228, Site229, Site230,
-                 Site231, Site232, Site233, Site234, Site235, Site236, Site237, Site238, Site239, Site240,
-                 Site241, Site242, Site243, Site244, Site245, Site246, Site247, Site248, Site249, Site250,
-                 Site251, Site252, Site253, Site254, Site255, Site256, Site257, Site258, Site259, Site260,
-                 Site261, Site262, Site263, Site264, Site265, Site266, Site267, Site268, Site269, Site270,
-                 Site271, Site272, Site273, Site274, Site275, Site276, Site277, Site278, Site279, Site280,
-                 Site281, Site282, Site283, Site284, Site285, Site286, Site287, Site288, Site289, Site290,
-                 Site291, Site292, Site293, Site294, Site295, Site296, Site297, Site298, Site299, Site300,
-                 Site301, Site302, Site303, Site304, Site305, Site306, Site307, Site308, Site309, Site310,
-                 Site311, Site312, Site313, Site314, Site315, Site316, Site317, Site318, Site319, Site320,
-                 Site321, Site322, Site323, Site324, Site325, Site326, Site327, Site328, Site329, Site330,
-                 Site331, Site332, Site333, Site334, Site335, Site336, Site337, Site338, Site339, Site340,
-                 Site341, Site342, Site343, Site344, Site345, Site346, Site347, Site348, Site349, Site350,
-                 Site351, Site352, Site353, Site354, Site355, Site356, Site357, Site358, Site359, Site360,
-                 Site361, Site362, Site363, Site364, Site365, Site366, Site367, Site368, Site369, Site370,
-                 Site371, Site372, Site373, Site374, Site375, Site376, Site377, Site378, Site379, Site380,
-                 Site381, Site382, Site383, Site384, Site385, Site386, Site387, Site388, Site389, Site390,
-                 Site391, Site392, Site393, Site394, Site395, Site396, Site397, Site398, Site399, Site400,
-                 Site401, Site402, Site403, Site404, Site405, Site406, Site407, Site408, Site409, Site410,
-                 Site411, Site412, Site413, Site414, Site415, Site416, Site417, Site418, Site419, Site420,
-                 Site421, Site422, Site423, Site424, Site425, Site426, Site427, Site428, Site429, Site430,
-                 Site431, Site432, Site433, Site434, Site435, Site436, Site437, Site438, Site439, Site440,
-                 Site441, Site442, Site443, Site444, Site445, Site446, Site447, Site448, Site449, Site450,
-                 Site451, Site452, Site453, Site454, Site455, Site456, Site457, Site458, Site459, Site460,
-                 Site461, Site462, Site463, Site464, Site465, Site466, Site467, Site468, Site469, Site470,
-                 Site471, Site472, Site473, Site474, Site475, Site476, Site477, Site478, Site479, Site480,
-                 Site481, Site482, Site483, Site484, Site485, Site486, Site487, Site488, Site489, Site490,
-                 Site491, Site492, Site493, Site494, Site495, Site496, Site497, Site498, Site499, Site500,
-                 Site501, Site502, Site503, Site504, Site505, Site506, Site507, Site508, Site509, Site510,
-                 Site511, Site512, Site513, Site514, Site515, Site516, Site517, Site518, Site519, Site520,
-                 Site521, Site522, Site523, Site524, Site525, Site526, Site527, Site528, Site529, Site530,
-                 Site531, Site532, Site533, Site534, Site535, Site536, Site537, Site538, Site539, Site540,
-                 Site541, Site542, Site543, Site544, Site545, Site546, Site547, Site548, Site549, Site550,
-                 Site551, Site552, Site553, Site554, Site555, Site556, Site557, Site558, Site559, Site560,
-                 Site561, Site562, Site563, Site564, Site565, Site566, Site567, Site568, Site569, Site570,
-                 Site571, Site572, Site573, Site574, Site575, Site576, Site577, Site578, Site579, Site580,
-                 Site581, Site582, Site583, Site584, Site585, Site586, Site587, Site588, Site589, Site590,
-                 Site591, Site592, Site593, Site594, Site595, Site596, Site597, Site598, Site599, Site600,
-                 Site601, Site602, Site603, Site604, Site605, Site606, Site607, Site608, Site609, Site610,
-                 Site611, Site612, Site613, Site614, Site615, Site616, Site617, Site618, Site619, Site620,
-                 Site621, Site622, Site623, Site624, Site625, Site626, Site627, Site628, Site629, Site630,
-                 Site631, Site632, Site633, Site634, Site635, Site636, Site637, Site638, Site639, Site640,
-                 Site641, Site642, Site643, Site644, Site645, Site646, Site647, Site648, Site649, Site650,
-                 Site651, Site652, Site653, Site654, Site655, Site656, Site657, Site658, Site659, Site660,
-                 Site661, Site662, Site663, Site664, Site665, Site666, Site667, Site668, Site669, Site670,
-                 Site671, Site672, Site673, Site674, Site675, Site676, Site677, Site678, Site679, Site680,
-                 Site681, Site682, Site683, Site684, Site685, Site686, Site687, Site688, Site689, Site690,
-                 Site691, Site692, Site693, Site694, Site695, Site696, Site697, Site698, Site699, Site700,
-                 Site701, Site702, Site703, Site704, Site705, Site706, Site707, Site708, Site709, Site710,
-                 Site711, Site712, Site713, Site714, Site715, Site716, Site717, Site718, Site719, Site720,
-                 Site721, Site722, Site723, Site724, Site725, Site726, Site727, Site728, Site729, Site730,
-                 Site731, Site732, Site733, Site734, Site735, Site736, Site737, Site738, Site739, Site740,
-                 Site741, Site742, Site743, Site744, Site745, Site746, Site747, Site748, Site749, Site750,
-                 Site751, Site752, Site753, Site754, Site755, Site756, Site757, Site758, Site759, Site760,
-                 Site761, Site762, Site763, Site764, Site765, Site766, Site767, Site768
-                 )
-                         ) AS UnpivotedData
+        SELECT monitorId, collectTime, maxTemperature tempreture
+        FROM T_ArrayTemperatureData
         <where>
-            <if test="monitorId != null and monitorId != ''"> and monitorId = #{monitorId}</if>
+            <if test="monitorId != null and monitorId != ''">and monitorId = #{monitorId}</if>
             <if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
-             and collectTime between #{params.beginCollectTime} and #{params.endCollectTime}</if>
+                and collectTime between #{params.beginCollectTime} and #{params.endCollectTime}
+            </if>
         </where>
-             ) AS Data
-        GROUP BY monitorId, collectTime
+        order by monitorId, collectTime
     </select>
+
+    <!--            SELECT monitorId, collectTime, MAX(SiteValue) AS tempreture
+            FROM (
+                     SELECT monitorId, collectTime, SiteValue
+                     FROM T_ArrayTemperatureData
+                              UNPIVOT (
+                                       SiteValue FOR Site IN (
+                     Site1, Site2, Site3, Site4, Site5, Site6, Site7, Site8, Site9, Site10,
+                     Site11, Site12, Site13, Site14, Site15, Site16, Site17, Site18, Site19, Site20,
+                     Site21, Site22, Site23, Site24, Site25, Site26, Site27, Site28, Site29, Site30,
+                     Site31, Site32, Site33, Site34, Site35, Site36, Site37, Site38, Site39, Site40,
+                     Site41, Site42, Site43, Site44, Site45, Site46, Site47, Site48, Site49, Site50,
+                     Site51, Site52, Site53, Site54, Site55, Site56, Site57, Site58, Site59, Site60,
+                     Site61, Site62, Site63, Site64, Site65, Site66, Site67, Site68, Site69, Site70,
+                     Site71, Site72, Site73, Site74, Site75, Site76, Site77, Site78, Site79, Site80,
+                     Site81, Site82, Site83, Site84, Site85, Site86, Site87, Site88, Site89, Site90,
+                     Site91, Site92, Site93, Site94, Site95, Site96, Site97, Site98, Site99, Site100,
+                     Site101, Site102, Site103, Site104, Site105, Site106, Site107, Site108, Site109, Site110,
+                     Site111, Site112, Site113, Site114, Site115, Site116, Site117, Site118, Site119, Site120,
+                     Site121, Site122, Site123, Site124, Site125, Site126, Site127, Site128, Site129, Site130,
+                     Site131, Site132, Site133, Site134, Site135, Site136, Site137, Site138, Site139, Site140,
+                     Site141, Site142, Site143, Site144, Site145, Site146, Site147, Site148, Site149, Site150,
+                     Site151, Site152, Site153, Site154, Site155, Site156, Site157, Site158, Site159, Site160,
+                     Site161, Site162, Site163, Site164, Site165, Site166, Site167, Site168, Site169, Site170,
+                     Site171, Site172, Site173, Site174, Site175, Site176, Site177, Site178, Site179, Site180,
+                     Site181, Site182, Site183, Site184, Site185, Site186, Site187, Site188, Site189, Site190,
+                     Site191, Site192, Site193, Site194, Site195, Site196, Site197, Site198, Site199, Site200,
+                     Site201, Site202, Site203, Site204, Site205, Site206, Site207, Site208, Site209, Site210,
+                     Site211, Site212, Site213, Site214, Site215, Site216, Site217, Site218, Site219, Site220,
+                     Site221, Site222, Site223, Site224, Site225, Site226, Site227, Site228, Site229, Site230,
+                     Site231, Site232, Site233, Site234, Site235, Site236, Site237, Site238, Site239, Site240,
+                     Site241, Site242, Site243, Site244, Site245, Site246, Site247, Site248, Site249, Site250,
+                     Site251, Site252, Site253, Site254, Site255, Site256, Site257, Site258, Site259, Site260,
+                     Site261, Site262, Site263, Site264, Site265, Site266, Site267, Site268, Site269, Site270,
+                     Site271, Site272, Site273, Site274, Site275, Site276, Site277, Site278, Site279, Site280,
+                     Site281, Site282, Site283, Site284, Site285, Site286, Site287, Site288, Site289, Site290,
+                     Site291, Site292, Site293, Site294, Site295, Site296, Site297, Site298, Site299, Site300,
+                     Site301, Site302, Site303, Site304, Site305, Site306, Site307, Site308, Site309, Site310,
+                     Site311, Site312, Site313, Site314, Site315, Site316, Site317, Site318, Site319, Site320,
+                     Site321, Site322, Site323, Site324, Site325, Site326, Site327, Site328, Site329, Site330,
+                     Site331, Site332, Site333, Site334, Site335, Site336, Site337, Site338, Site339, Site340,
+                     Site341, Site342, Site343, Site344, Site345, Site346, Site347, Site348, Site349, Site350,
+                     Site351, Site352, Site353, Site354, Site355, Site356, Site357, Site358, Site359, Site360,
+                     Site361, Site362, Site363, Site364, Site365, Site366, Site367, Site368, Site369, Site370,
+                     Site371, Site372, Site373, Site374, Site375, Site376, Site377, Site378, Site379, Site380,
+                     Site381, Site382, Site383, Site384, Site385, Site386, Site387, Site388, Site389, Site390,
+                     Site391, Site392, Site393, Site394, Site395, Site396, Site397, Site398, Site399, Site400,
+                     Site401, Site402, Site403, Site404, Site405, Site406, Site407, Site408, Site409, Site410,
+                     Site411, Site412, Site413, Site414, Site415, Site416, Site417, Site418, Site419, Site420,
+                     Site421, Site422, Site423, Site424, Site425, Site426, Site427, Site428, Site429, Site430,
+                     Site431, Site432, Site433, Site434, Site435, Site436, Site437, Site438, Site439, Site440,
+                     Site441, Site442, Site443, Site444, Site445, Site446, Site447, Site448, Site449, Site450,
+                     Site451, Site452, Site453, Site454, Site455, Site456, Site457, Site458, Site459, Site460,
+                     Site461, Site462, Site463, Site464, Site465, Site466, Site467, Site468, Site469, Site470,
+                     Site471, Site472, Site473, Site474, Site475, Site476, Site477, Site478, Site479, Site480,
+                     Site481, Site482, Site483, Site484, Site485, Site486, Site487, Site488, Site489, Site490,
+                     Site491, Site492, Site493, Site494, Site495, Site496, Site497, Site498, Site499, Site500,
+                     Site501, Site502, Site503, Site504, Site505, Site506, Site507, Site508, Site509, Site510,
+                     Site511, Site512, Site513, Site514, Site515, Site516, Site517, Site518, Site519, Site520,
+                     Site521, Site522, Site523, Site524, Site525, Site526, Site527, Site528, Site529, Site530,
+                     Site531, Site532, Site533, Site534, Site535, Site536, Site537, Site538, Site539, Site540,
+                     Site541, Site542, Site543, Site544, Site545, Site546, Site547, Site548, Site549, Site550,
+                     Site551, Site552, Site553, Site554, Site555, Site556, Site557, Site558, Site559, Site560,
+                     Site561, Site562, Site563, Site564, Site565, Site566, Site567, Site568, Site569, Site570,
+                     Site571, Site572, Site573, Site574, Site575, Site576, Site577, Site578, Site579, Site580,
+                     Site581, Site582, Site583, Site584, Site585, Site586, Site587, Site588, Site589, Site590,
+                     Site591, Site592, Site593, Site594, Site595, Site596, Site597, Site598, Site599, Site600,
+                     Site601, Site602, Site603, Site604, Site605, Site606, Site607, Site608, Site609, Site610,
+                     Site611, Site612, Site613, Site614, Site615, Site616, Site617, Site618, Site619, Site620,
+                     Site621, Site622, Site623, Site624, Site625, Site626, Site627, Site628, Site629, Site630,
+                     Site631, Site632, Site633, Site634, Site635, Site636, Site637, Site638, Site639, Site640,
+                     Site641, Site642, Site643, Site644, Site645, Site646, Site647, Site648, Site649, Site650,
+                     Site651, Site652, Site653, Site654, Site655, Site656, Site657, Site658, Site659, Site660,
+                     Site661, Site662, Site663, Site664, Site665, Site666, Site667, Site668, Site669, Site670,
+                     Site671, Site672, Site673, Site674, Site675, Site676, Site677, Site678, Site679, Site680,
+                     Site681, Site682, Site683, Site684, Site685, Site686, Site687, Site688, Site689, Site690,
+                     Site691, Site692, Site693, Site694, Site695, Site696, Site697, Site698, Site699, Site700,
+                     Site701, Site702, Site703, Site704, Site705, Site706, Site707, Site708, Site709, Site710,
+                     Site711, Site712, Site713, Site714, Site715, Site716, Site717, Site718, Site719, Site720,
+                     Site721, Site722, Site723, Site724, Site725, Site726, Site727, Site728, Site729, Site730,
+                     Site731, Site732, Site733, Site734, Site735, Site736, Site737, Site738, Site739, Site740,
+                     Site741, Site742, Site743, Site744, Site745, Site746, Site747, Site748, Site749, Site750,
+                     Site751, Site752, Site753, Site754, Site755, Site756, Site757, Site758, Site759, Site760,
+                     Site761, Site762, Site763, Site764, Site765, Site766, Site767, Site768
+                     )
+                             ) AS UnpivotedData
+            <where>
+                <if test="monitorId != null and monitorId != ''"> and monitorId = #{monitorId}</if>
+                <if test="params.beginCollectTime != null and params.beginCollectTime != '' and params.endCollectTime != null and params.endCollectTime != ''">
+                 and collectTime between #{params.beginCollectTime} and #{params.endCollectTime}</if>
+            </where>
+                 ) AS Data
+            GROUP BY monitorId, collectTime-->
 </mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml
index ea9353b..de975de 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml
@@ -123,5 +123,17 @@
         AND m.monitorId IS NOT NULL
         ORDER BY sensor_id
     </select>
+    <select id="selectTVibrationsensorDataListCurve" parameterType="TVibrationsensorData"
+            resultMap="TVibrationsensorDataResult">
+        <include refid="selectTVibrationsensorDataVo"/>
+        <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 sensor_id = #{sensorId}</if>
+            <if test="recodeTime != null ">and recodeTime = #{recodeTime}</if>
+        </where>
+        order by collectTime asc
+    </select>
 
 </mapper>