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

手表数据修改

Browse Source
This commit is contained in:
wanghao
2026-03-05 17:00:18 +08:00
parent 3db3301fe3
commit ad03177e50
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-watch/health-watch-api/src/main/java/com/renkang/watch/WatchH5IndexItemNewVo.java
-7
View File
@@ -83,11 +83,4 @@ public class WatchH5IndexItemNewVo {
this.setWdType(watchH5IndexItemVo.getWdType()); this.setWdType(watchH5IndexItemVo.getWdType());
this.setWdTypeName(watchH5IndexItemVo.getWdTypeName()); 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());
}
} }
health-watch/health-watch-biz/src/main/java/com/renkang/watch/api/service/impl/WatchDataApiServiceImpl.java
+4 -6
View File
@@ -925,8 +925,6 @@ public class WatchDataApiServiceImpl implements WatchDataApiService {
// 睡眠数据特殊处理：dataValue 为空时补 "0" // 睡眠数据特殊处理：dataValue 为空时补 "0"
if ("sleep".equals(itemVo.getWdType()) && StrUtil.isEmpty(data.getDataValue())) { if ("sleep".equals(itemVo.getWdType()) && StrUtil.isEmpty(data.getDataValue())) {
data.setDataValue("0"); data.setDataValue("0");
}else {
} }
list.add(data); list.add(data);
}); });
@@ -986,7 +984,7 @@ public class WatchDataApiServiceImpl implements WatchDataApiService {
wrapper.selectAs(WatchStatUserInfoDayHeartRate::getMaxValue,WatchH5IndexItemNewVo::getDataMax); wrapper.selectAs(WatchStatUserInfoDayHeartRate::getMaxValue,WatchH5IndexItemNewVo::getDataMax);
wrapper.selectAs(WatchStatUserInfoDayHeartRate::getMinValue,WatchH5IndexItemNewVo::getDataMin); wrapper.selectAs(WatchStatUserInfoDayHeartRate::getMinValue,WatchH5IndexItemNewVo::getDataMin);
wrapper.selectAs(WatchStatUserInfoDayHeartRate::getAvgValue,WatchH5IndexItemNewVo::getDataAvg); wrapper.selectAs(WatchStatUserInfoDayHeartRate::getAvgValue,WatchH5IndexItemNewVo::getDataAvg);
wrapper.selectAs(WatchStatUserInfoDayHeartRate::getDataDate,WatchH5IndexItemNewVo::getDataDate); wrapper.selectAs(WatchStatUserInfoDayHeartRate::getLastUploadTime,WatchH5IndexItemNewVo::getDataDate);
wrapper.eq(WatchStatUserInfoDayHeartRate::getUserId, userId); wrapper.eq(WatchStatUserInfoDayHeartRate::getUserId, userId);
wrapper.orderByDesc(WatchStatUserInfoDayHeartRate::getDataDate); wrapper.orderByDesc(WatchStatUserInfoDayHeartRate::getDataDate);
wrapper.last("limit 1"); wrapper.last("limit 1");
@@ -1000,7 +998,7 @@ public class WatchDataApiServiceImpl implements WatchDataApiService {
wrapper.selectAs(WatchStatUserInfoDaySpo2::getMaxValue,WatchH5IndexItemNewVo::getDataMax); wrapper.selectAs(WatchStatUserInfoDaySpo2::getMaxValue,WatchH5IndexItemNewVo::getDataMax);
wrapper.selectAs(WatchStatUserInfoDaySpo2::getMinValue,WatchH5IndexItemNewVo::getDataMin); wrapper.selectAs(WatchStatUserInfoDaySpo2::getMinValue,WatchH5IndexItemNewVo::getDataMin);
wrapper.selectAs(WatchStatUserInfoDaySpo2::getAvgValue,WatchH5IndexItemNewVo::getDataAvg); wrapper.selectAs(WatchStatUserInfoDaySpo2::getAvgValue,WatchH5IndexItemNewVo::getDataAvg);
wrapper.selectAs(WatchStatUserInfoDaySpo2::getDataDate,WatchH5IndexItemNewVo::getDataDate); wrapper.selectAs(WatchStatUserInfoDaySpo2::getLastUploadTime,WatchH5IndexItemNewVo::getDataDate);
wrapper.eq(WatchStatUserInfoDaySpo2::getUserId, userId); wrapper.eq(WatchStatUserInfoDaySpo2::getUserId, userId);
wrapper.orderByDesc(WatchStatUserInfoDaySpo2::getDataDate); wrapper.orderByDesc(WatchStatUserInfoDaySpo2::getDataDate);
wrapper.last("limit 1"); wrapper.last("limit 1");
@@ -1014,7 +1012,7 @@ public class WatchDataApiServiceImpl implements WatchDataApiService {
wrapper.selectAs(WatchStatUserInfoDayStress::getMaxValue,WatchH5IndexItemNewVo::getDataMax); wrapper.selectAs(WatchStatUserInfoDayStress::getMaxValue,WatchH5IndexItemNewVo::getDataMax);
wrapper.selectAs(WatchStatUserInfoDayStress::getMinValue,WatchH5IndexItemNewVo::getDataMin); wrapper.selectAs(WatchStatUserInfoDayStress::getMinValue,WatchH5IndexItemNewVo::getDataMin);
wrapper.selectAs(WatchStatUserInfoDayStress::getAvgValue,WatchH5IndexItemNewVo::getDataAvg); wrapper.selectAs(WatchStatUserInfoDayStress::getAvgValue,WatchH5IndexItemNewVo::getDataAvg);
wrapper.selectAs(WatchStatUserInfoDayStress::getDataDate,WatchH5IndexItemNewVo::getDataDate); wrapper.selectAs(WatchStatUserInfoDayStress::getLastUploadTime,WatchH5IndexItemNewVo::getDataDate);
wrapper.eq(WatchStatUserInfoDayStress::getUserId, userId); wrapper.eq(WatchStatUserInfoDayStress::getUserId, userId);
wrapper.orderByDesc(WatchStatUserInfoDayStress::getDataDate); wrapper.orderByDesc(WatchStatUserInfoDayStress::getDataDate);
wrapper.last("limit 1"); wrapper.last("limit 1");
@@ -1028,7 +1026,7 @@ public class WatchDataApiServiceImpl implements WatchDataApiService {
wrapper.selectAs(WatchStatUserInfoDayTemp::getMaxValue,WatchH5IndexItemNewVo::getDataMax); wrapper.selectAs(WatchStatUserInfoDayTemp::getMaxValue,WatchH5IndexItemNewVo::getDataMax);
wrapper.selectAs(WatchStatUserInfoDayTemp::getMinValue,WatchH5IndexItemNewVo::getDataMin); wrapper.selectAs(WatchStatUserInfoDayTemp::getMinValue,WatchH5IndexItemNewVo::getDataMin);
wrapper.selectAs(WatchStatUserInfoDayTemp::getAvgValue,WatchH5IndexItemNewVo::getDataAvg); wrapper.selectAs(WatchStatUserInfoDayTemp::getAvgValue,WatchH5IndexItemNewVo::getDataAvg);
wrapper.selectAs(WatchStatUserInfoDayTemp::getDataDate,WatchH5IndexItemNewVo::getDataDate); wrapper.selectAs(WatchStatUserInfoDayTemp::getLastUploadTime,WatchH5IndexItemNewVo::getDataDate);
wrapper.eq(WatchStatUserInfoDayTemp::getUserId, userId); wrapper.eq(WatchStatUserInfoDayTemp::getUserId, userId);
wrapper.orderByDesc(WatchStatUserInfoDayTemp::getDataDate); wrapper.orderByDesc(WatchStatUserInfoDayTemp::getDataDate);
wrapper.last("limit 1"); wrapper.last("limit 1");
jeecg-boot-base-core/src/main/java/org/jeecg/common/amap/service/impl/AmapServiceImpl.java
+2 -2
View File
@@ -19,10 +19,10 @@ import java.nio.charset.StandardCharsets;
@Slf4j @Slf4j
public class AmapServiceImpl implements AmapService { public class AmapServiceImpl implements AmapService {
// @Value("${amap.key}") @Value("${amap.key}")
private String amapKey; private String amapKey;
// @Value("${amap.regeo-url}") @Value("${amap.regeo-url}")
private String regeoUrl; private String regeoUrl;
// ===== 核心方法 ===== // ===== 核心方法 =====