From 04ab31593dc28f07700fdab8fb3ffbea32474bf7 Mon Sep 17 00:00:00 2001
From: zhangzhicheng <L29789zzc>
Date: Tue, 30 Jul 2024 14:58:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E8=8E=B7=E5=8F=96=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/web/domain/vo/EqEquipmentDetailVo.java |  4 ++--
 .../web/service/impl/EqEquipmentServiceImpl.java   | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentDetailVo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentDetailVo.java
index 3392daf80..82b32c278 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentDetailVo.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentDetailVo.java
@@ -73,7 +73,7 @@ public class EqEquipmentDetailVo implements Serializable {
      * 90.打开90%
      * 100.打开100%
      */
-    private Integer openStatusText;
+    private String openStatusText;
 
     /**
      * 设备运行状态
@@ -99,7 +99,7 @@ public class EqEquipmentDetailVo implements Serializable {
      * 13.电机维护故障 motorMaintainException
      * 14.设备故障 deviceException
      */
-    private Integer runStatusText;
+    private String runStatusText;
 
     /**
      * 故障状态
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 ba8343d24..5eae62410 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,6 +1,7 @@
 package org.dromara.web.service.impl;
 
 import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.MessageUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -206,14 +207,25 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
         EqEquipmentDetailVo result = new EqEquipmentDetailVo();
         result.setEquipmentId(bo.getEquipmentId());
         result.setEquipmentCode(bo.getEquipmentCode());
+        //查看设备
         EqEquipmentVo eqEquipmentVo = baseMapper.selectVoById(bo.getEquipmentId());
         //获取服务属性状态
         DeviceServerMsgDto serverMsg = iotService.httpServerGetSend(bo.getEquipmentCode());
         result.setLineStatus(serverMsg.getLineStatus()?1:0);
         //获取遥测数据
         DeviceMsgDto telemetryMsg = iotService.httpTelemetryGetSend(bo.getEquipmentCode());
+
+        //开合状态
         result.setOpenStatus(telemetryMsg.getOpenPercentage());
+        result.setOpenStatusText(
+            telemetryMsg.getOpenPercentage()==0
+            ?MessageUtils.message("openStatus.name0")
+            :MessageUtils.message("openStatus.name1")+ telemetryMsg.getOpenPercentage()+"%");
+
+        //运行状态
         result.setRunStatus(telemetryMsg.getGarageException()==10?telemetryMsg.getWorkState():telemetryMsg.getGarageException());
+        result.setRunStatusText(MessageUtils.message("runStatus.name"+result.getRunStatus()));
+
         result.setEquipmentName(eqEquipmentVo.getEquipmentName());
         result.setBindTime(eqEquipmentVo.getBindTime());
         result.setDeviceMsgDto(telemetryMsg);
@@ -248,7 +260,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
         DeviceMsgDto deviceMsgDto = iotService.httpTelemetryGetSend(equipmentCode);
 
         eqEquipmentBo.setStatus(deviceMsgDto.getOpenPercentage());//使用半开作为状态值
-        eqEquipmentBo.setFaultStatus(Integer.valueOf(deviceMsgDto.getGarageException()));
+        eqEquipmentBo.setFaultStatus(deviceMsgDto.getGarageException());
 
         //判断是否获取到信息 无信息会抛异常 无需判断
         EqEquipment add = MapstructUtils.convert(eqEquipmentBo, EqEquipment.class);