mdc_430后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
qushaowei
2024-03-18 a3b72bdd43a1e61c2c08a65b1625106d2ac9d3bf 
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml


@@ -238,6 +238,12 @@


            <if test="mdcEquipment.driveType != null and mdcEquipment.driveType != '' ">


                AND t1.drive_type = #{mdcEquipment.driveType}


            </if>


            <if test="mdcEquipment.deviceLevel != null and mdcEquipment.deviceLevel != '' ">


                AND t1.device_level = #{mdcEquipment.deviceLevel}


            </if>


            <if test="mdcEquipment.deviceCategory != null and mdcEquipment.deviceCategory != '' ">


                AND t1.device_category = #{mdcEquipment.deviceCategory}


            </if>


            <if test="mdcEquipment.productionIds != null and mdcEquipment.productionIds.size() > 0 ">


                AND t3.id IN


                <foreach collection="mdcEquipment.productionIds" index="index" item="id" open="(" separator="," close=")">


@@ -284,22 +290,6 @@


    <!--查询单表数据-->


    <select id="findWorkLineLast" resultType="org.jeecg.modules.mdc.dto.MdcEquipmentDto">


        select top 1 spindlespeed, actualspindlespeed from [${tableName}] order by CollectTime  desc


    </select>




    <!--查询设备最新一条数据-->


    <select id="getEquipmentStatusList" resultType="org.jeecg.modules.mdc.entity.EquipmentLog">


        SELECT


            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


        <if test="equipmentIdList != null and equipmentIdList.size() > 0">


            AND t1.EquipmentID IN


            <foreach collection="equipmentIdList" index="index" item="id" open="(" separator="," close=")">


                #{id}


            </foreach>


        </if>


    </select>




</mapper>