设备查询接口条件修改，去除健康检测时间的判断

Administrator

2021-06-11 7a91c739851b8141dbbef8529bb14283de601a32

设备查询接口条件修改，去除健康检测时间的判断

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/article/controller/ArticleController.java

@@ -1,8 +1,6 @@
package org.springblade.jfpt.article.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;

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

@@ -193,13 +193,13 @@
            and dtype=#{equipment.dtype}
        </if>
        <if test="dxtype!=null and dxtype == 0">
            and heartbeat &lt; DATE_SUB(NOW(),INTERVAL 1 DAY)  and dtype=0
            and dtype=0
        </if>
        <if test="dxtype!=null and dxtype == 1">
            and heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY) and dtype=1
            and dtype=1
        </if>
        <if test="dxtype!=null and dxtype == 2">
            and heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY) and dtype=2
            and dtype=2
        </if>
        <if test="dxtype!=null and dxtype == 3">
            and dtype=3
@@ -454,12 +454,12 @@

    <!--查询设备在线数量-->
    <select id="selectEqCz" resultType="Integer">
        select COUNT(*) from sys_equipment where heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY) and dtype=1
        select COUNT(*) from sys_equipment where dtype=1
    </select>

    <!--查询设备掉线数量-->
    <select id="selectEqCd" resultType="Integer">
        select COUNT(*) from sys_equipment where heartbeat &lt; DATE_SUB(NOW(),INTERVAL 1 DAY) and dtype=0
        select COUNT(*) from sys_equipment where dtype=0
    </select>

    <!--查询预警设备数量-->
@@ -480,7 +480,7 @@

    <!--查询预警设备数量-->
    <select id="selectEqCys" resultType="Integer">
        select COUNT(*) from sys_equipment where heartbeat >= DATE_SUB(NOW(),INTERVAL 1 DAY) and dtype=2
        select COUNT(*) from sys_equipment where dtype=2
    </select>

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