From 68d4ddc476cbaf61432eec15f8f04dbe838296a6 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期二, 26 八月 2025 13:17:20 +0800
Subject: [PATCH] iot定日任务sql修改

---
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleJob.java                 |    2 +-
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java            |    2 +-
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/xml/EquipmentLogMapper.xml |   16 ++++++++++------
 3 files changed, 12 insertions(+), 8 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=")">
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleJob.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleJob.java
index b51176e..4f975b9 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleJob.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleJob.java
@@ -15,7 +15,7 @@
 import java.util.List;
 
 /**
- * 绀轰緥涓嶅甫鍙傚畾鏃朵换鍔�
+ * 蹇冭烦鍙戦�佸畾鏃朵换鍔�
  *
  * @Author Scott
  */
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java
index e5ae82d..572c6e3 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/quartz/job/SampleParamJob.java
@@ -36,7 +36,7 @@
 import java.util.stream.Collectors;
 
 /**
- * 绀轰緥甯﹀弬瀹氭椂浠诲姟
+ * influxdb瀹氭椂浠诲姟
  *
  * @Author Scott
  */

--
Gitblit v1.9.3