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

优化

Browse Source
This commit is contained in:
zzc 2024-08-22 21:57:27 +08:00
parent a294cfb859
commit 3cc8cbae10
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java
View File

@ -60,6 +60,7 @@ public class IotService {
map.put("entityType","DEVICE"); map.put("entityType","DEVICE");
map.put("entityId",deviceCode); map.put("entityId",deviceCode);
String send = getSend(CommonYmlConfig.URL_IOT_TELEMETRY, map); String send = getSend(CommonYmlConfig.URL_IOT_TELEMETRY, map);
if (send.startsWith("{\"status\":")) return null;
JSONObject jsonObject = JSON.parseObject(send); JSONObject jsonObject = JSON.parseObject(send);
//转换 //转换
Map<String, String> resultMap = new HashMap<>(); Map<String, String> resultMap = new HashMap<>();

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

@ -77,6 +77,10 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
for (EqEquipmentVo record : records) { for (EqEquipmentVo record : records) {
String equipmentCode = record.getEquipmentCode(); String equipmentCode = record.getEquipmentCode();
DeviceMsgDto telemetryMsg = iotService.httpTelemetryGetSend(equipmentCode); DeviceMsgDto telemetryMsg = iotService.httpTelemetryGetSend(equipmentCode);
if (telemetryMsg == null) {
record.setLineStatus(0);//未获取到数据统一为离线
continue;
}
record.setStatus(telemetryMsg.getOpenPercentage()); record.setStatus(telemetryMsg.getOpenPercentage());
record.setFaultStatus(telemetryMsg.getGarageException()); record.setFaultStatus(telemetryMsg.getGarageException());
} }
@ -230,7 +234,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
//获取服务属性状态 //获取服务属性状态
DeviceServerMsgDto serverMsg = iotService.httpServerGetSend(bo.getEquipmentCode()); DeviceServerMsgDto serverMsg = iotService.httpServerGetSend(bo.getEquipmentCode());
result.setLineStatus(serverMsg.getLineStatus()?1:0); result.setLineStatus(serverMsg.getLineStatus()?1:0);
if (!serverMsg.getLineStatus()) return result;
//获取客户端属性 //获取客户端属性
DeviceClientMsgDto clientMsg = iotService.httpClientGetSend(bo.getEquipmentCode()); DeviceClientMsgDto clientMsg = iotService.httpClientGetSend(bo.getEquipmentCode());
result.setEquipmentType(clientMsg.getEquipmentType()); result.setEquipmentType(clientMsg.getEquipmentType());
@ -241,7 +245,10 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
//获取遥测数据 //获取遥测数据
DeviceMsgDto telemetryMsg = iotService.httpTelemetryGetSend(bo.getEquipmentCode()); DeviceMsgDto telemetryMsg = iotService.httpTelemetryGetSend(bo.getEquipmentCode());
if (telemetryMsg == null) {
System.out.println("未获取到设备信息");
result.setLineStatus(0);
}
//开合状态 //开合状态
result.setOpenStatus(telemetryMsg.getOpenPercentage()); result.setOpenStatus(telemetryMsg.getOpenPercentage());
result.setOpenStatusText( result.setOpenStatusText(
@ -297,14 +304,17 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
eqEquipmentBo.setUserName(sysUserVo.getUserName()); eqEquipmentBo.setUserName(sysUserVo.getUserName());
eqEquipmentBo.setNickName(sysUserVo.getNickName()); eqEquipmentBo.setNickName(sysUserVo.getNickName());
DeviceMsgDto deviceMsgDto = iotService.httpTelemetryGetSend(equipmentCode); DeviceMsgDto deviceMsgDto = iotService.httpTelemetryGetSend(equipmentCode);
if (deviceMsgDto==null){
eqEquipmentBo.setStatus(deviceMsgDto.getOpenPercentage());//使用半开作为状态值
eqEquipmentBo.setFaultStatus(deviceMsgDto.getGarageException());
eqEquipmentBo.setLineStatus(1);//在线
}else{
eqEquipmentBo.setLineStatus(0);//离线
}
eqEquipmentBo.setStatus(deviceMsgDto.getOpenPercentage());//使用半开作为状态值
eqEquipmentBo.setFaultStatus(deviceMsgDto.getGarageException());
eqEquipmentBo.setLineStatus(1);//在线
//判断是否获取到信息 无信息会抛异常 无需判断 //判断是否获取到信息 无信息会抛异常 无需判断
EqEquipment add = MapstructUtils.convert(eqEquipmentBo, EqEquipment.class); EqEquipment add = MapstructUtils.convert(eqEquipmentBo, EqEquipment.class);
validEntityBeforeSave(add);
baseMapper.insert(add); baseMapper.insert(add);
return true; return true;
} }