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 611fb6fb..fcd57b72 100644 --- a/src/main/java/com/youlai/boot/device/controller/MobileController.java +++ b/src/main/java/com/youlai/boot/device/controller/MobileController.java @@ -13,6 +13,7 @@ import com.youlai.boot.device.model.entity.SnDeviceHardwareInfo; import com.youlai.boot.device.model.entity.SnDeviceNetworkInfo; import com.youlai.boot.device.model.entity.SnDeviceSecurityInfo; import com.youlai.boot.device.model.entity.SnDeviceOtherInfo; +import com.youlai.boot.device.model.entity.SnDeviceInfo; import com.youlai.boot.device.model.req.ApkInstallInfoReq; import com.youlai.boot.device.model.req.SnSystemInfoReq; import com.youlai.boot.device.model.req.SnHardwareInfoReq; @@ -105,6 +106,17 @@ public class MobileController { return Result.failed("硬件信息不能为空"); } + if (snSystemInfoReq.getDeviceModel() != null && !snSystemInfoReq.getDeviceModel().trim().isEmpty()) { + SnDeviceInfo deviceInfo = deviceService.lambdaQuery() + .eq(SnDeviceInfo::getSerialno, sn) + .one(); + if (deviceInfo != null) { + deviceInfo.setSnModel(snSystemInfoReq.getDeviceModel()); + deviceInfo.setUpdateTime(LocalDateTime.now()); + deviceService.updateById(deviceInfo); + } + } + SnDeviceSystemInfo systemInfo = new SnDeviceSystemInfo(); BeanUtils.copyProperties(snSystemInfoReq, systemInfo); systemInfo.setSerialno(sn); @@ -174,6 +186,18 @@ public class MobileController { return Result.failed("保存其他信息失败"); } + // 如果推送ID不为空,则同步更新设备表的推送ID + if (snOtherInfoReq.getPushId() != null && !snOtherInfoReq.getPushId().trim().isEmpty()) { + SnDeviceInfo deviceInfo = deviceService.lambdaQuery() + .eq(SnDeviceInfo::getSerialno, sn) + .one(); + if (deviceInfo != null) { + deviceInfo.setPushId(snOtherInfoReq.getPushId()); + deviceInfo.setUpdateTime(LocalDateTime.now()); + deviceService.updateById(deviceInfo); + } + } + logger.info("其他信息上传成功, sn: {}", sn); return Result.success();