THENG
/
a-tuoheng-device
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改代码结构

This commit is contained in:
孙小云 2026-01-21 15:37:43 +08:00
parent 679a3e7bf2
commit ac9a8944cb
2 changed files with 25 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/main/java/com/ruoyi/device/service/enums/DockStatusEnum.java
View File

@ -11,71 +11,49 @@ public enum DockStatusEnum
/**
* 空闲中
*/
IDLE(0, "Idle"),
IDLE("IDLE", "空闲中"),
/**
* 现场调试
*/
ON_SITE_DEBUGGING(1, "On-site Debugging"),
/**
* 远程调试
*/
REMOTE_DEBUGGING(2, "Remote Debugging"),
Debugging("Debugging", "现场调试/远程调试"),
/**
* 固件升级中
*/
FIRMWARE_UPGRADING(3, "Firmware Upgrading"),
FIRMWARE_UPGRADING("Upgrading", "固件升级中"),
/**
* 作业中
*/
WORKING(4, "Working"),
WORKING("Working", "作业中"),
/**
* 待标定
*/
TO_BE_CALIBRATED(5, "To Be Calibrated");
UNKNOWN("UNKNOWN", "待标定");
private final int code;
private final String code;
private final String description;
DockStatusEnum(int code, String description)
{
DockStatusEnum(String code, String description) {
this.code = code;
this.description = description;
}
public Integer getCode()
{
return (Integer) code;
public String getCode() {
return code;
}
public String getDescription()
{
public String getDescription() {
return description;
}
/**
* 根据code获取枚举
*
* @param code 状态码
* @return 枚举值
*/
public static DockStatusEnum fromCode(Integer code)
{
if (code == null)
{
return null;
}
for (DockStatusEnum status : DockStatusEnum.values())
{
if (status.getCode().equals(code))
{
return status;
}
}
return null;
@Override
public String toString() {
return code;
}
}

13
src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java
View File

@ -7,6 +7,8 @@ import com.ruoyi.device.domain.api.IAircraftDomain;
import com.ruoyi.device.domain.api.IThingsBoardDomain;
import com.ruoyi.device.domain.model.Device;
import com.ruoyi.device.domain.model.Dock;
import com.ruoyi.device.domain.model.thingsboard.AttributeMap;
import com.ruoyi.device.domain.model.thingsboard.TelemetryMap;
import com.ruoyi.device.service.api.IBufferDeviceService;
import com.ruoyi.device.service.dto.AircraftDetailDTO;
import com.ruoyi.device.service.dto.DockDetailDTO;
@ -57,14 +59,13 @@ public class BufferDeviceImpl implements IBufferDeviceService
DockDetailDTO dto = getChangeAbleDockDetailDTO(device.getIotDeviceId());
dto.setDockId(dock.getDockId());
dto.setDockName(dock.getDockName());
dto.setDockLocation(dock.getDockLocation());
dto.setDockIotId(device.getIotDeviceId());
return dto;
return null;
}
@Override
@ -78,9 +79,13 @@ public class BufferDeviceImpl implements IBufferDeviceService
private DockDetailDTO getChangeAbleDockDetailDTO(String deviceIotId)
{
DockDetailDTO dto = new DockDetailDTO();
AttributeMap attributeMap = thingsBoardDomain.getPredefinedDeviceAttributes(deviceIotId);
TelemetryMap telemetryMap = thingsBoardDomain.getPredefinedDeviceTelemetry(deviceIotId);
return null;
return dto;
}
private AircraftDetailDTO getChangeAbleAirDetailDTO(String deviceIotId)