From 9713b242e8623e5d1b51c55b0a53f337919826cd Mon Sep 17 00:00:00 2001 From: lianlonggang Date: Tue, 30 Jun 2026 16:21:06 +0800 Subject: [PATCH] =?UTF-8?q?style(watch):=20=E7=9D=A1=E7=9C=A0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8D=88=E7=9D=A1=EF=BC=88=E7=9F=AD=E7=9D=A1=EF=BC=89?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../watch/api/service/impl/WatchDataApiServiceImpl.java | 8 +++++++- .../com/renkang/watch/service/impl/WatchServiceImpl.java | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/api/service/impl/WatchDataApiServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/api/service/impl/WatchDataApiServiceImpl.java index b67f336..52c7d07 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/api/service/impl/WatchDataApiServiceImpl.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/api/service/impl/WatchDataApiServiceImpl.java @@ -974,7 +974,13 @@ public class WatchDataApiServiceImpl implements WatchDataApiService { wrapper.eq(WatchStatUserInfoDaySleep::getUserId, userId); wrapper.orderByDesc(WatchStatUserInfoDaySleep::getDataDate); wrapper.last("FETCH FIRST 1 ROWS ONLY"); - return watchStatUserInfoDaySleepMapper.selectJoinOne(WatchH5IndexItemNewVo.class,wrapper); + WatchH5IndexItemNewVo vo = watchStatUserInfoDaySleepMapper.selectJoinOne(WatchH5IndexItemNewVo.class, wrapper); + // 浅睡有值但深睡为空 → 当天仅有浅睡数据,用浅睡补齐 dataValue/dataMax + if (vo != null && StrUtil.isNotEmpty(vo.getDataMin()) && StrUtil.isEmpty(vo.getDataMax())) { + vo.setDataValue(vo.getDataMin()); + vo.setDataMax(vo.getDataMin()); + } + return vo; } private WatchH5IndexItemNewVo latestHeartRateData(String userId) { diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchServiceImpl.java index 107e6d4..ac114d2 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchServiceImpl.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchServiceImpl.java @@ -587,7 +587,13 @@ public class WatchServiceImpl implements IWatchService { wrapper.eq(WatchStatUserInfoDaySleep::getUserId, userId); wrapper.orderByDesc(WatchStatUserInfoDaySleep::getDataDate); wrapper.last("FETCH FIRST 1 ROWS ONLY"); - return daySleepMapper.selectJoinOne(WatchH5IndexItemNewVo.class,wrapper); + WatchH5IndexItemNewVo vo = daySleepMapper.selectJoinOne(WatchH5IndexItemNewVo.class, wrapper); + // 短睡(午睡)有值但长睡为空 → 当天仅有午睡数据,用短睡补齐 dataValue/dataMax + if (vo != null && StrUtil.isNotEmpty(vo.getDataMin()) && StrUtil.isEmpty(vo.getDataMax())) { + vo.setDataValue(vo.getDataMin()); + vo.setDataMax(vo.getDataMin()); + } + return vo; } private WatchH5IndexItemNewVo latestStepsData(String userId) {