renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style(watch): 睡眠接口午睡（短睡）兼容问题处理

Browse Source
This commit is contained in:
lianlonggang
2026-06-30 16:21:06 +08:00
parent bbb0d5b0f8
commit 9713b242e8
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-watch/health-watch-biz/src/main/java/com/renkang/watch/api/service/impl/WatchDataApiServiceImpl.java
+7 -1
View File
@@ -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) {
health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchServiceImpl.java
+7 -1
View File
@@ -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) {