From 3f10dbc8691b2d6e7358fee58228a961a86ec776 Mon Sep 17 00:00:00 2001 From: zzc <1278921369@qq.com> Date: Thu, 22 Aug 2024 02:08:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/EqEquipmentServiceImpl.java | 12 ++++++++++++ .../resources/mapper/device/EqEquipmentMapper.xml | 10 ++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java index 52125a790..d1e69f031 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.web.service.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.dromara.common.core.utils.MapstructUtils; @@ -70,6 +71,17 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService { public TableDataInfo queryPageList(EqEquipmentBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + List records = result.getRecords(); + if (CollUtil.isEmpty(records)) return TableDataInfo.build(result); + //获取遥测数据 + + for (EqEquipmentVo record : records) { + String equipmentCode = record.getEquipmentCode(); + DeviceMsgDto telemetryMsg = iotService.httpTelemetryGetSend(equipmentCode); + record.setStatus(telemetryMsg.getOpenPercentage()); + record.setFaultStatus(telemetryMsg.getGarageException()); + } + return TableDataInfo.build(result); } diff --git a/ruoyi-admin/src/main/resources/mapper/device/EqEquipmentMapper.xml b/ruoyi-admin/src/main/resources/mapper/device/EqEquipmentMapper.xml index 1193c3d79..e16ae5175 100644 --- a/ruoyi-admin/src/main/resources/mapper/device/EqEquipmentMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/device/EqEquipmentMapper.xml @@ -28,14 +28,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" e.user_id, s.nick_name, e.user_name, - COUNT(*) AS bind_num, -- 设备总数 + COUNT(e.equipment_id) AS bind_num, -- 设备总数 SUM(CASE WHEN e.line_status = 0 THEN 1 ELSE 0 END) AS offline_num, -- 离线个数 SUM(CASE WHEN e.line_status = 1 THEN 1 ELSE 0 END) AS online_num -- 在线个数 FROM - eq_equipment e - JOIN - sys_user s ON e.user_id = s.user_id + sys_user s + left JOIN + eq_equipment e + ON e.user_id = s.user_id + s.user_type='app_user' AND s.nick_name like CONCAT('%', #{nickName}, '%')