接口提供：卡片模式增加是否报警中

zengh

2021-04-09 1d44a66cdcdab222204337c1aa24bcf087746f38

接口提供：卡片模式增加是否报警中

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

@@ -29,6 +29,7 @@
        <result column="district" property="district"/>
        <result column="state" property="state"/>
        <result column="reason" property="reason"/>
        <result column="jtype" property="jtype"/>
    </resultMap>

    <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
@@ -187,20 +188,63 @@
    </select>

    <select id="listAll" resultMap="equipmentResultMap">
          select equipment.id,equipment.deviceName,equipment.deviceNumber,equipment.deviceType,equipment.ownership
        ,equipment.ownerId,equipment.devicestate,equipment.stime,equipment.dtype,equipment.heartbeat,equipment.expireTime,
        equipment.parent_id,equipment.district,equipment.province,equipment.city,equipment.serialNumber,equipment.channelNumber,
        equipment.jd ,
        equipment.wd ,
        equipment.state,equipment.reason,
        equipment.street,catalog.pid,
        equipment.oneContacts,equipment.onePhone,equipment.oneId,
        equipment.twoContacts,equipment.twoPhone,equipment.twoId,
        equipment.ThreeContacts,equipment.ThreePhone,equipment.threeId,
        SELECT
        IF
        ( alarm.jtype IS NULL, 0, 1 ) AS jtype,
        equipment.id,
        equipment.deviceName,
        equipment.deviceNumber,
        equipment.deviceType,
        equipment.ownership,
        equipment.ownerId,
        equipment.devicestate,
        equipment.stime,
        equipment.dtype,
        equipment.heartbeat,
        equipment.expireTime,
        equipment.parent_id,
        equipment.district,
        equipment.province,
        equipment.city,
        equipment.serialNumber,
        equipment.channelNumber,
        equipment.jd,
        equipment.wd,
        equipment.state,
        equipment.reason,
        equipment.street,
        catalog.pid,
        equipment.oneContacts,
        equipment.onePhone,
        equipment.oneId,
        equipment.twoContacts,
        equipment.twoPhone,
        equipment.twoId,
        equipment.ThreeContacts,
        equipment.ThreePhone,
        equipment.threeId,
        equipment.deptId,
        equipment.addvcd,equipment.pay,equipment.expireTime from sys_equipment equipment
        left join sys_catalog catalog on catalog.eqid = equipment.deviceNumber
        where 1=1
        equipment.addvcd,
        equipment.pay,
        equipment.expireTime
        FROM
        sys_equipment equipment
        LEFT JOIN sys_catalog catalog ON catalog.eqid = equipment.deviceNumber
        LEFT JOIN (
        SELECT
        count( id ) AS jtype,
        deviceNumber
        FROM
        sys_alarm
        WHERE
        waringType = "紧急求救"
        AND jtype = 0
        OR jtype = 1
        GROUP BY
        deviceNumber
        ) alarm ON alarm.deviceNumber = equipment.deviceNumber
        WHERE
        1 =1

        <if test="equipment.deviceName!=null">
            and (

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java

@@ -51,4 +51,7 @@

    private String onlineStatus;

    //设备是否处于报警状态
    String jtype;

}