diff --git a/pom.xml b/pom.xml index 554ebb4..189db52 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,13 @@ - + + + + com.ruoyi + tuoheng-api-device + + com.alibaba.cloud diff --git a/src/main/java/com/ruoyi/device/controller/DeviceTempController.java b/src/main/java/com/ruoyi/device/controller/DeviceTempController.java index f7539de..482cc40 100644 --- a/src/main/java/com/ruoyi/device/controller/DeviceTempController.java +++ b/src/main/java/com/ruoyi/device/controller/DeviceTempController.java @@ -1,10 +1,14 @@ package com.ruoyi.device.controller; +import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.device.domain.DeviceTemp; +import com.ruoyi.common.security.annotation.InnerAuth; +import com.ruoyi.device.api.domain.DeviceTemp; +import com.ruoyi.device.domain.vo.DeviceTempVO; import com.ruoyi.device.service.IDeviceTempService; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -12,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.stream.Collectors; /** * 设备临时表Controller @@ -34,15 +39,45 @@ public class DeviceTempController extends BaseController { startPage(); List list = deviceTempService.selectDeviceTempList(deviceTemp); - return getDataTable(list); + // 将 Domain 转换为 VO + List voList = list.stream().map(this::convertToVO).collect(Collectors.toList()); + return getDataTable(voList); } /** - * 获取设备临时表详细信息 + * 获取设备临时表详细信息(内部调用) */ + @InnerAuth @GetMapping(value = "/{id}") + public R getDeviceById(@PathVariable("id") String id) + { + DeviceTemp deviceTemp = deviceTempService.selectDeviceTempById(id); + return R.ok(deviceTemp); + } + + /** + * 获取设备临时表详细信息(外部调用,返回VO) + */ + @GetMapping(value = "/info/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { - return success(deviceTempService.selectDeviceTempById(id)); + DeviceTemp deviceTemp = deviceTempService.selectDeviceTempById(id); + // 将 Domain 转换为 VO + DeviceTempVO vo = convertToVO(deviceTemp); + return success(vo); + } + + /** + * 将 Domain 实体转换为 VO + */ + private DeviceTempVO convertToVO(DeviceTemp deviceTemp) + { + if (deviceTemp == null) + { + return null; + } + DeviceTempVO vo = new DeviceTempVO(); + BeanUtils.copyProperties(deviceTemp, vo); + return vo; } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/domain/DeviceTemp.java b/src/main/java/com/ruoyi/device/domain/DeviceTemp.java deleted file mode 100644 index 6aebc53..0000000 --- a/src/main/java/com/ruoyi/device/domain/DeviceTemp.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.ruoyi.device.domain; - -import com.ruoyi.common.core.web.domain.BaseEntity; - -/** - * 设备临时表对象 tuoheng_device_temp - * - * @author ruoyi - * @date 2026-01-15 - */ -public class DeviceTemp extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 主键ID */ - private String id; - - public String getId() - { - return id; - } - - public void setId(String id) - { - this.id = id; - } - - @Override - public String toString() - { - return "DeviceTemp{" + - "id='" + id + '\'' + - '}'; - } -} \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/domain/vo/DeviceTempVO.java b/src/main/java/com/ruoyi/device/domain/vo/DeviceTempVO.java new file mode 100644 index 0000000..f61da4c --- /dev/null +++ b/src/main/java/com/ruoyi/device/domain/vo/DeviceTempVO.java @@ -0,0 +1,68 @@ +package com.ruoyi.device.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * 设备临时表视图对象 DeviceTempVO + * + * @author ruoyi + * @date 2026-01-15 + */ +public class DeviceTempVO implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private String id; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + public String getId() + { + return id; + } + + public void setId(String id) + { + this.id = id; + } + + public Date getCreateTime() + { + return createTime; + } + + public void setCreateTime(Date createTime) + { + this.createTime = createTime; + } + + public Date getUpdateTime() + { + return updateTime; + } + + public void setUpdateTime(Date updateTime) + { + this.updateTime = updateTime; + } + + @Override + public String toString() + { + return "DeviceTempVO{" + + "id='" + id + '\'' + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + '}'; + } +} diff --git a/src/main/java/com/ruoyi/device/mapper/DeviceTempMapper.java b/src/main/java/com/ruoyi/device/mapper/DeviceTempMapper.java index c6e72cc..d12ba83 100644 --- a/src/main/java/com/ruoyi/device/mapper/DeviceTempMapper.java +++ b/src/main/java/com/ruoyi/device/mapper/DeviceTempMapper.java @@ -1,6 +1,6 @@ package com.ruoyi.device.mapper; -import com.ruoyi.device.domain.DeviceTemp; +import com.ruoyi.device.api.domain.DeviceTemp; import java.util.List; /** diff --git a/src/main/java/com/ruoyi/device/service/IDeviceTempService.java b/src/main/java/com/ruoyi/device/service/IDeviceTempService.java index 8dc2e29..71fc531 100644 --- a/src/main/java/com/ruoyi/device/service/IDeviceTempService.java +++ b/src/main/java/com/ruoyi/device/service/IDeviceTempService.java @@ -1,6 +1,6 @@ package com.ruoyi.device.service; -import com.ruoyi.device.domain.DeviceTemp; +import com.ruoyi.device.api.domain.DeviceTemp; import java.util.List; /** diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceTempServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceTempServiceImpl.java index 80e7170..d5bdade 100644 --- a/src/main/java/com/ruoyi/device/service/impl/DeviceTempServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/DeviceTempServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.device.service.impl; -import com.ruoyi.device.domain.DeviceTemp; +import com.ruoyi.device.api.domain.DeviceTemp; import com.ruoyi.device.mapper.DeviceTempMapper; import com.ruoyi.device.service.IDeviceTempService; import org.springframework.beans.factory.annotation.Autowired;