From fb699c5227a72fb6616ac164557e70052bcffa4f Mon Sep 17 00:00:00 2001 From: feng <18691763612@163.com> Date: Mon, 5 Jan 2026 13:46:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9D=A1=E7=9C=A0=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emergency/entity/ScreenAnimation.java | 2 +- .../watch/vo/BigScreenSleepBaseVo.java | 23 +++++++++++++++++++ .../watch/controller/WatchDataController.java | 11 +++++---- .../watch/service/IWatchDataService.java | 12 ++++++---- .../service/impl/WatchDataServiceImpl.java | 18 +++++++++++++++ 5 files changed, 57 insertions(+), 9 deletions(-) create mode 100644 health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/BigScreenSleepBaseVo.java diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/ScreenAnimation.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/ScreenAnimation.java index 14beb07..7d3f743 100644 --- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/ScreenAnimation.java +++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/ScreenAnimation.java @@ -35,7 +35,7 @@ public class ScreenAnimation implements Serializable { @Schema(title = "动画地址") private String videoUrl; /** - * 简介 + * 简介 (目前没有启用该字段 20260105用此字段存储封面图) */ @Schema(title = "简介") private String description; diff --git a/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/BigScreenSleepBaseVo.java b/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/BigScreenSleepBaseVo.java new file mode 100644 index 0000000..b11169d --- /dev/null +++ b/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/BigScreenSleepBaseVo.java @@ -0,0 +1,23 @@ +package com.renkang.watch.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.Parameter; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * @author TianZi + * @date 2023/12/5 17:33 + */ +@Data +public class BigScreenSleepBaseVo { + @Parameter(description = "人数") + private Integer peopleSum; + + @Parameter(description = "清醒时长") + private List sleepInfo; +} diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/controller/WatchDataController.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/controller/WatchDataController.java index 5b21ab3..14d1bad 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/controller/WatchDataController.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/controller/WatchDataController.java @@ -12,9 +12,7 @@ import com.renkang.watch.dto.BigScreenDTO; import com.renkang.watch.dto.XjScreenAbnormalParam; import com.renkang.watch.entity.*; import com.renkang.watch.service.*; -import com.renkang.watch.vo.BigScreenSdcVo; -import com.renkang.watch.vo.BigScreenSleepVo; -import com.renkang.watch.vo.BigScreenVo; +import com.renkang.watch.vo.*; import com.renkang.watch.vo.UserData.StatisticsReq; import com.renkang.watch.vo.UserData.res.Stress.WatchDataStressRes; import com.renkang.watch.vo.UserData.res.bloodOxygen.BloodOxygenStat; @@ -23,7 +21,6 @@ import com.renkang.watch.vo.UserData.res.heartRate.WatchDataHeartRateRes; import com.renkang.watch.vo.UserData.res.sleep.WatchDataSleepPageRes; import com.renkang.watch.vo.UserData.res.sleep.WatchDataSleepRes; import com.renkang.watch.vo.UserData.res.step.WatchDataStepRes; -import com.renkang.watch.vo.XjScreenAbnormalVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; @@ -380,6 +377,12 @@ public class WatchDataController extends JeecgController getSleepV2(@RequestBody BigScreenDTO dto) { + return Result.OK(watchDataService.getSleepV2(dto)); + } + /** * 七天 活跃 跑数据 * @return diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/IWatchDataService.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/IWatchDataService.java index 39cb73e..f82bb58 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/IWatchDataService.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/IWatchDataService.java @@ -8,10 +8,7 @@ import com.renkang.watch.bean.response.UserDataDetail; import com.renkang.watch.dto.BigScreenDTO; import com.renkang.watch.dto.XjScreenAbnormalParam; import com.renkang.watch.entity.WatchData; -import com.renkang.watch.vo.BigScreenSdcVo; -import com.renkang.watch.vo.BigScreenSleepVo; -import com.renkang.watch.vo.BigScreenVo; -import com.renkang.watch.vo.XjScreenAbnormalVO; +import com.renkang.watch.vo.*; import org.jeecg.common.api.vo.Result; import java.util.Date; @@ -79,4 +76,11 @@ public interface IWatchDataService extends IService { * @return */ IPage abnormalPage(XjScreenAbnormalParam param); + + /** + * 大屏副屏(睡眠20260105版本) + * @param dto + * @return + */ + BigScreenSleepBaseVo getSleepV2(BigScreenDTO dto); } diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java index 7667378..dfe2d76 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java @@ -27,6 +27,7 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.bean.request.ListUser; import org.jeecg.bean.response.BaseEmployeeInfo; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.exception.ExceptionAssertsUtil; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; @@ -1043,6 +1044,23 @@ public class WatchDataServiceImpl extends ServiceImpl sleepInfo = getSleep(dto); + //todo 查询存在睡眠数据的人数 + vo.setPeopleSum(0); + vo.setSleepInfo(sleepInfo); + return vo; + } + @Override public Map> userDataDayByMonth(String userId, Integer year) { //心率