新增主动报警alarm，健康码，体温，包裹，违禁品导出数据接口

Administrator

2021-04-12 36afc3a1f1437b8a3283dc0bf6475e96fded05a7

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml

@@ -165,8 +165,11 @@
            and dtype=#{equipment.dtype}
        </if>

        <if test="dxtype!=null">
        <if test="dxtype!=null and dxtype == 1">
            and heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY)
        </if>
        <if test="dxtype!=null and dxtype == 0">
            and heartbeat &lt; DATE_SUB(NOW(),INTERVAL 1 DAY)
        </if>

        <if test="childList!=null and childList.size>0">
@@ -246,7 +249,7 @@
        WHERE
        1 =1

        <if test="equipment.deviceName!=null">
        <if test="equipment.deviceName!=null and equipment.deviceName!=''">
            and (
            deviceName like concat('%',#{equipment.deviceName},'%')
            or deviceNumber like concat('%',#{equipment.deviceName},'%')
@@ -415,7 +418,17 @@

    <!--查询预警设备数量-->
    <select id="selectEqCy" resultType="java.util.HashMap">
        SELECT COUNT(deviceNumber) as cou,deviceNumber FROM `sys_alarm` WHERE alarmTime like concat(concat('%', #{time}), '%') and waringType NOT IN("系统测试","主机重新上电") group by deviceNumber
        SELECT
            count( id ) AS jtype,
            deviceNumber
        FROM
            sys_alarm
        WHERE
            waringType = "紧急求救"
            AND jtype = 0
            OR jtype = 1
        GROUP BY
            deviceNumber
    </select>

    <!--查询设故障数量-->