From 3db3301fe349f5a4ea442163c3daba86b252557d Mon Sep 17 00:00:00 2001 From: wanghao Date: Thu, 5 Mar 2026 16:10:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E8=A1=A8=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../watch/vo/UserData/res/UserStat.java | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/UserData/res/UserStat.java b/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/UserData/res/UserStat.java index 7437646..a1aaeda 100644 --- a/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/UserData/res/UserStat.java +++ b/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/UserData/res/UserStat.java @@ -23,7 +23,7 @@ public class UserStat { private BigDecimal max; private BigDecimal min; private BigDecimal avg; - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date latestTime; public UserStat() { @@ -49,19 +49,11 @@ public class UserStat { default: break; } - if (watchH5IndexItemNewVo.getWdType().equals("sleep")) { - this.latest = parseSafe(watchH5IndexItemNewVo.getDataMax());// 总时长 - this.max = parseSafe(watchH5IndexItemNewVo.getDataMax()); - this.min = parseSafe(watchH5IndexItemNewVo.getDataMin()); - this.avg = parseSafe(watchH5IndexItemNewVo.getDataAvg()); - this.latestTime = watchH5IndexItemNewVo.getDataDate(); - }else { - this.latest = parseSafe(watchH5IndexItemNewVo.getDataValue()); - this.max = parseSafe(watchH5IndexItemNewVo.getDataMax()); - this.min = parseSafe(watchH5IndexItemNewVo.getDataMin()); - this.avg = parseSafe(watchH5IndexItemNewVo.getDataAvg()); - this.latestTime = watchH5IndexItemNewVo.getDataDate(); - } + this.latest = parseSafe(watchH5IndexItemNewVo.getDataValue()); + this.max = parseSafe(watchH5IndexItemNewVo.getDataMax()); + this.min = parseSafe(watchH5IndexItemNewVo.getDataMin()); + this.avg = parseSafe(watchH5IndexItemNewVo.getDataAvg()); + this.latestTime = watchH5IndexItemNewVo.getDataDate(); } /**