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 15:53:40 +08:00
parent 3cea926a1e
commit fa9a186a5e
4 changed files with 29 additions and 12 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
+9 -2
View File
@@ -19,8 +19,8 @@ public class WatchH5IndexItemNewVo {
@Schema(title = "数据类型名称") @Schema(title = "数据类型名称")
private String wdTypeName; private String wdTypeName;
@Schema(title = "最新数据日期") @Schema(title = "最新数据日期")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date dataDate; private Date dataDate;
/** /**
* 注意 当wdType=sleep时此字段返回长睡时长 * 注意 当wdType=sleep时此字段返回长睡时长
@@ -83,4 +83,11 @@ 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-api/src/main/java/com/renkang/watch/vo/UserData/res/UserStat.java
+13 -5
View File
@@ -49,11 +49,19 @@ public class UserStat {
default: default:
break; break;
} }
this.latest = parseSafe(watchH5IndexItemNewVo.getDataValue()); if (watchH5IndexItemNewVo.getWdType().equals("sleep")) {
this.max = parseSafe(watchH5IndexItemNewVo.getDataMax()); this.latest = parseSafe(watchH5IndexItemNewVo.getDataMax());// 总时长
this.min = parseSafe(watchH5IndexItemNewVo.getDataMin()); this.max = parseSafe(watchH5IndexItemNewVo.getDataMax());
this.avg = parseSafe(watchH5IndexItemNewVo.getDataAvg()); this.min = parseSafe(watchH5IndexItemNewVo.getDataMin());
this.latestTime = watchH5IndexItemNewVo.getDataDate(); 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();
}
} }
/** /**
health-watch/health-watch-biz/src/main/java/com/renkang/watch/api/service/impl/WatchDataApiServiceImpl.java
+5 -3
View File
@@ -925,6 +925,8 @@ 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);
}); });
@@ -967,10 +969,10 @@ public class WatchDataApiServiceImpl implements WatchDataApiService {
MPJLambdaWrapper<WatchStatUserInfoDaySleep> wrapper = new MPJLambdaWrapper<>(); MPJLambdaWrapper<WatchStatUserInfoDaySleep> wrapper = new MPJLambdaWrapper<>();
//因为睡眠详情页取的是长睡时长作为当天的睡眠时间 , 所以这里保持一致并没有取当天的睡眠总时长 //因为睡眠详情页取的是长睡时长作为当天的睡眠时间 , 所以这里保持一致并没有取当天的睡眠总时长
wrapper.selectAs(WatchStatUserInfoDaySleep::getLongDurationTotal,WatchH5IndexItemNewVo::getDataValue); wrapper.selectAs(WatchStatUserInfoDaySleep::getLongDurationTotal,WatchH5IndexItemNewVo::getDataValue);
wrapper.selectAs(WatchStatUserInfoDaySleep::getLongDurationTotal,WatchH5IndexItemNewVo::getDataMax); wrapper.selectAs(WatchStatUserInfoDaySleep::getDeepSleepTimes,WatchH5IndexItemNewVo::getDataMax);
wrapper.selectAs(WatchStatUserInfoDaySleep::getShortDurationTotal,WatchH5IndexItemNewVo::getDataMin); wrapper.selectAs(WatchStatUserInfoDaySleep::getLightSleepTimes,WatchH5IndexItemNewVo::getDataMin);
wrapper.selectAs(WatchStatUserInfoDaySleep::getSleepAvg,WatchH5IndexItemNewVo::getDataAvg); wrapper.selectAs(WatchStatUserInfoDaySleep::getSleepAvg,WatchH5IndexItemNewVo::getDataAvg);
wrapper.selectAs(WatchStatUserInfoDaySleep::getDataDate,WatchH5IndexItemNewVo::getDataDate); wrapper.selectAs(WatchStatUserInfoDaySleep::getLastUploadTime,WatchH5IndexItemNewVo::getDataDate);
wrapper.eq(WatchStatUserInfoDaySleep::getUserId, userId); wrapper.eq(WatchStatUserInfoDaySleep::getUserId, userId);
wrapper.orderByDesc(WatchStatUserInfoDaySleep::getDataDate); wrapper.orderByDesc(WatchStatUserInfoDaySleep::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;
// ===== 核心方法 ===== // ===== 核心方法 =====