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

添加接口

This commit is contained in:
孙小云 2026-01-20 17:05:25 +08:00
parent 20e528b183
commit edc8751162
31 changed files with 359 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/ruoyi/device/controller/AircraftController.java
View File

@ -4,9 +4,10 @@ import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.device.api.domain.AircraftDetailVO;
import com.ruoyi.device.controller.convert.AircraftDetailDTOConvert;
import com.ruoyi.device.service.api.IAircraftService;
import com.ruoyi.device.service.api.IBufferDeviceService;
import com.ruoyi.device.service.convert.BufferDeviceConvert;
import com.ruoyi.device.controller.convert.DockDetailDTOConvert;
import com.ruoyi.device.service.dto.AircraftDetailDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -38,7 +39,7 @@ public class AircraftController extends BaseController
public R<AircraftDetailVO> getAircraftDetail(@PathVariable("aircraftId") Long aircraftId)
{
AircraftDetailDTO dto = bufferDeviceService.getAircraftDetailById(aircraftId);
AircraftDetailVO vo = BufferDeviceConvert.toVO(dto);
AircraftDetailVO vo = AircraftDetailDTOConvert.toVO(dto);
return R.ok(vo);
}
}

4
src/main/java/com/ruoyi/device/controller/DockController.java
View File

@ -7,7 +7,7 @@ import com.ruoyi.device.api.domain.DockDetailVO;
import com.ruoyi.device.api.domain.DockVO;
import com.ruoyi.device.service.api.IDockService;
import com.ruoyi.device.service.api.IBufferDeviceService;
import com.ruoyi.device.service.convert.BufferDeviceConvert;
import com.ruoyi.device.controller.convert.DockDetailDTOConvert;
import com.ruoyi.device.service.dto.DockDetailDTO;
import com.ruoyi.device.service.dto.DockDTO;
import com.ruoyi.device.controller.convert.DockControllerConvert;
@ -59,7 +59,7 @@ public class DockController extends BaseController
public R<DockDetailVO> getDockDetail(@PathVariable("dockId") Long dockId)
{
DockDetailDTO dto = bufferDeviceService.getDockDetailById(dockId);
DockDetailVO vo = BufferDeviceConvert.toVO(dto);
DockDetailVO vo = DockDetailDTOConvert.toVO(dto);
return R.ok(vo);
}
}

21
src/main/java/com/ruoyi/device/controller/GroupController.java
View File

@ -3,16 +3,18 @@ package com.ruoyi.device.controller;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.device.api.domain.DockVO;
import com.ruoyi.device.api.domain.GroupVO;
import com.ruoyi.device.api.domain.GroupCreateRequest;
import com.ruoyi.device.api.domain.SwitchDockGroupRequest;
import com.ruoyi.device.controller.convert.DockVOControllerConvert;
import com.ruoyi.device.service.api.IBufferDeviceService;
import com.ruoyi.device.service.api.IGroupService;
import com.ruoyi.device.service.dto.DockDetailDTO;
import com.ruoyi.device.service.dto.DockGroupDTO;
import com.ruoyi.device.service.dto.GroupDTO;
import com.ruoyi.device.service.dto.DockDTO;
import com.ruoyi.device.controller.convert.GroupControllerConvert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
/**
@ -27,6 +29,9 @@ public class GroupController extends BaseController
{
@Autowired
private IGroupService groupService;
@Autowired
private IBufferDeviceService bufferDeviceService;
/**
* 创建分组
*
@ -79,9 +84,13 @@ public class GroupController extends BaseController
@GetMapping("/docks/{groupId}")
public R<List<DockVO>> getDocksByGroupId(@PathVariable("groupId") Long groupId)
{
List<DockDTO> dtoList = groupService.getDocksByGroupId(groupId);
List<DockVO> voList = GroupControllerConvert.toDockVOList(dtoList);
return R.ok(voList);
List<DockGroupDTO> groupDTOS = groupService.getDocksByGroupId(groupId);
List<DockDetailDTO> dtoList = new ArrayList<>();
for (DockGroupDTO dockGroupDTO : groupDTOS) {
DockDetailDTO dockDetailDTO = bufferDeviceService.getDockDetailById(dockGroupDTO.getDockId());
dtoList.add(dockDetailDTO);
}
return R.ok(DockVOControllerConvert.toVOList(dtoList));
}
/**

11
src/main/java/com/ruoyi/device/controller/convert/AircraftControllerConvert.java
View File

@ -1,11 +0,0 @@
package com.ruoyi.device.controller.convert;
/**
* 无人机Controller转换器
*
* @author ruoyi
* @date 2026-01-20
*/
public class AircraftControllerConvert
{
}

42
src/main/java/com/ruoyi/device/controller/convert/AircraftDetailDTOConvert.java Normal file
View File

@ -0,0 +1,42 @@
package com.ruoyi.device.controller.convert;
import com.ruoyi.device.api.domain.AircraftDetailVO;
import com.ruoyi.device.service.dto.AircraftDetailDTO;
public class AircraftDetailDTOConvert {
public static AircraftDetailVO toVO(AircraftDetailDTO dto)
{
if (dto == null)
{
return null;
}
AircraftDetailVO vo = new AircraftDetailVO();
vo.setAircraftId(dto.getAircraftId());
vo.setAircraftName(dto.getAircraftName());
vo.setManufacturerName(dto.getManufacturerName());
vo.setAircraftVersion(dto.getAircraftVersion());
vo.setSnNumber(dto.getSnNumber());
vo.setBatterySn(dto.getBatterySn());
vo.setBindTime(dto.getBindTime());
vo.setMaintenanceDays(dto.getMaintenanceDays());
vo.setFlightDuration(dto.getFlightDuration());
vo.setMissionCount(dto.getMissionCount());
// vo.setNetworkList(convertNetworkList(dto.getNetworkList()));
vo.setRtkSignal(dto.getRtkSignal());
vo.setMaxAltitude(dto.getMaxAltitude());
vo.setMaxDistance(dto.getMaxDistance());
vo.setVoltage(dto.getVoltage());
vo.setBatteryLevel(dto.getBatteryLevel());
vo.setFlightTimeRemaining(dto.getFlightTimeRemaining());
vo.setBatteryTemperature(dto.getBatteryTemperature());
vo.setCycleCount(dto.getCycleCount());
// vo.setPayloadList(convertPayloadList(dto.getPayloadList()));
return vo;
}
}

