Merge remote-tracking branch 'origin/master'

Lius

2025-08-27 37fd5447c3b7bfdd3d1b31f8d68c6750471f178c

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/iot/mdc/mapper/xml/EquipmentLogMapper.xml

@@ -3,15 +3,15 @@
<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 top 1 * FROM equipmentLog WHERE EquipmentID = #{ equipmentid } AND CollectTime &lt;= #{ startTime } AND Oporation in ('0','1','2','3') ORDER BY CollectTime ASC
    </select>

    <select id="selectEquipmentOporationSqlServer" resultType="org.jeecg.modules.iot.mdc.entity.EquipmentLog">
        SELECT TOP 1 * FROM EquipmentLog WHERE EquipmentID = #{ equipmentId } ORDER BY CollectTime DESC
        SELECT TOP 1 * FROM equipmentLog WHERE EquipmentID = #{ equipmentId } ORDER BY CollectTime DESC
    </select>

    <select id="selectEquipmentOporationMySql" resultType="org.jeecg.modules.iot.mdc.entity.EquipmentLog">
        SELECT * FROM EquipmentLog WHERE EquipmentID = #{ equipmentId } ORDER BY CollectTime DESC LIMIT 1
        SELECT * FROM equipmentLog WHERE EquipmentID = #{ equipmentId } ORDER BY CollectTime DESC LIMIT 1
    </select>

    <!--查询设备最新一条数据-->
@@ -19,8 +19,8 @@
        SELECT
            t1.*
        FROM
            EquipmentLog t1
        INNER JOIN ( SELECT MAX ( CollectTime ) AS CollectTime, EquipmentID FROM EquipmentLog GROUP BY EquipmentID ) t2 ON t1.CollectTime= t2.CollectTime
            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