tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(device): 重命名硬件信息为系统信息

Browse Source 
将 Hardware 相关类、接口、方法、API 端点统一重命名为 SystemInfo，包括实体、VO、Req、Mapper、Service 及 Controller，并更新数据库表名映射。
This commit is contained in:
TongTongStudio
2026-08-04 22:12:50 +08:00
parent 5915da6517
commit 537644ab2e
12 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/youlai/boot/device/controller/DeviceController.java
View File

@@ -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<DeviceHardwareVO> getSnHardwareInfo(@PathVariable String sn) {
DeviceHardwareVO info = deviceService.getSnHardwareInfo(sn);
public Result<DeviceSystemInfoVO> getSnSystemInfo(@PathVariable String sn) {
DeviceSystemInfoVO info = deviceService.getSnSystemInfo(sn);
return Result.success(info);
}

38
src/main/java/com/youlai/boot/device/controller/MobileController.java
View File

@@ -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<Void> updateHardwareInfo(
public Result<Void> 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());
}
}

4
src/main/java/com/youlai/boot/device/mapper/HardwareMapper.java → src/main/java/com/youlai/boot/device/mapper/SystemInfoMapper.java
View File

@@ -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<SnDeviceHardware> {
public interface SystemInfoMapper extends BaseMapper<SnDeviceSystemInfo> {
}

4
src/main/java/com/youlai/boot/device/model/entity/SnDeviceHardware.java → src/main/java/com/youlai/boot/device/model/entity/SnDeviceSystemInfo.java
View File

@@ -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 {
/**
* 设备序列号

4
src/main/java/com/youlai/boot/device/model/req/SnHardwareInfoReq.java → src/main/java/com/youlai/boot/device/model/req/SnSystemInfoReq.java
View File

@@ -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;

2
src/main/java/com/youlai/boot/device/model/vo/DeviceHardwareVO.java → src/main/java/com/youlai/boot/device/model/vo/DeviceSystemInfoVO.java
View File

@@ -11,7 +11,7 @@ import lombok.Data;
*/
@Schema(description ="设备硬件对象")
@Data
public class DeviceHardwareVO {
public class DeviceSystemInfoVO {
@Schema(description="设备ID")
private Long id;

4
src/main/java/com/youlai/boot/device/service/DeviceService.java
View File

@@ -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<SnDeviceInfo> {
* @param sn 设备序列号
* @return 设备硬件信息
*/
DeviceHardwareVO getSnHardwareInfo(String sn);
DeviceSystemInfoVO getSnSystemInfo(String sn);
/**
* 添加设备

7
src/main/java/com/youlai/boot/device/service/HardwareService.java
View File

@@ -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<SnDeviceHardware> {
}

7
src/main/java/com/youlai/boot/device/service/SystemInfoService.java Normal file
View File

@@ -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<SnDeviceSystemInfo> {
}

4
src/main/java/com/youlai/boot/device/service/impl/DeviceServiceImpl.java
View File

@@ -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<DeviceMapper, SnDeviceInfo> i
}
@Override
public DeviceHardwareVO getSnHardwareInfo(String sn) {
public DeviceSystemInfoVO getSnSystemInfo(String sn) {
return null;
}

13
src/main/java/com/youlai/boot/device/service/impl/HardwareServiceImpl.java
View File

@@ -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<HardwareMapper, SnDeviceHardware> implements HardwareService {
}

13
src/main/java/com/youlai/boot/device/service/impl/SystemInfoServiceImpl.java Normal file
View File

@@ -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<SystemInfoMapper, SnDeviceSystemInfo> implements SystemInfoService {
}