This commit is contained in:
feng
2026-01-23 16:57:32 +08:00
parent a58a007809
commit 654a842ed9
@@ -519,31 +519,49 @@ public class WatchServiceImpl implements IWatchService {
switch (watchH5IndexItemVo.getWdType()) { switch (watchH5IndexItemVo.getWdType()) {
case "sleep": case "sleep":
WatchH5IndexItemNewVo sleepData = futureSleepData.get(); WatchH5IndexItemNewVo sleepData = futureSleepData.get();
if(ObjectUtil.isNull(sleepData)){
sleepData = new WatchH5IndexItemNewVo();
}
sleepData.fieldCopy(watchH5IndexItemVo); sleepData.fieldCopy(watchH5IndexItemVo);
list.add(sleepData); list.add(sleepData);
break; break;
case "steps": case "steps":
WatchH5IndexItemNewVo stepsData = futureStepsData.get(); WatchH5IndexItemNewVo stepsData = futureStepsData.get();
if(ObjectUtil.isNull(stepsData)){
stepsData = new WatchH5IndexItemNewVo();
}
stepsData.fieldCopy(watchH5IndexItemVo); stepsData.fieldCopy(watchH5IndexItemVo);
list.add(stepsData); list.add(stepsData);
break; break;
case "heart_rate": case "heart_rate":
WatchH5IndexItemNewVo heartData = futureHeartRateData.get(); WatchH5IndexItemNewVo heartData = futureHeartRateData.get();
if(ObjectUtil.isNull(heartData)){
heartData = new WatchH5IndexItemNewVo();
}
heartData.fieldCopy(watchH5IndexItemVo); heartData.fieldCopy(watchH5IndexItemVo);
list.add(heartData); list.add(heartData);
break; break;
case "spo2": case "spo2":
WatchH5IndexItemNewVo apo2Data = futureSpo2Data.get(); WatchH5IndexItemNewVo apo2Data = futureSpo2Data.get();
if(ObjectUtil.isNull(apo2Data)){
apo2Data = new WatchH5IndexItemNewVo();
}
apo2Data.fieldCopy(watchH5IndexItemVo); apo2Data.fieldCopy(watchH5IndexItemVo);
list.add(apo2Data); list.add(apo2Data);
break; break;
case "stress": case "stress":
WatchH5IndexItemNewVo stressData = futureStressData.get(); WatchH5IndexItemNewVo stressData = futureStressData.get();
if(ObjectUtil.isNull(stressData)){
stressData = new WatchH5IndexItemNewVo();
}
stressData.fieldCopy(watchH5IndexItemVo); stressData.fieldCopy(watchH5IndexItemVo);
list.add(stressData); list.add(stressData);
break; break;
case "temperature": case "temperature":
WatchH5IndexItemNewVo tempData = futureTempData.get(); WatchH5IndexItemNewVo tempData = futureTempData.get();
if(ObjectUtil.isNull(tempData)){
tempData = new WatchH5IndexItemNewVo();
}
tempData.fieldCopy(watchH5IndexItemVo); tempData.fieldCopy(watchH5IndexItemVo);
list.add(tempData); list.add(tempData);
break; break;