This commit is contained in:
孙小云 2026-01-15 19:14:11 +08:00
parent 1a7c7caa71
commit 34f86b6329
6 changed files with 19 additions and 19 deletions

View File

@ -6,7 +6,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo; import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.security.annotation.InnerAuth; import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.device.api.domain.DeviceTempVO; 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.api.IDeviceTempService;
import com.ruoyi.device.service.dto.DeviceTempDTO; import com.ruoyi.device.service.dto.DeviceTempDTO;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -38,10 +38,10 @@ public class DeviceTempController extends BaseController
{ {
startPage(); startPage();
// API Domain Service DTO // API Domain Service DTO
DeviceTempDTO dto = DeviceTempConvert.toDTO(deviceTemp); DeviceTempDTO dto = DeviceTempControllerConvert.toDTO(deviceTemp);
List<DeviceTempDTO> dtoList = deviceTempService.selectDeviceTempList(dto); List<DeviceTempDTO> dtoList = deviceTempService.selectDeviceTempList(dto);
// Service DTO API Domain // Service DTO API Domain
List<DeviceTempVO> list = DeviceTempConvert.toApiDomainList(dtoList); List<DeviceTempVO> list = DeviceTempControllerConvert.toApiDomainList(dtoList);
return getDataTable(list); return getDataTable(list);
} }
@ -53,7 +53,7 @@ public class DeviceTempController extends BaseController
public R<DeviceTempVO> getDeviceById(@PathVariable("id") String id) public R<DeviceTempVO> getDeviceById(@PathVariable("id") String id)
{ {
DeviceTempDTO dto = deviceTempService.selectDeviceTempById(id); DeviceTempDTO dto = deviceTempService.selectDeviceTempById(id);
DeviceTempVO deviceTemp = DeviceTempConvert.toVO(dto); DeviceTempVO deviceTemp = DeviceTempControllerConvert.toVO(dto);
return R.ok(deviceTemp); return R.ok(deviceTemp);
} }
@ -64,7 +64,7 @@ public class DeviceTempController extends BaseController
public AjaxResult getInfo(@PathVariable("id") String id) public AjaxResult getInfo(@PathVariable("id") String id)
{ {
DeviceTempDTO dto = deviceTempService.selectDeviceTempById(id); DeviceTempDTO dto = deviceTempService.selectDeviceTempById(id);
DeviceTempVO deviceTemp = DeviceTempConvert.toVO(dto); DeviceTempVO deviceTemp = DeviceTempControllerConvert.toVO(dto);
return success(deviceTemp); return success(deviceTemp);
} }
} }

View File

@ -14,7 +14,7 @@ import java.util.stream.Collectors;
* @author ruoyi * @author ruoyi
* @date 2026-01-15 * @date 2026-01-15
*/ */
public class DeviceTempConvert public class DeviceTempControllerConvert
{ {
/** /**
* DTO API Domain * DTO API Domain
@ -53,6 +53,6 @@ public class DeviceTempConvert
{ {
return null; return null;
} }
return dtoList.stream().map(DeviceTempConvert::toVO).collect(Collectors.toList()); return dtoList.stream().map(DeviceTempControllerConvert::toVO).collect(Collectors.toList());
} }
} }

View File

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

View File

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

View File

@ -14,7 +14,7 @@ import java.util.stream.Collectors;
* @author ruoyi * @author ruoyi
* @date 2026-01-15 * @date 2026-01-15
*/ */
public class DeviceTempConvert public class DeviceTempServiceConvert
{ {
/** /**
* Model DTO * Model DTO
@ -53,6 +53,6 @@ public class DeviceTempConvert
{ {
return null; return null;
} }
return modelList.stream().map(DeviceTempConvert::toDTO).collect(Collectors.toList()); return modelList.stream().map(DeviceTempServiceConvert::toDTO).collect(Collectors.toList());
} }
} }

View File

@ -3,7 +3,7 @@ package com.ruoyi.device.service.impl;
import com.ruoyi.device.domain.api.IDeviceTempDomain; import com.ruoyi.device.domain.api.IDeviceTempDomain;
import com.ruoyi.device.domain.model.DeviceTemp; import com.ruoyi.device.domain.model.DeviceTemp;
import com.ruoyi.device.service.api.IDeviceTempService; 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 com.ruoyi.device.service.dto.DeviceTempDTO;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -31,9 +31,9 @@ public class DeviceTempServiceImpl implements IDeviceTempService
@Override @Override
public List<DeviceTempDTO> selectDeviceTempList(DeviceTempDTO deviceTempDTO) public List<DeviceTempDTO> selectDeviceTempList(DeviceTempDTO deviceTempDTO)
{ {
DeviceTemp model = DeviceTempConvert.toModel(deviceTempDTO); DeviceTemp model = DeviceTempServiceConvert.toModel(deviceTempDTO);
List<DeviceTemp> modelList = deviceTempDomain.selectDeviceTempList(model); List<DeviceTemp> 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) public DeviceTempDTO selectDeviceTempById(String id)
{ {
DeviceTemp model = deviceTempDomain.selectDeviceTempById(id); DeviceTemp model = deviceTempDomain.selectDeviceTempById(id);
return DeviceTempConvert.toDTO(model); return DeviceTempServiceConvert.toDTO(model);
} }
} }