From 34f86b6329107e94299931608e31fdaa71193621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 15 Jan 2026 19:14:11 +0800 Subject: [PATCH] x --- .../ruoyi/device/controller/DeviceTempController.java | 10 +++++----- ...mpConvert.java => DeviceTempControllerConvert.java} | 4 ++-- ...ceTempConvert.java => DeviceTempDomainConvert.java} | 4 ++-- .../ruoyi/device/domain/impl/DeviceTempDomainImpl.java | 8 ++++---- ...eTempConvert.java => DeviceTempServiceConvert.java} | 4 ++-- .../device/service/impl/DeviceTempServiceImpl.java | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) rename src/main/java/com/ruoyi/device/controller/convert/{DeviceTempConvert.java => DeviceTempControllerConvert.java} (89%) rename src/main/java/com/ruoyi/device/domain/convert/{DeviceTempConvert.java => DeviceTempDomainConvert.java} (89%) rename src/main/java/com/ruoyi/device/service/convert/{DeviceTempConvert.java => DeviceTempServiceConvert.java} (89%) diff --git a/src/main/java/com/ruoyi/device/controller/DeviceTempController.java b/src/main/java/com/ruoyi/device/controller/DeviceTempController.java index f7621e9..ee8cb11 100644 --- a/src/main/java/com/ruoyi/device/controller/DeviceTempController.java +++ b/src/main/java/com/ruoyi/device/controller/DeviceTempController.java @@ -6,7 +6,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.common.security.annotation.InnerAuth; import com.ruoyi.device.api.domain.DeviceTempVO; -import com.ruoyi.device.controller.convert.DeviceTempConvert; +import com.ruoyi.device.controller.convert.DeviceTempControllerConvert; import com.ruoyi.device.service.api.IDeviceTempService; import com.ruoyi.device.service.dto.DeviceTempDTO; import org.springframework.beans.factory.annotation.Autowired; @@ -38,10 +38,10 @@ public class DeviceTempController extends BaseController { startPage(); // API Domain → Service DTO - DeviceTempDTO dto = DeviceTempConvert.toDTO(deviceTemp); + DeviceTempDTO dto = DeviceTempControllerConvert.toDTO(deviceTemp); List dtoList = deviceTempService.selectDeviceTempList(dto); // Service DTO → API Domain - List list = DeviceTempConvert.toApiDomainList(dtoList); + List list = DeviceTempControllerConvert.toApiDomainList(dtoList); return getDataTable(list); } @@ -53,7 +53,7 @@ public class DeviceTempController extends BaseController public R getDeviceById(@PathVariable("id") String id) { DeviceTempDTO dto = deviceTempService.selectDeviceTempById(id); - DeviceTempVO deviceTemp = DeviceTempConvert.toVO(dto); + DeviceTempVO deviceTemp = DeviceTempControllerConvert.toVO(dto); return R.ok(deviceTemp); } @@ -64,7 +64,7 @@ public class DeviceTempController extends BaseController public AjaxResult getInfo(@PathVariable("id") String id) { DeviceTempDTO dto = deviceTempService.selectDeviceTempById(id); - DeviceTempVO deviceTemp = DeviceTempConvert.toVO(dto); + DeviceTempVO deviceTemp = DeviceTempControllerConvert.toVO(dto); return success(deviceTemp); } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/controller/convert/DeviceTempConvert.java b/src/main/java/com/ruoyi/device/controller/convert/DeviceTempControllerConvert.java similarity index 89% rename from src/main/java/com/ruoyi/device/controller/convert/DeviceTempConvert.java rename to src/main/java/com/ruoyi/device/controller/convert/DeviceTempControllerConvert.java index 71c4fae..16480be 100644 --- a/src/main/java/com/ruoyi/device/controller/convert/DeviceTempConvert.java +++ b/src/main/java/com/ruoyi/device/controller/convert/DeviceTempControllerConvert.java @@ -14,7 +14,7 @@ import java.util.stream.Collectors; * @author ruoyi * @date 2026-01-15 */ -public class DeviceTempConvert +public class DeviceTempControllerConvert { /** * DTO 转 API Domain @@ -53,6 +53,6 @@ public class DeviceTempConvert { return null; } - return dtoList.stream().map(DeviceTempConvert::toVO).collect(Collectors.toList()); + return dtoList.stream().map(DeviceTempControllerConvert::toVO).collect(Collectors.toList()); } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/domain/convert/DeviceTempConvert.java b/src/main/java/com/ruoyi/device/domain/convert/DeviceTempDomainConvert.java similarity index 89% rename from src/main/java/com/ruoyi/device/domain/convert/DeviceTempConvert.java rename to src/main/java/com/ruoyi/device/domain/convert/DeviceTempDomainConvert.java index 9dedf7f..da9197d 100644 --- a/src/main/java/com/ruoyi/device/domain/convert/DeviceTempConvert.java +++ b/src/main/java/com/ruoyi/device/domain/convert/DeviceTempDomainConvert.java @@ -14,7 +14,7 @@ import java.util.stream.Collectors; * @author ruoyi * @date 2026-01-15 */ -public class DeviceTempConvert +public class DeviceTempDomainConvert { /** * Entity 转 Model @@ -53,6 +53,6 @@ public class DeviceTempConvert { return null; } - return entityList.stream().map(DeviceTempConvert::toModel).collect(Collectors.toList()); + return entityList.stream().map(DeviceTempDomainConvert::toModel).collect(Collectors.toList()); } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/device/domain/impl/DeviceTempDomainImpl.java b/src/main/java/com/ruoyi/device/domain/impl/DeviceTempDomainImpl.java index d9aacfd..095ab68 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/DeviceTempDomainImpl.java +++ b/src/main/java/com/ruoyi/device/domain/impl/DeviceTempDomainImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.device.domain.impl; import com.ruoyi.device.domain.api.IDeviceTempDomain; -import com.ruoyi.device.domain.convert.DeviceTempConvert; +import com.ruoyi.device.domain.convert.DeviceTempDomainConvert; 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 selectDeviceTempList(DeviceTemp deviceTempModel) { - DeviceTempEntity entity = DeviceTempConvert.toEntity(deviceTempModel); + DeviceTempEntity entity = DeviceTempDomainConvert.toEntity(deviceTempModel); List entityList = deviceTempMapper.selectDeviceTempList(entity); - return DeviceTempConvert.toModelList(entityList); + return DeviceTempDomainConvert.toModelList(entityList); } @Override public DeviceTemp selectDeviceTempById(String id) { DeviceTempEntity entity = deviceTempMapper.selectDeviceTempById(id); - return DeviceTempConvert.toModel(entity); + return DeviceTempDomainConvert.toModel(entity); } } diff --git a/src/main/java/com/ruoyi/device/service/convert/DeviceTempConvert.java b/src/main/java/com/ruoyi/device/service/convert/DeviceTempServiceConvert.java similarity index 89% rename from src/main/java/com/ruoyi/device/service/convert/DeviceTempConvert.java rename to src/main/java/com/ruoyi/device/service/convert/DeviceTempServiceConvert.java index 3bff10f..337b3b6 100644 --- a/src/main/java/com/ruoyi/device/service/convert/DeviceTempConvert.java +++ b/src/main/java/com/ruoyi/device/service/convert/DeviceTempServiceConvert.java @@ -14,7 +14,7 @@ import java.util.stream.Collectors; * @author ruoyi * @date 2026-01-15 */ -public class DeviceTempConvert +public class DeviceTempServiceConvert { /** * Model 转 DTO @@ -53,6 +53,6 @@ public class DeviceTempConvert { return null; } - return modelList.stream().map(DeviceTempConvert::toDTO).collect(Collectors.toList()); + return modelList.stream().map(DeviceTempServiceConvert::toDTO).collect(Collectors.toList()); } } \ No newline at end of file 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 4519a70..5cf943e 100644 --- a/src/main/java/com/ruoyi/device/service/impl/DeviceTempServiceImpl.java +++ b/src/main/java/com/ruoyi/device/service/impl/DeviceTempServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.device.service.impl; import com.ruoyi.device.domain.api.IDeviceTempDomain; import com.ruoyi.device.domain.model.DeviceTemp; import com.ruoyi.device.service.api.IDeviceTempService; -import com.ruoyi.device.service.convert.DeviceTempConvert; +import com.ruoyi.device.service.convert.DeviceTempServiceConvert; import com.ruoyi.device.service.dto.DeviceTempDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -31,9 +31,9 @@ public class DeviceTempServiceImpl implements IDeviceTempService @Override public List selectDeviceTempList(DeviceTempDTO deviceTempDTO) { - DeviceTemp model = DeviceTempConvert.toModel(deviceTempDTO); + DeviceTemp model = DeviceTempServiceConvert.toModel(deviceTempDTO); List modelList = deviceTempDomain.selectDeviceTempList(model); - return DeviceTempConvert.toDTOList(modelList); + return DeviceTempServiceConvert.toDTOList(modelList); } /** @@ -46,6 +46,6 @@ public class DeviceTempServiceImpl implements IDeviceTempService public DeviceTempDTO selectDeviceTempById(String id) { DeviceTemp model = deviceTempDomain.selectDeviceTempById(id); - return DeviceTempConvert.toDTO(model); + return DeviceTempServiceConvert.toDTO(model); } } \ No newline at end of file