60
src/main/java/com/ruoyi/device/controller/convert/DockDetailDTOConvert.java Normal file
View File

@ -0,0 +1,60 @@
package com.ruoyi.device.controller.convert;
import com.ruoyi.device.api.domain.DockDetailVO;
import com.ruoyi.device.service.dto.DockDetailDTO;
/**
* 设备缓冲服务转换类
* 用于 DTO 到 VO 的转换
*
* @author ruoyi
* @date 2026-01-20
*/
public class DockDetailDTOConvert
{
public static DockDetailVO toVO(DockDetailDTO dto)
{
if (dto == null)
{
return null;
}
DockDetailVO vo = new DockDetailVO();
vo.setDockId(dto.getDockId());
vo.setDockName(dto.getDockName());
vo.setManufacturerName(dto.getManufacturerName());
vo.setFirmwareVersion(dto.getFirmwareVersion());
vo.setSnNumber(dto.getSnNumber());
vo.setBindTime(dto.getBindTime());
vo.setMaintenanceDays(dto.getMaintenanceDays());
vo.setDockName(dto.getDockName());
vo.setDockStatus(dto.getDockStatus());
vo.setBackupLongitude(dto.getBackupLongitude());
vo.setBackupLatitude(dto.getBackupLatitude());
vo.setRunningDuration(dto.getRunningDuration());
vo.setMissionCount(dto.getMissionCount());
vo.setWindSpeed(dto.getWindSpeed());
vo.setRainfall(dto.getRainfall());
vo.setEnvironmentTemperature(dto.getEnvironmentTemperature());
vo.setEnvironmentHumidity(dto.getEnvironmentHumidity());
vo.setNetworkType(dto.getNetworkType());
vo.setNetworkDelay(dto.getNetworkDelay());
vo.setAirConditionerStatus(dto.getAirConditionerStatus());
vo.setCabinDoorStatus(dto.getCabinDoorStatus());
vo.setDockRunStatus(dto.getDockRunStatus());
vo.setInternalCamera(dto.getInternalCamera());
vo.setExternalCamera(dto.getExternalCamera());
vo.setChargingStatus(dto.getChargingStatus());
vo.setCabinTemperature(dto.getCabinTemperature());
vo.setCabinHumidity(dto.getCabinHumidity());
vo.setElevatorPosition(dto.getElevatorPosition());
vo.setXAxisClampStatus(dto.getXAxisClampStatus());
vo.setYAxisClampStatus(dto.getYAxisClampStatus());
return vo;
}
}

40
src/main/java/com/ruoyi/device/controller/convert/DockVOControllerConvert.java Normal file
View File

@ -0,0 +1,40 @@
package com.ruoyi.device.controller.convert;
import com.ruoyi.device.api.domain.DeviceTempVO;
import com.ruoyi.device.api.domain.DockVO;
import com.ruoyi.device.service.dto.DeviceTempDTO;
import com.ruoyi.device.service.dto.DockDetailDTO;
import org.springframework.beans.BeanUtils;
import java.util.List;
import java.util.stream.Collectors;
public class DockVOControllerConvert {
/**
* DTO 转 API Domain
*/
public static DockVO toVO(DockDetailDTO source)
{
if (source == null)
{
return null;
}
DockVO target = new DockVO();
BeanUtils.copyProperties(source, target);
return target;
}
/**
* DTO List 转 API Domain List
*/
public static List<DockVO> toVOList(List<DockDetailDTO> sources)
{
if (sources == null)
{
return null;
}
return sources.stream().map(DockVOControllerConvert::toVO).collect(Collectors.toList());
}
}

37
src/main/java/com/ruoyi/device/controller/convert/NetworkControllerConvert.java Normal file
View File

@ -0,0 +1,37 @@
package com.ruoyi.device.controller.convert;
import com.ruoyi.device.api.domain.NetworkVO;
import com.ruoyi.device.service.dto.NetworkDTO;
import java.util.List;
import java.util.stream.Collectors;
public class NetworkControllerConvert {
private static List<NetworkVO> toList(List<NetworkDTO> networkDTOList)
{
if (networkDTOList == null)
{
return null;
}
return networkDTOList.stream()
.map(NetworkControllerConvert::toVO)
.collect(Collectors.toList());
}
private static NetworkVO toVO(NetworkDTO dto)
{
if (dto == null)
{
return null;
}
NetworkVO vo = new NetworkVO();
vo.setNetworkType(dto.getNetworkType());
vo.setNetworkDelay(dto.getNetworkDelay());
return vo;
}
}

35
src/main/java/com/ruoyi/device/controller/convert/PlayloadControllerConvert.java Normal file
View File

@ -0,0 +1,35 @@
package com.ruoyi.device.controller.convert;
import com.ruoyi.device.api.domain.PayloadDetailVO;
import com.ruoyi.device.service.dto.PayloadDTO;
import org.springframework.beans.BeanUtils;
import java.util.List;
import java.util.stream.Collectors;
public class PlayloadControllerConvert {
public static List<PayloadDetailVO> toList(List<PayloadDTO> payloadDTOList)
{
if (payloadDTOList == null)
{
return null;
}
return payloadDTOList.stream()
.map(PlayloadControllerConvert::to)
.collect(Collectors.toList());
}
public static PayloadDetailVO to(PayloadDTO source)
{
if (source == null)
{
return null;
}
PayloadDetailVO target = new PayloadDetailVO();
BeanUtils.copyProperties(source, target);
return target;
}
}

4
src/main/java/com/ruoyi/device/domain/convert/AircraftDomainConvert.java → src/main/java/com/ruoyi/device/domain/convert/AircraftDomainEntityConvert.java
View File

