From e4b569dc256dd001a8ab89171e8c8d4f5e9045eb Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 26 八月 2025 16:29:47 +0800
Subject: [PATCH] 设备单表采集时间字段类型修改

---
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/xml/EquipmentLogMapper.xml |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/xml/EquipmentLogMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/xml/EquipmentLogMapper.xml
index c542c3b..7513f71 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/xml/EquipmentLogMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/xml/EquipmentLogMapper.xml
@@ -3,21 +3,25 @@
 <mapper namespace="org.jeecg.modules.iot.mdc.mapper.EquipmentLogMapper">
 
     <select id="getRow" resultType="org.jeecg.modules.iot.mdc.entity.EquipmentLog">
-        SELECT top 1 * FROM EquipmentLog WHERE EquipmentID = #{ equipmentid } AND CollectTime &lt;= #{ startTime } AND Oporation in ('0','1','2','3') ORDER BY CollectTime ASC
+        SELECT * FROM EquipmentLog WHERE EquipmentID = #{ equipmentid } AND CollectTime &lt;= #{ startTime } AND Oporation in ('0','1','2','3') ORDER BY CollectTime ASC LIMIT 1
     </select>
 
     <select id="selectEquipmentOporation" resultType="org.jeecg.modules.iot.mdc.entity.EquipmentLog">
-        SELECT TOP 1 * FROM EquipmentLog WHERE EquipmentID = #{ equipmentId } ORDER BY CollectTime DESC
+        SELECT * FROM EquipmentLog WHERE EquipmentID = #{ equipmentId } ORDER BY CollectTime DESC LIMIT 1
     </select>
 
     <!--鏌ヨ璁惧鏈�鏂颁竴鏉℃暟鎹�-->
     <select id="getEquipmentStatusList" resultType="org.jeecg.modules.iot.mdc.entity.EquipmentLog">
         SELECT
-            t1.*
+        t1.*
         FROM
-            EquipmentLog t1
-        INNER JOIN ( SELECT MAX ( CollectTime ) AS CollectTime, EquipmentID FROM EquipmentLog GROUP BY EquipmentID ) t2 ON t1.CollectTime= t2.CollectTime
-        AND t1.EquipmentID= t2.EquipmentID
+        EquipmentLog t1
+        INNER JOIN (
+        SELECT MAX(CollectTime) AS CollectTime, EquipmentID
+        FROM EquipmentLog
+        GROUP BY EquipmentID
+        ) t2 ON t1.CollectTime = t2.CollectTime
+        AND t1.EquipmentID = t2.EquipmentID
         <if test="equipmentIdList != null and equipmentIdList.size() > 0">
             AND t1.EquipmentID IN
             <foreach collection="equipmentIdList" index="index" item="id" open="(" separator="," close=")">

--
Gitblit v1.9.3