From 537644ab2ef07a7ea7840e35336a4158271a4f48 Mon Sep 17 00:00:00 2001 From: TongTongStudio Date: Tue, 4 Aug 2026 22:12:50 +0800 Subject: [PATCH] =?UTF-8?q?refactor(device):=20=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E4=BF=A1=E6=81=AF=E4=B8=BA=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 Hardware 相关类、接口、方法、API 端点统一重命名为 SystemInfo，包括实体、VO、Req、Mapper、Service 及 Controller，并更新数据库表名映射。 --- .../device/controller/DeviceController.java | 8 ++-- .../device/controller/MobileController.java | 38 +++++++++---------- ...dwareMapper.java => SystemInfoMapper.java} | 4 +- ...eHardware.java => SnDeviceSystemInfo.java} | 4 +- ...dwareInfoReq.java => SnSystemInfoReq.java} | 4 +- ...ardwareVO.java => DeviceSystemInfoVO.java} | 2 +- .../boot/device/service/DeviceService.java | 4 +- .../boot/device/service/HardwareService.java | 7 ---- .../device/service/SystemInfoService.java | 7 ++++ .../service/impl/DeviceServiceImpl.java | 4 +- .../service/impl/HardwareServiceImpl.java | 13 ------- .../service/impl/SystemInfoServiceImpl.java | 13 +++++++ 12 files changed, 54 insertions(+), 54 deletions(-) rename src/main/java/com/youlai/boot/device/mapper/{HardwareMapper.java => SystemInfoMapper.java} (52%) rename src/main/java/com/youlai/boot/device/model/entity/{SnDeviceHardware.java => SnDeviceSystemInfo.java} (88%) rename src/main/java/com/youlai/boot/device/model/req/{SnHardwareInfoReq.java => SnSystemInfoReq.java} (95%) rename src/main/java/com/youlai/boot/device/model/vo/{DeviceHardwareVO.java => DeviceSystemInfoVO.java} (97%) delete mode 100644 src/main/java/com/youlai/boot/device/service/HardwareService.java create mode 100644 src/main/java/com/youlai/boot/device/service/SystemInfoService.java delete mode 100644 src/main/java/com/youlai/boot/device/service/impl/HardwareServiceImpl.java create mode 100644 src/main/java/com/youlai/boot/device/service/impl/SystemInfoServiceImpl.java diff --git a/src/main/java/com/youlai/boot/device/controller/DeviceController.java b/src/main/java/com/youlai/boot/device/controller/DeviceController.java index 48c27d2c..70de3f0a 100644 --- a/src/main/java/com/youlai/boot/device/controller/DeviceController.java +++ b/src/main/java/com/youlai/boot/device/controller/DeviceController.java @@ -8,7 +8,7 @@ import com.youlai.boot.common.result.Result; import com.youlai.boot.device.model.entity.SnDeviceInfo; import com.youlai.boot.device.model.form.DeveloperForm; import com.youlai.boot.device.model.query.DeviceQuery; -import com.youlai.boot.device.model.vo.DeviceHardwareVO; +import com.youlai.boot.device.model.vo.DeviceSystemInfoVO; import com.youlai.boot.device.model.vo.DevicePageVO; import com.youlai.boot.device.service.DeviceService; import io.swagger.v3.oas.annotations.Operation; @@ -47,11 +47,11 @@ public class DeviceController { } @Operation(summary = "获取SN基础信息") - @GetMapping("/{sn}/hardware_info") + @GetMapping("/{sn}/system_info") @Log(module = LogModuleEnum.DEVICE, value = ActionTypeEnum.VIEW) // @PreAuthorize("@ss.hasPerm('sys:sn:view')") - public Result getSnHardwareInfo(@PathVariable String sn) { - DeviceHardwareVO info = deviceService.getSnHardwareInfo(sn); + public Result getSnSystemInfo(@PathVariable String sn) { + DeviceSystemInfoVO info = deviceService.getSnSystemInfo(sn); return Result.success(info); } diff --git a/src/main/java/com/youlai/boot/device/controller/MobileController.java b/src/main/java/com/youlai/boot/device/controller/MobileController.java index 897484fb..31c4f5c9 100644 --- a/src/main/java/com/youlai/boot/device/controller/MobileController.java +++ b/src/main/java/com/youlai/boot/device/controller/MobileController.java @@ -7,9 +7,9 @@ import com.youlai.boot.common.enums.ActionTypeEnum; import com.youlai.boot.common.enums.LogModuleEnum; import com.youlai.boot.common.result.Result; import com.youlai.boot.common.util.HashUtils; -import com.youlai.boot.device.model.entity.SnDeviceHardware; +import com.youlai.boot.device.model.entity.SnDeviceSystemInfo; import com.youlai.boot.device.model.req.ApkInstallInfoReq; -import com.youlai.boot.device.model.req.SnHardwareInfoReq; +import com.youlai.boot.device.model.req.SnSystemInfoReq; import com.youlai.boot.device.model.req.SnLocationReq; import com.youlai.boot.device.model.entity.SnLocation; import com.youlai.boot.device.model.entity.SnScreenshot; @@ -51,7 +51,7 @@ public class MobileController { private final LocationService locationService; private final DeveloperService developerService; private final ApkInstallService apkInstallService; - private final HardwareService hardwareService; + private final SystemInfoService systemInfoService; private final Logger logger = LoggerFactory.getLogger(MobileController.class); @@ -76,37 +76,37 @@ public class MobileController { } @Operation(summary = "上传设备硬件信息") - @PostMapping("/update_hardware_info") + @PostMapping("/update_system_info") @Log(module = LogModuleEnum.MOBILE, value = ActionTypeEnum.DEVELOPER) - public Result updateHardwareInfo( + public Result updateSystemInfo( @RequestHeader(value = "X-Device-SN") String sn, - @RequestBody SnHardwareInfoReq hardwareInfoReq + @RequestBody SnSystemInfoReq snSystemInfoReq ) { try { if (sn == null || sn.trim().isEmpty()) { return Result.failed("设备序列号不能为空"); } - if (hardwareInfoReq == null) { + if (snSystemInfoReq == null) { return Result.failed("硬件信息不能为空"); } - SnDeviceHardware hardware = new SnDeviceHardware(); - BeanUtils.copyProperties(hardwareInfoReq, hardware); - hardware.setSerialno(sn); - hardware.setUpdateTime(LocalDateTime.now()); + SnDeviceSystemInfo systemInfo = new SnDeviceSystemInfo(); + BeanUtils.copyProperties(snSystemInfoReq, systemInfo); + systemInfo.setSerialno(sn); + systemInfo.setUpdateTime(LocalDateTime.now()); - SnDeviceHardware existingHardware = hardwareService.lambdaQuery() - .eq(SnDeviceHardware::getSerialno, sn) + SnDeviceSystemInfo existingSystemInfo = systemInfoService.lambdaQuery() + .eq(SnDeviceSystemInfo::getSerialno, sn) .one(); boolean saved; - if (existingHardware != null) { - hardware.setId(existingHardware.getId()); - saved = hardwareService.updateById(hardware); + if (existingSystemInfo != null) { + systemInfo.setId(existingSystemInfo.getId()); + saved = systemInfoService.updateById(systemInfo); } else { - hardware.setCreateTime(LocalDateTime.now()); - saved = hardwareService.save(hardware); + systemInfo.setCreateTime(LocalDateTime.now()); + saved = systemInfoService.save(systemInfo); } if (!saved) { @@ -117,7 +117,7 @@ public class MobileController { return Result.success(); } catch (Exception e) { - logger.error("updateHardwareInfo error, sn: {}", sn, e); + logger.error("updateSystemInfo error, sn: {}", sn, e); return Result.failed("上传硬件信息失败: " + e.getMessage()); } } diff --git a/src/main/java/com/youlai/boot/device/mapper/HardwareMapper.java b/src/main/java/com/youlai/boot/device/mapper/SystemInfoMapper.java similarity index 52% rename from src/main/java/com/youlai/boot/device/mapper/HardwareMapper.java rename to src/main/java/com/youlai/boot/device/mapper/SystemInfoMapper.java index 5fe9afde..b6b94110 100644 --- a/src/main/java/com/youlai/boot/device/mapper/HardwareMapper.java +++ b/src/main/java/com/youlai/boot/device/mapper/SystemInfoMapper.java @@ -1,9 +1,9 @@ package com.youlai.boot.device.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.youlai.boot.device.model.entity.SnDeviceHardware; +import com.youlai.boot.device.model.entity.SnDeviceSystemInfo; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface HardwareMapper extends BaseMapper { +public interface SystemInfoMapper extends BaseMapper { } diff --git a/src/main/java/com/youlai/boot/device/model/entity/SnDeviceHardware.java b/src/main/java/com/youlai/boot/device/model/entity/SnDeviceSystemInfo.java similarity index 88% rename from src/main/java/com/youlai/boot/device/model/entity/SnDeviceHardware.java rename to src/main/java/com/youlai/boot/device/model/entity/SnDeviceSystemInfo.java index d3264da6..07148185 100644 --- a/src/main/java/com/youlai/boot/device/model/entity/SnDeviceHardware.java +++ b/src/main/java/com/youlai/boot/device/model/entity/SnDeviceSystemInfo.java @@ -8,10 +8,10 @@ import lombok.Setter; /** * 用户实体 */ -@TableName("sys_sn_hardware") +@TableName("sys_sn_system_info") @Getter @Setter -public class SnDeviceHardware extends BaseEntity { +public class SnDeviceSystemInfo extends BaseEntity { /** * 设备序列号 diff --git a/src/main/java/com/youlai/boot/device/model/req/SnHardwareInfoReq.java b/src/main/java/com/youlai/boot/device/model/req/SnSystemInfoReq.java similarity index 95% rename from src/main/java/com/youlai/boot/device/model/req/SnHardwareInfoReq.java rename to src/main/java/com/youlai/boot/device/model/req/SnSystemInfoReq.java index 4806f442..5b5327e3 100644 --- a/src/main/java/com/youlai/boot/device/model/req/SnHardwareInfoReq.java +++ b/src/main/java/com/youlai/boot/device/model/req/SnSystemInfoReq.java @@ -4,9 +4,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -@Schema(description = "设备硬件信息") +@Schema(description = "设备基本信息") @Data -public class SnHardwareInfoReq { +public class SnSystemInfoReq { @Schema(description="设备ID") private Long id; diff --git a/src/main/java/com/youlai/boot/device/model/vo/DeviceHardwareVO.java b/src/main/java/com/youlai/boot/device/model/vo/DeviceSystemInfoVO.java similarity index 97% rename from src/main/java/com/youlai/boot/device/model/vo/DeviceHardwareVO.java rename to src/main/java/com/youlai/boot/device/model/vo/DeviceSystemInfoVO.java index cc218e6b..45129fc1 100644 --- a/src/main/java/com/youlai/boot/device/model/vo/DeviceHardwareVO.java +++ b/src/main/java/com/youlai/boot/device/model/vo/DeviceSystemInfoVO.java @@ -11,7 +11,7 @@ import lombok.Data; */ @Schema(description ="设备硬件对象") @Data -public class DeviceHardwareVO { +public class DeviceSystemInfoVO { @Schema(description="设备ID") private Long id; diff --git a/src/main/java/com/youlai/boot/device/service/DeviceService.java b/src/main/java/com/youlai/boot/device/service/DeviceService.java index 569941fe..e769670f 100644 --- a/src/main/java/com/youlai/boot/device/service/DeviceService.java +++ b/src/main/java/com/youlai/boot/device/service/DeviceService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.boot.device.model.entity.SnDeviceInfo; import com.youlai.boot.device.model.query.DeviceQuery; -import com.youlai.boot.device.model.vo.DeviceHardwareVO; +import com.youlai.boot.device.model.vo.DeviceSystemInfoVO; import com.youlai.boot.device.model.vo.DevicePageVO; @@ -30,7 +30,7 @@ public interface DeviceService extends IService { * @param sn 设备序列号 * @return 设备硬件信息 */ - DeviceHardwareVO getSnHardwareInfo(String sn); + DeviceSystemInfoVO getSnSystemInfo(String sn); /** * 添加设备 diff --git a/src/main/java/com/youlai/boot/device/service/HardwareService.java b/src/main/java/com/youlai/boot/device/service/HardwareService.java deleted file mode 100644 index 308176e8..00000000 --- a/src/main/java/com/youlai/boot/device/service/HardwareService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.youlai.boot.device.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.boot.device.model.entity.SnDeviceHardware; - -public interface HardwareService extends IService { -} diff --git a/src/main/java/com/youlai/boot/device/service/SystemInfoService.java b/src/main/java/com/youlai/boot/device/service/SystemInfoService.java new file mode 100644 index 00000000..1f109997 --- /dev/null +++ b/src/main/java/com/youlai/boot/device/service/SystemInfoService.java @@ -0,0 +1,7 @@ +package com.youlai.boot.device.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.youlai.boot.device.model.entity.SnDeviceSystemInfo; + +public interface SystemInfoService extends IService { +} diff --git a/src/main/java/com/youlai/boot/device/service/impl/DeviceServiceImpl.java b/src/main/java/com/youlai/boot/device/service/impl/DeviceServiceImpl.java index 8f0a33d3..8a0eb905 100644 --- a/src/main/java/com/youlai/boot/device/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/youlai/boot/device/service/impl/DeviceServiceImpl.java @@ -13,7 +13,7 @@ import com.youlai.boot.framework.security.util.SecurityUtils; import com.youlai.boot.device.mapper.DeviceMapper; import com.youlai.boot.device.model.entity.SnDeviceInfo; import com.youlai.boot.device.model.query.DeviceQuery; -import com.youlai.boot.device.model.vo.DeviceHardwareVO; +import com.youlai.boot.device.model.vo.DeviceSystemInfoVO; import com.youlai.boot.device.model.vo.DevicePageVO; import com.youlai.boot.device.service.DeveloperService; import com.youlai.boot.device.service.DeviceService; @@ -76,7 +76,7 @@ public class DeviceServiceImpl extends ServiceImpl i } @Override - public DeviceHardwareVO getSnHardwareInfo(String sn) { + public DeviceSystemInfoVO getSnSystemInfo(String sn) { return null; } diff --git a/src/main/java/com/youlai/boot/device/service/impl/HardwareServiceImpl.java b/src/main/java/com/youlai/boot/device/service/impl/HardwareServiceImpl.java deleted file mode 100644 index c6822de6..00000000 --- a/src/main/java/com/youlai/boot/device/service/impl/HardwareServiceImpl.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.youlai.boot.device.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.boot.device.mapper.HardwareMapper; -import com.youlai.boot.device.model.entity.SnDeviceHardware; -import com.youlai.boot.device.service.HardwareService; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -public class HardwareServiceImpl extends ServiceImpl implements HardwareService { -} diff --git a/src/main/java/com/youlai/boot/device/service/impl/SystemInfoServiceImpl.java b/src/main/java/com/youlai/boot/device/service/impl/SystemInfoServiceImpl.java new file mode 100644 index 00000000..4e9a81a3 --- /dev/null +++ b/src/main/java/com/youlai/boot/device/service/impl/SystemInfoServiceImpl.java @@ -0,0 +1,13 @@ +package com.youlai.boot.device.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.youlai.boot.device.mapper.SystemInfoMapper; +import com.youlai.boot.device.model.entity.SnDeviceSystemInfo; +import com.youlai.boot.device.service.SystemInfoService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class SystemInfoServiceImpl extends ServiceImpl implements SystemInfoService { +}