@ -14,7 +14,7 @@ import java.util.stream.Collectors;
* @author ruoyi
* @date 2026-01-16
*/
public class AircraftDomainConvert
public class AircraftDomainEntityConvert
{
/**
* Entity 转 Model
@ -53,6 +53,6 @@ public class AircraftDomainConvert
{
return null;
}
return entityList.stream().map(AircraftDomainConvert::toModel).collect(Collectors.toList());
return entityList.stream().map(AircraftDomainEntityConvert::toModel).collect(Collectors.toList());
}
}

4
src/main/java/com/ruoyi/device/domain/convert/AircraftPayloadDomainConvert.java → src/main/java/com/ruoyi/device/domain/convert/AircraftPayloadDomainEntityConvert.java
View File

@ -14,7 +14,7 @@ import java.util.stream.Collectors;
* @author ruoyi
* @date 2026-01-16
*/
public class AircraftPayloadDomainConvert
public class AircraftPayloadDomainEntityConvert
{
/**
* Entity 转 Model
@ -53,6 +53,6 @@ public class AircraftPayloadDomainConvert
{
return null;
}
return entityList.stream().map(AircraftPayloadDomainConvert::toModel).collect(Collectors.toList());
return entityList.stream().map(AircraftPayloadDomainEntityConvert::toModel).collect(Collectors.toList());
}
}

4
src/main/java/com/ruoyi/device/domain/convert/DeviceDomainConvert.java → src/main/java/com/ruoyi/device/domain/convert/DeviceDomainEntityConvert.java
View File

@ -14,7 +14,7 @@ import java.util.stream.Collectors;
* @author ruoyi
* @date 2026-01-16
*/
public class DeviceDomainConvert
public class DeviceDomainEntityConvert
{
/**
* Entity 转 Model
@ -53,6 +53,6 @@ public class DeviceDomainConvert
{
return null;
}
return entityList.stream().map(DeviceDomainConvert::toModel).collect(Collectors.toList());
return entityList.stream().map(DeviceDomainEntityConvert::toModel).collect(Collectors.toList());
}
}

4
src/main/java/com/ruoyi/device/domain/convert/DeviceTempDomainConvert.java → src/main/java/com/ruoyi/device/domain/convert/DeviceTempDomainEntityConvert.java
View File

@ -14,7 +14,7 @@ import java.util.stream.Collectors;
* @author ruoyi
* @date 2026-01-15
*/
public class DeviceTempDomainConvert
public class DeviceTempDomainEntityConvert
{
/**
* Entity 转 Model
@ -53,6 +53,6 @@ public class DeviceTempDomainConvert
{
return null;
}
return entityList.stream().map(DeviceTempDomainConvert::toModel).collect(Collectors.toList());
return entityList.stream().map(DeviceTempDomainEntityConvert::toModel).collect(Collectors.toList());
}
}

4
src/main/java/com/ruoyi/device/domain/convert/DockAircraftDomainConvert.java → src/main/java/com/ruoyi/device/domain/convert/DockAircraftDomainEntityConvert.java
View File

@ -14,7 +14,7 @@ import java.util.stream.Collectors;
* @author ruoyi
* @date 2026-01-16
*/
public class DockAircraftDomainConvert
public class DockAircraftDomainEntityConvert
{
/**
* Entity 转 Model
@ -53,6 +53,6 @@ public class DockAircraftDomainConvert
{
return null;
}
return entityList.stream().map(DockAircraftDomainConvert::toModel).collect(Collectors.toList());
return entityList.stream().map(DockAircraftDomainEntityConvert::toModel).collect(Collectors.toList());
}
}

4
src/main/java/com/ruoyi/device/domain/convert/DockDomainConvert.java → src/main/java/com/ruoyi/device/domain/convert/DockDomainEntityConvert.java
View File

@ -14,7 +14,7 @@ import java.util.stream.Collectors;
* @author ruoyi
* @date 2026-01-16
*/
public class DockDomainConvert
public class DockDomainEntityConvert
{
/**
* Entity 转 Model
@ -53,6 +53,6 @@ public class DockDomainConvert
{
return null;
}
return entityList.stream().map(DockDomainConvert::toModel).collect(Collectors.toList());
return entityList.stream().map(DockDomainEntityConvert::toModel).collect(Collectors.toList());
}
}

4
src/main/java/com/ruoyi/device/domain/convert/DockGroupDomainConvert.java → src/main/java/com/ruoyi/device/domain/convert/DockGroupDomainEntityConvert.java
View File

@ -14,7 +14,7 @@ import java.util.stream.Collectors;
* @author ruoyi
* @date 2026-01-16
*/
public class DockGroupDomainConvert
public class DockGroupDomainEntityConvert
{
/**
* Entity 转 Model
@ -53,6 +53,6 @@ public class DockGroupDomainConvert
{
return null;
}
return entityList.stream().map(DockGroupDomainConvert::toModel).collect(Collectors.toList());
return entityList.stream().map(DockGroupDomainEntityConvert::toModel).collect(Collectors.toList());
}
}

4
src/main/java/com/ruoyi/device/domain/convert/GroupDomainConvert.java → src/main/java/com/ruoyi/device/domain/convert/GroupDomainEntityConvert.java
View File

@ -14,7 +14,7 @@ import java.util.stream.Collectors;
* @author ruoyi
* @date 2026-01-16
*/
public class GroupDomainConvert
public class GroupDomainEntityConvert
{
/**
* Entity 转 Model
@ -53,6 +53,6 @@ public class GroupDomainConvert
{
return null;
}
return entityList.stream().map(GroupDomainConvert::toModel).collect(Collectors.toList());
return entityList.stream().map(GroupDomainEntityConvert::toModel).collect(Collectors.toList());
}
}

4
src/main/java/com/ruoyi/device/domain/convert/PayloadDomainConvert.java → src/main/java/com/ruoyi/device/domain/convert/PayloadDomainEntityConvert.java
View File

@ -14,7 +14,7 @@ import java.util.stream.Collectors;
* @author ruoyi
* @date 2026-01-16
*/
public class PayloadDomainConvert
public class PayloadDomainEntityConvert
{
/**
* Entity 转 Model
@ -53,6 +53,6 @@ public class PayloadDomainConvert
{
return null;
}
return entityList.stream().map(PayloadDomainConvert::toModel).collect(Collectors.toList());
return entityList.stream().map(PayloadDomainEntityConvert::toModel).collect(Collectors.toList());
}
}

14
src/main/java/com/ruoyi/device/domain/impl/AircraftDomainImpl.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.device.domain.impl;
import com.ruoyi.device.domain.api.IAircraftDomain;
import com.ruoyi.device.domain.convert.AircraftDomainConvert;
import com.ruoyi.device.domain.convert.AircraftDomainEntityConvert;
import com.ruoyi.device.domain.model.Aircraft;
import com.ruoyi.device.mapper.AircraftMapper;
import com.ruoyi.device.mapper.entity.AircraftEntity;
@ -28,29 +28,29 @@ public class AircraftDomainImpl implements IAircraftDomain
@Override
public List<Aircraft> selectAircraftList(Aircraft aircraft)
{
AircraftEntity entity = AircraftDomainConvert.toEntity(aircraft);
AircraftEntity entity = AircraftDomainEntityConvert.toEntity(aircraft);
List<AircraftEntity> entityList = aircraftMapper.selectAircraftList(entity);
return AircraftDomainConvert.toModelList(entityList);
return AircraftDomainEntityConvert.toModelList(entityList);
}
@Override
public Aircraft selectAircraftByAircraftId(Long aircraftId)
{
AircraftEntity entity = aircraftMapper.selectAircraftByAircraftId(aircraftId);
return AircraftDomainConvert.toModel(entity);
return AircraftDomainEntityConvert.toModel(entity);
}
@Override
public Aircraft selectAircraftByDeviceId(Long deviceId)
{
AircraftEntity entity = aircraftMapper.selectAircraftByDeviceId(deviceId);
return AircraftDomainConvert.toModel(entity);
return AircraftDomainEntityConvert.toModel(entity);
}
@Override
public int insertAircraft(Aircraft aircraft)
{
AircraftEntity entity = AircraftDomainConvert.toEntity(aircraft);
AircraftEntity entity = AircraftDomainEntityConvert.toEntity(aircraft);
int result = aircraftMapper.insertAircraft(entity);
// MyBatis 会将自增主键回填到 entity 对象，需要同步回 aircraft 对象
aircraft.setAircraftId(entity.getAircraftId());
@ -60,7 +60,7 @@ public class AircraftDomainImpl implements IAircraftDomain
@Override
public int updateAircraft(Aircraft aircraft)
{
AircraftEntity entity = AircraftDomainConvert.toEntity(aircraft);
AircraftEntity entity = AircraftDomainEntityConvert.toEntity(aircraft);
return aircraftMapper.updateAircraft(entity);
}

18
src/main/java/com/ruoyi/device/domain/impl/AircraftPayloadDomainImpl.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.device.domain.impl;
import com.ruoyi.device.domain.api.IAircraftPayloadDomain;
import com.ruoyi.device.domain.convert.AircraftPayloadDomainConvert;
import com.ruoyi.device.domain.convert.AircraftPayloadDomainEntityConvert;
import com.ruoyi.device.domain.model.AircraftPayload;
import com.ruoyi.device.mapper.AircraftPayloadMapper;
import com.ruoyi.device.mapper.entity.AircraftPayloadEntity;
@ -28,43 +28,43 @@ public class AircraftPayloadDomainImpl implements IAircraftPayloadDomain
@Override
public List<AircraftPayload> selectAircraftPayloadList(AircraftPayload aircraftPayload)
{
AircraftPayloadEntity entity = AircraftPayloadDomainConvert.toEntity(aircraftPayload);
AircraftPayloadEntity entity = AircraftPayloadDomainEntityConvert.toEntity(aircraftPayload);
List<AircraftPayloadEntity> entityList = aircraftPayloadMapper.selectAircraftPayloadList(entity);
return AircraftPayloadDomainConvert.toModelList(entityList);
return AircraftPayloadDomainEntityConvert.toModelList(entityList);
}
@Override
public AircraftPayload selectAircraftPayloadById(Long id)
{
AircraftPayloadEntity entity = aircraftPayloadMapper.selectAircraftPayloadById(id);
return AircraftPayloadDomainConvert.toModel(entity);
return AircraftPayloadDomainEntityConvert.toModel(entity);
}
@Override
public List<AircraftPayload> selectAircraftPayloadByAircraftId(Long aircraftId)
{
List<AircraftPayloadEntity> entityList = aircraftPayloadMapper.selectAircraftPayloadListByAircraftId(aircraftId);
return AircraftPayloadDomainConvert.toModelList(entityList);
return AircraftPayloadDomainEntityConvert.toModelList(entityList);
}
@Override
public List<AircraftPayload> selectAircraftPayloadByPayloadId(Long payloadId)
{
List<AircraftPayloadEntity> entityList = aircraftPayloadMapper.selectAircraftPayloadListByPayloadId(payloadId);
return AircraftPayloadDomainConvert.toModelList(entityList);
return AircraftPayloadDomainEntityConvert.toModelList(entityList);
}
@Override
public List<AircraftPayload> selectAircraftPayloadByDockId(Long dockId)
{
List<AircraftPayloadEntity> entityList = aircraftPayloadMapper.selectAircraftPayloadListByDockId(dockId);
return AircraftPayloadDomainConvert.toModelList(entityList);
return AircraftPayloadDomainEntityConvert.toModelList(entityList);
}
@Override
public int insertAircraftPayload(AircraftPayload aircraftPayload)
{
AircraftPayloadEntity entity = AircraftPayloadDomainConvert.toEntity(aircraftPayload);
AircraftPayloadEntity entity = AircraftPayloadDomainEntityConvert.toEntity(aircraftPayload);
int result = aircraftPayloadMapper.insertAircraftPayload(entity);
// MyBatis 会将自增主键回填到 entity 对象，需要同步回 aircraftPayload 对象
aircraftPayload.setId(entity.getId());
@ -74,7 +74,7 @@ public class AircraftPayloadDomainImpl implements IAircraftPayloadDomain
@Override
public int updateAircraftPayload(AircraftPayload aircraftPayload)
{
AircraftPayloadEntity entity = AircraftPayloadDomainConvert.toEntity(aircraftPayload);
AircraftPayloadEntity entity = AircraftPayloadDomainEntityConvert.toEntity(aircraftPayload);
return aircraftPayloadMapper.updateAircraftPayload(entity);
}

14
src/main/java/com/ruoyi/device/domain/impl/DeviceDomainImpl.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.device.domain.impl;
import com.ruoyi.device.domain.api.IDeviceDomain;
import com.ruoyi.device.domain.convert.DeviceDomainConvert;
import com.ruoyi.device.domain.convert.DeviceDomainEntityConvert;
import com.ruoyi.device.domain.model.Device;
import com.ruoyi.device.mapper.DeviceMapper;
import com.ruoyi.device.mapper.entity.DeviceEntity;
@ -28,29 +28,29 @@ public class DeviceDomainImpl implements IDeviceDomain
@Override
public List<Device> selectDeviceList(Device device)
{
DeviceEntity entity = DeviceDomainConvert.toEntity(device);
DeviceEntity entity = DeviceDomainEntityConvert.toEntity(device);
List<DeviceEntity> entityList = deviceMapper.selectDeviceList(entity);
return DeviceDomainConvert.toModelList(entityList);
return DeviceDomainEntityConvert.toModelList(entityList);
}
@Override
public Device selectDeviceByDeviceId(Long deviceId)
{
DeviceEntity entity = deviceMapper.selectDeviceByDeviceId(deviceId);
return DeviceDomainConvert.toModel(entity);
return DeviceDomainEntityConvert.toModel(entity);
}
@Override
public Device selectDeviceByIotDeviceId(String iotDeviceId)
{
DeviceEntity entity = deviceMapper.selectDeviceByIotDeviceId(iotDeviceId);
return DeviceDomainConvert.toModel(entity);
return DeviceDomainEntityConvert.toModel(entity);
}
@Override
public int insertDevice(Device device)
{
DeviceEntity entity = DeviceDomainConvert.toEntity(device);
DeviceEntity entity = DeviceDomainEntityConvert.toEntity(device);
int result = deviceMapper.insertDevice(entity);
// MyBatis 会将自增主键回填到 entity 对象，需要同步回 device 对象
device.setDeviceId(entity.getDeviceId());
@ -60,7 +60,7 @@ public class DeviceDomainImpl implements IDeviceDomain
@Override
public int updateDevice(Device device)
{
DeviceEntity entity = DeviceDomainConvert.toEntity(device);
DeviceEntity entity = DeviceDomainEntityConvert.toEntity(device);
return deviceMapper.updateDevice(entity);
}

8
src/main/java/com/ruoyi/device/domain/impl/DeviceTempDomainImpl.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.device.domain.impl;
import com.ruoyi.device.domain.api.IDeviceTempDomain;
import com.ruoyi.device.domain.convert.DeviceTempDomainConvert;
import com.ruoyi.device.domain.convert.DeviceTempDomainEntityConvert;
import com.ruoyi.device.domain.model.DeviceTemp;
import com.ruoyi.device.mapper.DeviceTempMapper;
import com.ruoyi.device.mapper.entity.DeviceTempEntity;
@ -25,15 +25,15 @@ public class DeviceTempDomainImpl implements IDeviceTempDomain
@Override
public List<DeviceTemp> selectDeviceTempList(DeviceTemp deviceTempModel)
{
DeviceTempEntity entity = DeviceTempDomainConvert.toEntity(deviceTempModel);
DeviceTempEntity entity = DeviceTempDomainEntityConvert.toEntity(deviceTempModel);
List<DeviceTempEntity> entityList = deviceTempMapper.selectDeviceTempList(entity);
return DeviceTempDomainConvert.toModelList(entityList);
return DeviceTempDomainEntityConvert.toModelList(entityList);
}
@Override
public DeviceTemp selectDeviceTempById(String id)
{
DeviceTempEntity entity = deviceTempMapper.selectDeviceTempById(id);
return DeviceTempDomainConvert.toModel(entity);
return DeviceTempDomainEntityConvert.toModel(entity);
}
}

16
src/main/java/com/ruoyi/device/domain/impl/DockAircraftDomainImpl.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.device.domain.impl;
import com.ruoyi.device.domain.api.IDockAircraftDomain;
import com.ruoyi.device.domain.convert.DockAircraftDomainConvert;
import com.ruoyi.device.domain.convert.DockAircraftDomainEntityConvert;
import com.ruoyi.device.domain.model.DockAircraft;
import com.ruoyi.device.mapper.DockAircraftMapper;
import com.ruoyi.device.mapper.entity.DockAircraftEntity;
@ -28,36 +28,36 @@ public class DockAircraftDomainImpl implements IDockAircraftDomain
@Override
public List<DockAircraft> selectDockAircraftList(DockAircraft dockAircraft)
{
DockAircraftEntity entity = DockAircraftDomainConvert.toEntity(dockAircraft);
DockAircraftEntity entity = DockAircraftDomainEntityConvert.toEntity(dockAircraft);
List<DockAircraftEntity> entityList = dockAircraftMapper.selectDockAircraftList(entity);
return DockAircraftDomainConvert.toModelList(entityList);
return DockAircraftDomainEntityConvert.toModelList(entityList);
}
@Override
public DockAircraft selectDockAircraftById(Long id)
{
DockAircraftEntity entity = dockAircraftMapper.selectDockAircraftById(id);
return DockAircraftDomainConvert.toModel(entity);
return DockAircraftDomainEntityConvert.toModel(entity);
}
@Override
public List<DockAircraft> selectDockAircraftByDockId(Long dockId)
{
List<DockAircraftEntity> entityList = dockAircraftMapper.selectDockAircraftListByDockId(dockId);
return DockAircraftDomainConvert.toModelList(entityList);
return DockAircraftDomainEntityConvert.toModelList(entityList);
}
@Override
public List<DockAircraft> selectDockAircraftByAircraftId(Long aircraftId)
{
List<DockAircraftEntity> entityList = dockAircraftMapper.selectDockAircraftListByAircraftId(aircraftId);
return DockAircraftDomainConvert.toModelList(entityList);
return DockAircraftDomainEntityConvert.toModelList(entityList);
}
@Override
public int insertDockAircraft(DockAircraft dockAircraft)
{
DockAircraftEntity entity = DockAircraftDomainConvert.toEntity(dockAircraft);
DockAircraftEntity entity = DockAircraftDomainEntityConvert.toEntity(dockAircraft);
int result = dockAircraftMapper.insertDockAircraft(entity);
// MyBatis 会将自增主键回填到 entity 对象，需要同步回 dockAircraft 对象
dockAircraft.setId(entity.getId());
@ -67,7 +67,7 @@ public class DockAircraftDomainImpl implements IDockAircraftDomain
@Override
public int updateDockAircraft(DockAircraft dockAircraft)
{
DockAircraftEntity entity = DockAircraftDomainConvert.toEntity(dockAircraft);
DockAircraftEntity entity = DockAircraftDomainEntityConvert.toEntity(dockAircraft);
return dockAircraftMapper.updateDockAircraft(entity);
}

14
src/main/java/com/ruoyi/device/domain/impl/DockDomainImpl.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.device.domain.impl;
import com.ruoyi.device.domain.api.IDockDomain;
import com.ruoyi.device.domain.convert.DockDomainConvert;
import com.ruoyi.device.domain.convert.DockDomainEntityConvert;
import com.ruoyi.device.domain.model.Dock;
import com.ruoyi.device.mapper.DockMapper;
import com.ruoyi.device.mapper.entity.DockEntity;
@ -28,29 +28,29 @@ public class DockDomainImpl implements IDockDomain
@Override
public List<Dock> selectDockList(Dock dock)
{
DockEntity entity = DockDomainConvert.toEntity(dock);
DockEntity entity = DockDomainEntityConvert.toEntity(dock);
List<DockEntity> entityList = dockMapper.selectDockList(entity);
return DockDomainConvert.toModelList(entityList);
return DockDomainEntityConvert.toModelList(entityList);
}
@Override
public Dock selectDockByDockId(Long dockId)
{
DockEntity entity = dockMapper.selectDockByDockId(dockId);
return DockDomainConvert.toModel(entity);
return DockDomainEntityConvert.toModel(entity);
}
@Override
public Dock selectDockByDeviceId(Long deviceId)
{
DockEntity entity = dockMapper.selectDockByDeviceId(deviceId);
return DockDomainConvert.toModel(entity);
return DockDomainEntityConvert.toModel(entity);
}
@Override
public int insertDock(Dock dock)
{
DockEntity entity = DockDomainConvert.toEntity(dock);
DockEntity entity = DockDomainEntityConvert.toEntity(dock);
int result = dockMapper.insertDock(entity);
// MyBatis 会将自增主键回填到 entity 对象，需要同步回 dock 对象
dock.setDockId(entity.getDockId());
@ -60,7 +60,7 @@ public class DockDomainImpl implements IDockDomain
@Override
public int updateDock(Dock dock)
{
DockEntity entity = DockDomainConvert.toEntity(dock);
DockEntity entity = DockDomainEntityConvert.toEntity(dock);
return dockMapper.updateDock(entity);
}

16
src/main/java/com/ruoyi/device/domain/impl/DockGroupDomainImpl.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.device.domain.impl;
import com.ruoyi.device.domain.api.IDockGroupDomain;
import com.ruoyi.device.domain.convert.DockGroupDomainConvert;
import com.ruoyi.device.domain.convert.DockGroupDomainEntityConvert;
import com.ruoyi.device.domain.model.DockGroup;
import com.ruoyi.device.mapper.DockGroupMapper;
import com.ruoyi.device.mapper.entity.DockGroupEntity;
@ -28,36 +28,36 @@ public class DockGroupDomainImpl implements IDockGroupDomain
@Override
public List<DockGroup> selectDockGroupList(DockGroup dockGroup)
{
DockGroupEntity entity = DockGroupDomainConvert.toEntity(dockGroup);
DockGroupEntity entity = DockGroupDomainEntityConvert.toEntity(dockGroup);
List<DockGroupEntity> entityList = dockGroupMapper.selectDockGroupList(entity);
return DockGroupDomainConvert.toModelList(entityList);
return DockGroupDomainEntityConvert.toModelList(entityList);
}
@Override
public DockGroup selectDockGroupById(Long id)
{
DockGroupEntity entity = dockGroupMapper.selectDockGroupById(id);
return DockGroupDomainConvert.toModel(entity);
return DockGroupDomainEntityConvert.toModel(entity);
}
@Override
public List<DockGroup> selectDockGroupByDockId(Long dockId)
{
List<DockGroupEntity> entityList = dockGroupMapper.selectDockGroupListByDockId(dockId);
return DockGroupDomainConvert.toModelList(entityList);
return DockGroupDomainEntityConvert.toModelList(entityList);
}
@Override
public List<DockGroup> selectDockGroupByGroupId(Long groupId)
{
List<DockGroupEntity> entityList = dockGroupMapper.selectDockGroupListByGroupId(groupId);
return DockGroupDomainConvert.toModelList(entityList);
return DockGroupDomainEntityConvert.toModelList(entityList);
}
@Override
public int insertDockGroup(DockGroup dockGroup)
{
DockGroupEntity entity = DockGroupDomainConvert.toEntity(dockGroup);
DockGroupEntity entity = DockGroupDomainEntityConvert.toEntity(dockGroup);
int result = dockGroupMapper.insertDockGroup(entity);
// MyBatis 会将自增主键回填到 entity 对象，需要同步回 dockGroup 对象
dockGroup.setId(entity.getId());
@ -67,7 +67,7 @@ public class DockGroupDomainImpl implements IDockGroupDomain
@Override
public int updateDockGroup(DockGroup dockGroup)
{
DockGroupEntity entity = DockGroupDomainConvert.toEntity(dockGroup);
DockGroupEntity entity = DockGroupDomainEntityConvert.toEntity(dockGroup);
return dockGroupMapper.updateDockGroup(entity);
}

12
src/main/java/com/ruoyi/device/domain/impl/GroupDomainImpl.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.device.domain.impl;
import com.ruoyi.device.domain.api.IGroupDomain;
import com.ruoyi.device.domain.convert.GroupDomainConvert;
import com.ruoyi.device.domain.convert.GroupDomainEntityConvert;
import com.ruoyi.device.domain.model.Group;
import com.ruoyi.device.mapper.GroupMapper;
import com.ruoyi.device.mapper.entity.GroupEntity;
@ -28,22 +28,22 @@ public class GroupDomainImpl implements IGroupDomain
@Override
public List<Group> selectGroupList(Group group)
{
GroupEntity entity = GroupDomainConvert.toEntity(group);
GroupEntity entity = GroupDomainEntityConvert.toEntity(group);
List<GroupEntity> entityList = groupMapper.selectGroupList(entity);
return GroupDomainConvert.toModelList(entityList);
return GroupDomainEntityConvert.toModelList(entityList);
}
@Override
public Group selectGroupByGroupId(Long groupId)
{
GroupEntity entity = groupMapper.selectGroupByGroupId(groupId);
return GroupDomainConvert.toModel(entity);
return GroupDomainEntityConvert.toModel(entity);
}
@Override
public int insertGroup(Group group)
{
GroupEntity entity = GroupDomainConvert.toEntity(group);
GroupEntity entity = GroupDomainEntityConvert.toEntity(group);
int result = groupMapper.insertGroup(entity);
// MyBatis 会将自增主键回填到 entity 对象，需要同步回 group 对象
group.setGroupId(entity.getGroupId());
@ -53,7 +53,7 @@ public class GroupDomainImpl implements IGroupDomain
@Override
public int updateGroup(Group group)
{
GroupEntity entity = GroupDomainConvert.toEntity(group);
GroupEntity entity = GroupDomainEntityConvert.toEntity(group);
return groupMapper.updateGroup(entity);
}

12
src/main/java/com/ruoyi/device/domain/impl/PayloadDomainImpl.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.device.domain.impl;
import com.ruoyi.device.domain.api.IPayloadDomain;
import com.ruoyi.device.domain.convert.PayloadDomainConvert;
import com.ruoyi.device.domain.convert.PayloadDomainEntityConvert;
import com.ruoyi.device.domain.model.Payload;
import com.ruoyi.device.mapper.PayloadMapper;
import com.ruoyi.device.mapper.entity.PayloadEntity;
@ -28,22 +28,22 @@ public class PayloadDomainImpl implements IPayloadDomain
@Override
public List<Payload> selectPayloadList(Payload payload)
{
PayloadEntity entity = PayloadDomainConvert.toEntity(payload);
PayloadEntity entity = PayloadDomainEntityConvert.toEntity(payload);
List<PayloadEntity> entityList = payloadMapper.selectPayloadList(entity);
return PayloadDomainConvert.toModelList(entityList);
return PayloadDomainEntityConvert.toModelList(entityList);
}
@Override
public Payload selectPayloadByPayloadId(Long payloadId)
{
PayloadEntity entity = payloadMapper.selectPayloadByPayloadId(payloadId);
return PayloadDomainConvert.toModel(entity);
return PayloadDomainEntityConvert.toModel(entity);
}
@Override
public int insertPayload(Payload payload)
{
PayloadEntity entity = PayloadDomainConvert.toEntity(payload);
PayloadEntity entity = PayloadDomainEntityConvert.toEntity(payload);
int result = payloadMapper.insertPayload(entity);
// MyBatis 会将自增主键回填到 entity 对象，需要同步回 payload 对象
payload.setPayloadId(entity.getPayloadId());
@ -53,7 +53,7 @@ public class PayloadDomainImpl implements IPayloadDomain
@Override
public int updatePayload(Payload payload)
{
PayloadEntity entity = PayloadDomainConvert.toEntity(payload);
PayloadEntity entity = PayloadDomainEntityConvert.toEntity(payload);
return payloadMapper.updatePayload(entity);
}

3
src/main/java/com/ruoyi/device/service/api/IGroupService.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.device.service.api;
import com.ruoyi.device.api.domain.GroupVO;
import com.ruoyi.device.service.dto.DockGroupDTO;
import com.ruoyi.device.service.dto.GroupDTO;
import com.ruoyi.device.service.dto.DockDTO;
import java.util.List;
@ -90,7 +91,7 @@ public interface IGroupService
* @param groupId 分组ID
* @return 机场列表
*/
List<DockDTO> getDocksByGroupId(Long groupId);
List<DockGroupDTO> getDocksByGroupId(Long groupId);
/**
* 查看所有分组

153
src/main/java/com/ruoyi/device/service/convert/BufferDeviceConvert.java
View File

@ -1,153 +0,0 @@
package com.ruoyi.device.service.convert;
import com.ruoyi.device.api.domain.AircraftDetailVO;
import com.ruoyi.device.api.domain.DockDetailVO;
import com.ruoyi.device.api.domain.NetworkVO;
import com.ruoyi.device.api.domain.PayloadDetailVO;
import com.ruoyi.device.api.domain.PayloadVO;
import com.ruoyi.device.service.dto.AircraftDetailDTO;
import com.ruoyi.device.service.dto.DockDetailDTO;
import com.ruoyi.device.service.dto.NetworkDTO;
import com.ruoyi.device.service.dto.PayloadDTO;
import java.util.List;
import java.util.stream.Collectors;
/**
* 设备缓冲服务转换类
* 用于 DTO 到 VO 的转换
*
* @author ruoyi
* @date 2026-01-20
*/
public class BufferDeviceConvert
{
public static DockDetailVO toVO(DockDetailDTO dto)
{
if (dto == null)
{
return null;
}
DockDetailVO vo = new DockDetailVO();
vo.setDockId(dto.getDockId());
vo.setDockName(dto.getDockName());
vo.setManufacturerName(dto.getManufacturerName());
vo.setFirmwareVersion(dto.getFirmwareVersion());
vo.setSnNumber(dto.getSnNumber());
vo.setBindTime(dto.getBindTime());
vo.setMaintenanceDays(dto.getMaintenanceDays());
vo.setDockName(dto.getDockName());
vo.setDockStatus(dto.getDockStatus());
vo.setBackupLongitude(dto.getBackupLongitude());
vo.setBackupLatitude(dto.getBackupLatitude());
vo.setRunningDuration(dto.getRunningDuration());
vo.setMissionCount(dto.getMissionCount());
vo.setWindSpeed(dto.getWindSpeed());
vo.setRainfall(dto.getRainfall());
vo.setEnvironmentTemperature(dto.getEnvironmentTemperature());
vo.setEnvironmentHumidity(dto.getEnvironmentHumidity());
vo.setNetworkType(dto.getNetworkType());
vo.setNetworkDelay(dto.getNetworkDelay());
vo.setAirConditionerStatus(dto.getAirConditionerStatus());
vo.setCabinDoorStatus(dto.getCabinDoorStatus());
vo.setDockRunStatus(dto.getDockRunStatus());
vo.setInternalCamera(dto.getInternalCamera());
vo.setExternalCamera(dto.getExternalCamera());
vo.setChargingStatus(dto.getChargingStatus());
vo.setCabinTemperature(dto.getCabinTemperature());
vo.setCabinHumidity(dto.getCabinHumidity());
vo.setElevatorPosition(dto.getElevatorPosition());
vo.setXAxisClampStatus(dto.getXAxisClampStatus());
vo.setYAxisClampStatus(dto.getYAxisClampStatus());
return vo;
}
public static AircraftDetailVO toVO(AircraftDetailDTO dto)
{
if (dto == null)
{
return null;
}
AircraftDetailVO vo = new AircraftDetailVO();
vo.setAircraftId(dto.getAircraftId());
vo.setAircraftName(dto.getAircraftName());
vo.setManufacturerName(dto.getManufacturerName());
vo.setAircraftVersion(dto.getAircraftVersion());
vo.setSnNumber(dto.getSnNumber());
vo.setBatterySn(dto.getBatterySn());
vo.setBindTime(dto.getBindTime());
vo.setMaintenanceDays(dto.getMaintenanceDays());
vo.setFlightDuration(dto.getFlightDuration());
vo.setMissionCount(dto.getMissionCount());
vo.setNetworkList(convertNetworkList(dto.getNetworkList()));
vo.setRtkSignal(dto.getRtkSignal());
vo.setMaxAltitude(dto.getMaxAltitude());
vo.setMaxDistance(dto.getMaxDistance());
vo.setVoltage(dto.getVoltage());
vo.setBatteryLevel(dto.getBatteryLevel());
vo.setFlightTimeRemaining(dto.getFlightTimeRemaining());
vo.setBatteryTemperature(dto.getBatteryTemperature());
vo.setCycleCount(dto.getCycleCount());
vo.setPayloadList(convertPayloadList(dto.getPayloadList()));
return vo;
}
private static List<NetworkVO> convertNetworkList(List<NetworkDTO> networkDTOList)
{
if (networkDTOList == null)
{
return null;
}
return networkDTOList.stream()
.map(BufferDeviceConvert::toVO)
.collect(Collectors.toList());
}
private static NetworkVO toVO(NetworkDTO dto)
{
if (dto == null)
{
return null;
}
NetworkVO vo = new NetworkVO();
vo.setNetworkType(dto.getNetworkType());
vo.setNetworkDelay(dto.getNetworkDelay());
return vo;
}
private static List<PayloadDetailVO> convertPayloadList(List<PayloadDTO> payloadDTOList)
{
if (payloadDTOList == null)
{
return null;
}
return payloadDTOList.stream()
.map(BufferDeviceConvert::toPayloadDetailVO)
.collect(Collectors.toList());
}
private static PayloadDetailVO toPayloadDetailVO(PayloadDTO dto)
{
if (dto == null)
{
return null;
}
PayloadDetailVO vo = new PayloadDetailVO();
vo.setPayloadType(dto.getPayloadType());
vo.setPayloadModel(dto.getPayloadType());
vo.setFirmwareVersion(dto.getPayloadType());
return vo;
}
}

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

@ -1,8 +1,10 @@
package com.ruoyi.device.service.impl;
import com.ruoyi.device.domain.api.IDeviceDomain;
import com.ruoyi.device.domain.api.IDockDomain;
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.Aircraft;
import com.ruoyi.device.domain.model.thingsboard.AttributeMap;
@ -13,18 +15,16 @@ import com.ruoyi.device.domain.model.thingsboard.constants.DeviceTelemetry;
import com.ruoyi.device.domain.model.thingsboard.attributes.battery.BatteryData;
import com.ruoyi.device.domain.model.thingsboard.attributes.psdk.PsdkDevice;
import com.ruoyi.device.service.api.IBufferDeviceService;
import com.ruoyi.device.service.api.IDeviceService;
import com.ruoyi.device.service.dto.AircraftDTO;
import com.ruoyi.device.service.dto.DockDTO;
import com.ruoyi.device.service.dto.AircraftDetailDTO;
import com.ruoyi.device.service.dto.DockDetailDTO;
import com.ruoyi.device.service.dto.NetworkDTO;
import com.ruoyi.device.service.dto.PayloadDTO;
import com.ruoyi.device.service.convert.DockServiceConvert;
import com.ruoyi.device.service.convert.AircraftServiceConvert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@ -41,6 +41,9 @@ public class BufferDeviceImpl implements IBufferDeviceService
@Autowired
private IDockDomain dockDomain;
@Autowired
private IDeviceDomain deviceDomain;
@Autowired
private IAircraftDomain aircraftDomain;
@ -55,19 +58,15 @@ public class BufferDeviceImpl implements IBufferDeviceService
{
return null;
}
DockDTO dockDTO = DockServiceConvert.toDTO(dock);
Device device = deviceDomain.selectDeviceByDeviceId(dock.getDeviceId());
DockDetailDTO result = new DockDetailDTO();
result.setDockId(dock.getDockId());
result.setDockName(dock.getDockName());
result.setDockLocation(dock.getDockLocation());
result.setDockId(dockDTO.getDockId());
result.setDockName(dockDTO.getDockName());
result.setDockLocation(dockDTO.getDockLocation());
ThingsBoardData thingsBoardData = getThingsBoardData("dock", device.getIotDeviceId());
ThingsBoardData thingsBoardData = getThingsBoardData("dock", null);
if (thingsBoardData != null)
{
result.setFirmwareVersion(thingsBoardData.getFirmwareVersion());
result.setSnNumber(thingsBoardData.getSnNumber());
result.setBindTime(thingsBoardData.getBindTime());
@ -95,7 +94,6 @@ public class BufferDeviceImpl implements IBufferDeviceService
result.setElevatorPosition(thingsBoardData.getElevatorPosition());
result.setXAxisClampStatus(thingsBoardData.getXAxisClampStatus());
result.setYAxisClampStatus(thingsBoardData.getYAxisClampStatus());
}
return result;
}

11
src/main/java/com/ruoyi/device/service/impl/GroupServiceImpl.java
View File

@ -9,13 +9,16 @@ import com.ruoyi.device.domain.model.DockGroup;
import com.ruoyi.device.domain.model.Group;
import com.ruoyi.device.domain.model.Dock;
import com.ruoyi.device.service.api.IGroupService;
import com.ruoyi.device.service.convert.DockGroupServiceConvert;
import com.ruoyi.device.service.convert.GroupServiceConvert;
import com.ruoyi.device.service.dto.DockGroupDTO;
import com.ruoyi.device.service.dto.GroupDTO;
import com.ruoyi.device.service.dto.DockDTO;
import com.ruoyi.device.service.convert.DockServiceConvert;
import com.ruoyi.device.api.domain.DockDetailVO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -117,7 +120,7 @@ public class GroupServiceImpl implements IGroupService
}
@Override
public List<DockDTO> getDocksByGroupId(Long groupId)
public List<DockGroupDTO> getDocksByGroupId(Long groupId)
{
DockGroup dockGroupQuery = new DockGroup();
dockGroupQuery.setGroupId(groupId);
@ -127,12 +130,8 @@ public class GroupServiceImpl implements IGroupService
{
return List.of();
}
return DockGroupServiceConvert.toDTOList(dockGroupList);
return dockGroupList.stream()
.map(DockGroup::getDockId)
.map(dockDomain::selectDockByDockId)
.map(DockServiceConvert::toDTO)
.collect(Collectors.toList());
}
@Override