From ad03177e505ec164b72b0a901c5f066e118cf98c Mon Sep 17 00:00:00 2001 From: wanghao Date: Thu, 5 Mar 2026 17:00:18 +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 --- .../java/com/renkang/watch/WatchH5IndexItemNewVo.java | 7 ------- .../api/service/impl/WatchDataApiServiceImpl.java | 10 ++++------ .../common/amap/service/impl/AmapServiceImpl.java | 4 ++-- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/health-watch/health-watch-api/src/main/java/com/renkang/watch/WatchH5IndexItemNewVo.java b/health-watch/health-watch-api/src/main/java/com/renkang/watch/WatchH5IndexItemNewVo.java index bf6b793..4b10a27 100644 --- a/health-watch/health-watch-api/src/main/java/com/renkang/watch/WatchH5IndexItemNewVo.java +++ b/health-watch/health-watch-api/src/main/java/com/renkang/watch/WatchH5IndexItemNewVo.java @@ -83,11 +83,4 @@ public class WatchH5IndexItemNewVo { this.setWdType(watchH5IndexItemVo.getWdType()); this.setWdTypeName(watchH5IndexItemVo.getWdTypeName()); } - - public void sleepCopy(WatchH5IndexItemVo watchH5IndexItemVo){ - this.setWarnMax(watchH5IndexItemVo.getWarnMax()); - this.setWarnMin(watchH5IndexItemVo.getWarnMin()); - this.setWdType(watchH5IndexItemVo.getWdType()); - this.setWdTypeName(watchH5IndexItemVo.getWdTypeName()); - } } 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 c54bd8a..bd1cfcb 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 @@ -925,8 +925,6 @@ public class WatchDataApiServiceImpl implements WatchDataApiService { // 睡眠数据特殊处理：dataValue 为空时补 "0" if ("sleep".equals(itemVo.getWdType()) && StrUtil.isEmpty(data.getDataValue())) { data.setDataValue("0"); - }else { - } list.add(data); }); @@ -986,7 +984,7 @@ public class WatchDataApiServiceImpl implements WatchDataApiService { wrapper.selectAs(WatchStatUserInfoDayHeartRate::getMaxValue,WatchH5IndexItemNewVo::getDataMax); wrapper.selectAs(WatchStatUserInfoDayHeartRate::getMinValue,WatchH5IndexItemNewVo::getDataMin); wrapper.selectAs(WatchStatUserInfoDayHeartRate::getAvgValue,WatchH5IndexItemNewVo::getDataAvg); - wrapper.selectAs(WatchStatUserInfoDayHeartRate::getDataDate,WatchH5IndexItemNewVo::getDataDate); + wrapper.selectAs(WatchStatUserInfoDayHeartRate::getLastUploadTime,WatchH5IndexItemNewVo::getDataDate); wrapper.eq(WatchStatUserInfoDayHeartRate::getUserId, userId); wrapper.orderByDesc(WatchStatUserInfoDayHeartRate::getDataDate); wrapper.last("limit 1"); @@ -1000,7 +998,7 @@ public class WatchDataApiServiceImpl implements WatchDataApiService { wrapper.selectAs(WatchStatUserInfoDaySpo2::getMaxValue,WatchH5IndexItemNewVo::getDataMax); wrapper.selectAs(WatchStatUserInfoDaySpo2::getMinValue,WatchH5IndexItemNewVo::getDataMin); wrapper.selectAs(WatchStatUserInfoDaySpo2::getAvgValue,WatchH5IndexItemNewVo::getDataAvg); - wrapper.selectAs(WatchStatUserInfoDaySpo2::getDataDate,WatchH5IndexItemNewVo::getDataDate); + wrapper.selectAs(WatchStatUserInfoDaySpo2::getLastUploadTime,WatchH5IndexItemNewVo::getDataDate); wrapper.eq(WatchStatUserInfoDaySpo2::getUserId, userId); wrapper.orderByDesc(WatchStatUserInfoDaySpo2::getDataDate); wrapper.last("limit 1"); @@ -1014,7 +1012,7 @@ public class WatchDataApiServiceImpl implements WatchDataApiService { wrapper.selectAs(WatchStatUserInfoDayStress::getMaxValue,WatchH5IndexItemNewVo::getDataMax); wrapper.selectAs(WatchStatUserInfoDayStress::getMinValue,WatchH5IndexItemNewVo::getDataMin); wrapper.selectAs(WatchStatUserInfoDayStress::getAvgValue,WatchH5IndexItemNewVo::getDataAvg); - wrapper.selectAs(WatchStatUserInfoDayStress::getDataDate,WatchH5IndexItemNewVo::getDataDate); + wrapper.selectAs(WatchStatUserInfoDayStress::getLastUploadTime,WatchH5IndexItemNewVo::getDataDate); wrapper.eq(WatchStatUserInfoDayStress::getUserId, userId); wrapper.orderByDesc(WatchStatUserInfoDayStress::getDataDate); wrapper.last("limit 1"); @@ -1028,7 +1026,7 @@ public class WatchDataApiServiceImpl implements WatchDataApiService { wrapper.selectAs(WatchStatUserInfoDayTemp::getMaxValue,WatchH5IndexItemNewVo::getDataMax); wrapper.selectAs(WatchStatUserInfoDayTemp::getMinValue,WatchH5IndexItemNewVo::getDataMin); wrapper.selectAs(WatchStatUserInfoDayTemp::getAvgValue,WatchH5IndexItemNewVo::getDataAvg); - wrapper.selectAs(WatchStatUserInfoDayTemp::getDataDate,WatchH5IndexItemNewVo::getDataDate); + wrapper.selectAs(WatchStatUserInfoDayTemp::getLastUploadTime,WatchH5IndexItemNewVo::getDataDate); wrapper.eq(WatchStatUserInfoDayTemp::getUserId, userId); wrapper.orderByDesc(WatchStatUserInfoDayTemp::getDataDate); wrapper.last("limit 1"); diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/amap/service/impl/AmapServiceImpl.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/amap/service/impl/AmapServiceImpl.java index b62e812..330083f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/amap/service/impl/AmapServiceImpl.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/amap/service/impl/AmapServiceImpl.java @@ -19,10 +19,10 @@ import java.nio.charset.StandardCharsets; @Slf4j public class AmapServiceImpl implements AmapService { -// @Value("${amap.key}") + @Value("${amap.key}") private String amapKey; -// @Value("${amap.regeo-url}") + @Value("${amap.regeo-url}") private String regeoUrl; // ===== 核心方法 =====