opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-19 01:48:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

属性获取接口优化

Browse Source
This commit is contained in:
zhangzhicheng 2024-07-30 14:58:57 +08:00
parent 9a65ffea6c
commit 04ab31593d
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/org/dromara/web/domain/vo/EqEquipmentDetailVo.java
View File

@ -73,7 +73,7 @@ public class EqEquipmentDetailVo implements Serializable {
* 90.打开90% * 90.打开90%
* 100.打开100% * 100.打开100%
*/ */
private Integer openStatusText; private String openStatusText;
/** /**
* 设备运行状态 * 设备运行状态
@ -99,7 +99,7 @@ public class EqEquipmentDetailVo implements Serializable {
* 13.电机维护故障 motorMaintainException * 13.电机维护故障 motorMaintainException
* 14.设备故障 deviceException * 14.设备故障 deviceException
*/ */
private Integer runStatusText; private String runStatusText;
/** /**
* 故障状态 * 故障状态

14
ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java
View File

@ -1,6 +1,7 @@
package org.dromara.web.service.impl; package org.dromara.web.service.impl;
import org.dromara.common.core.utils.MapstructUtils; 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.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
@ -206,14 +207,25 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
EqEquipmentDetailVo result = new EqEquipmentDetailVo(); EqEquipmentDetailVo result = new EqEquipmentDetailVo();
result.setEquipmentId(bo.getEquipmentId()); result.setEquipmentId(bo.getEquipmentId());
result.setEquipmentCode(bo.getEquipmentCode()); result.setEquipmentCode(bo.getEquipmentCode());
//查看设备
EqEquipmentVo eqEquipmentVo = baseMapper.selectVoById(bo.getEquipmentId()); EqEquipmentVo eqEquipmentVo = baseMapper.selectVoById(bo.getEquipmentId());
//获取服务属性状态 //获取服务属性状态
DeviceServerMsgDto serverMsg = iotService.httpServerGetSend(bo.getEquipmentCode()); DeviceServerMsgDto serverMsg = iotService.httpServerGetSend(bo.getEquipmentCode());
result.setLineStatus(serverMsg.getLineStatus()?1:0); result.setLineStatus(serverMsg.getLineStatus()?1:0);
//获取遥测数据 //获取遥测数据
DeviceMsgDto telemetryMsg = iotService.httpTelemetryGetSend(bo.getEquipmentCode()); DeviceMsgDto telemetryMsg = iotService.httpTelemetryGetSend(bo.getEquipmentCode());
//开合状态
result.setOpenStatus(telemetryMsg.getOpenPercentage()); 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.setRunStatus(telemetryMsg.getGarageException()==10?telemetryMsg.getWorkState():telemetryMsg.getGarageException());
result.setRunStatusText(MessageUtils.message("runStatus.name"+result.getRunStatus()));
result.setEquipmentName(eqEquipmentVo.getEquipmentName()); result.setEquipmentName(eqEquipmentVo.getEquipmentName());
result.setBindTime(eqEquipmentVo.getBindTime()); result.setBindTime(eqEquipmentVo.getBindTime());
result.setDeviceMsgDto(telemetryMsg); result.setDeviceMsgDto(telemetryMsg);
@ -248,7 +260,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
DeviceMsgDto deviceMsgDto = iotService.httpTelemetryGetSend(equipmentCode); DeviceMsgDto deviceMsgDto = iotService.httpTelemetryGetSend(equipmentCode);
eqEquipmentBo.setStatus(deviceMsgDto.getOpenPercentage());//使用半开作为状态值 eqEquipmentBo.setStatus(deviceMsgDto.getOpenPercentage());//使用半开作为状态值
eqEquipmentBo.setFaultStatus(Integer.valueOf(deviceMsgDto.getGarageException())); eqEquipmentBo.setFaultStatus(deviceMsgDto.getGarageException());
//判断是否获取到信息 无信息会抛异常 无需判断 //判断是否获取到信息 无信息会抛异常 无需判断
EqEquipment add = MapstructUtils.convert(eqEquipmentBo, EqEquipment.class); EqEquipment add = MapstructUtils.convert(eqEquipmentBo, EqEquipment.class);