Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 60f91638 by 杨伟程
Options

周睡眠图表

parent 02e960da
Inline Side-by-side
Showing with 72 additions and 9 deletions
db/device-attribute.json 0 → 100644
{
"radarMount": {
"name": "雷达安装方式",
"type": "select",
"option": [{
"value": "0",
"name": "侧装"
},
{
"value": "1",
"name": "顶装"
}
]
},
"radarHight": {
"name": "雷达安装方式",
"type": "input",
"desc": "\"最小值\":200,\"最大值\":380,\"步进\":1,\"单位\":\"cm\""
}
}
\ No newline at end of file
server-common/src/main/java/com/makeit/config/mybatis/objecthandler/UserObjectHandler.java
...@@ -6,12 +6,17 @@ import com.makeit.global.aspect.misc.nofill.NoFillUtil; ...@@ -6,12 +6,17 @@ import com.makeit.global.aspect.misc.nofill.NoFillUtil;
import com.makeit.utils.user.common.CommonUserUtil; import com.makeit.utils.user.common.CommonUserUtil;
import com.makeit.utils.user.common.CommonUserVO; import com.makeit.utils.user.common.CommonUserVO;
import org.apache.ibatis.reflection.MetaObject; import org.apache.ibatis.reflection.MetaObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Order(30) @Order(30)
@Component @Component
public class UserObjectHandler implements MetaObjectHandlerInternal { public class UserObjectHandler implements MetaObjectHandlerInternal {
private Logger logger = LoggerFactory.getLogger(UserObjectHandler.class);
@Override @Override
public boolean support(MetaObject metaObject, MetaObjectHandler handler) { public boolean support(MetaObject metaObject, MetaObjectHandler handler) {
return CommonUserUtil.getUser() != null; return CommonUserUtil.getUser() != null;
...@@ -21,6 +26,8 @@ public class UserObjectHandler implements MetaObjectHandlerInternal { ...@@ -21,6 +26,8 @@ public class UserObjectHandler implements MetaObjectHandlerInternal {
public void insertFill(MetaObject metaObject, MetaObjectHandler handler) { public void insertFill(MetaObject metaObject, MetaObjectHandler handler) {
CommonUserVO commonUserVO = CommonUserUtil.getUser(); CommonUserVO commonUserVO = CommonUserUtil.getUser();
logger.info("user:{}",commonUserVO);
// if (metaObject.hasSetter(BaseEntity.Fields.createdByName) // if (metaObject.hasSetter(BaseEntity.Fields.createdByName)
// && handler.getFieldValByName(BaseEntity.Fields.createdByName, metaObject) == null) { // && handler.getFieldValByName(BaseEntity.Fields.createdByName, metaObject) == null) {
// handler.setFieldValByName(BaseEntity.Fields.createdByName, commonUserVO.getName(), metaObject); // handler.setFieldValByName(BaseEntity.Fields.createdByName, commonUserVO.getName(), metaObject);
......
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportWeekServiceImpl.java
...@@ -131,7 +131,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek ...@@ -131,7 +131,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
} }
private LocalDate weekEndDate(LocalDateTime defaultTime) { private LocalDate weekEndDate(LocalDateTime defaultTime) {
return weekStartDate(LocalDate.now().minusDays(1), defaultTime); return weekEndDate(LocalDate.now().minusDays(1), defaultTime);
} }
private LocalDate weekEndDate(LocalDate now, LocalDateTime defaultTime) { private LocalDate weekEndDate(LocalDate now, LocalDateTime defaultTime) {
...@@ -213,7 +213,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek ...@@ -213,7 +213,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
public PlatElderSleepEvaluationVO sleepEvaluation(PlatElderReportDTO platElderIdDTO) { public PlatElderSleepEvaluationVO sleepEvaluation(PlatElderReportDTO platElderIdDTO) {
LocalDate weekStartDate = weekStartDate(platElderIdDTO.getStartTime()); LocalDate weekStartDate = weekStartDate(platElderIdDTO.getStartTime());
LocalDate weekEndDate = weekStartDate(platElderIdDTO.getEndTime()); LocalDate weekEndDate = weekEndDate(platElderIdDTO.getEndTime());
return sleepEvaluationInternal(platElderIdDTO, weekStartDate, weekEndDate); return sleepEvaluationInternal(platElderIdDTO, weekStartDate, weekEndDate);
...@@ -230,7 +230,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek ...@@ -230,7 +230,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
public PlatElderSleepDiagramWeekVO sleepDiagram(PlatElderReportDTO platElderIdDTO) { public PlatElderSleepDiagramWeekVO sleepDiagram(PlatElderReportDTO platElderIdDTO) {
LocalDate weekStartDate = weekStartDate(platElderIdDTO.getStartTime()); LocalDate weekStartDate = weekStartDate(platElderIdDTO.getStartTime());
LocalDate weekEndDate = weekStartDate(platElderIdDTO.getEndTime()); LocalDate weekEndDate = weekEndDate(platElderIdDTO.getEndTime());
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
...@@ -279,8 +279,36 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek ...@@ -279,8 +279,36 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
}); });
return null; List<PlatElderSleepDiagramWeekContentVO> rest = StreamUtil.map(dateList, e -> {
PlatElderSleepDiagramWeekContentVO vo = new PlatElderSleepDiagramWeekContentVO();
vo.setDay(e);
List<PlatElderSleep> list = Optional.ofNullable(sleepMap.get(2)).map(i -> i.get(dateTimeFormatter.format(e))).orElse(new ArrayList<>(10));
List<PlatSleepRangeVO> sleepRecord = list.stream().flatMap(i -> Optional.ofNullable(i.getSleepRecord()).orElse(new ArrayList<>(10)).stream()).collect(Collectors.toList());
vo.setSleepDeepDuration(sleepRecord.stream().filter(i -> SleepTypeEnum.SLEEP_DEEP.getCode().equals(i.getSleepType())).map(i -> duration(timeFormatter, i.getStartTime(), i.getEndTime())).reduce(0L, Long::sum).intValue());
vo.setSleepModerateDuration(sleepRecord.stream().filter(i -> SleepTypeEnum.SLEEP_MODERATE.getCode().equals(i.getSleepType())).map(i -> duration(timeFormatter, i.getStartTime(), i.getEndTime())).reduce(0L, Long::sum).intValue());
vo.setSleepLightnessDuration(sleepRecord.stream().filter(i -> SleepTypeEnum.SLEEP_LIGHTNESS.getCode().equals(i.getSleepType())).map(i -> duration(timeFormatter, i.getStartTime(), i.getEndTime())).reduce(0L, Long::sum).intValue());
vo.setSoberDuration(sleepRecord.stream().filter(i -> SleepTypeEnum.SOBER.getCode().equals(i.getSleepType())).map(i -> duration(timeFormatter, i.getStartTime(), i.getEndTime())).reduce(0L, Long::sum).intValue());
PlatElderSleepAnalysis platElderSleepAnalysis = sleepAnalysisMap.get(dateTimeFormatter.format(e));
if (platElderSleepAnalysis != null) {
vo.setTurnedCount(platElderSleepAnalysis.getTurnedCount());
vo.setBodyMoveCount(platElderSleepAnalysis.getActionCount());
vo.setScore(Integer.valueOf(platElderSleepAnalysis.getSleepScore() + ""));
}
return vo;
});
PlatElderSleepDiagramWeekVO vo = new PlatElderSleepDiagramWeekVO();
vo.setSleep(sleep);
vo.setRest(rest);
return vo;
} }
@Override @Override
...@@ -317,7 +345,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek ...@@ -317,7 +345,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
public PlatElderHeartRespiratoryEvaluationVO heartRespiratoryEvaluation(PlatElderReportDTO platElderIdDTO) { public PlatElderHeartRespiratoryEvaluationVO heartRespiratoryEvaluation(PlatElderReportDTO platElderIdDTO) {
LocalDate weekStartDate = weekStartDate(platElderIdDTO.getStartTime()); LocalDate weekStartDate = weekStartDate(platElderIdDTO.getStartTime());
LocalDate weekEndDate = weekStartDate(platElderIdDTO.getEndTime()); LocalDate weekEndDate = weekEndDate(platElderIdDTO.getEndTime());
return heartRespiratoryEvaluationInternal(platElderIdDTO, weekStartDate, weekEndDate); return heartRespiratoryEvaluationInternal(platElderIdDTO, weekStartDate, weekEndDate);
...@@ -346,7 +374,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek ...@@ -346,7 +374,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
public List<PlatElderRealTimeHeartRespiratoryWeekVO> heartRespiratory(PlatElderReportDTO platElderIdDTO) { public List<PlatElderRealTimeHeartRespiratoryWeekVO> heartRespiratory(PlatElderReportDTO platElderIdDTO) {
LocalDate weekStartDate = weekStartDate(platElderIdDTO.getStartTime()); LocalDate weekStartDate = weekStartDate(platElderIdDTO.getStartTime());
LocalDate weekEndDate = weekStartDate(platElderIdDTO.getEndTime()); LocalDate weekEndDate = weekEndDate(platElderIdDTO.getEndTime());
List<LocalDate> dateList = LocalDateTimeUtils.getDateSeries(weekStartDate, weekEndDate); List<LocalDate> dateList = LocalDateTimeUtils.getDateSeries(weekStartDate, weekEndDate);
...@@ -427,7 +455,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek ...@@ -427,7 +455,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
public List<PlatElderBehaviorDistributionVO> behaviorDistribution(PlatElderReportDTO platElderIdDTO) { public List<PlatElderBehaviorDistributionVO> behaviorDistribution(PlatElderReportDTO platElderIdDTO) {
LocalDate weekStartDate = weekStartDate(platElderIdDTO.getStartTime()); LocalDate weekStartDate = weekStartDate(platElderIdDTO.getStartTime());
LocalDate weekEndDate = weekStartDate(platElderIdDTO.getEndTime()); LocalDate weekEndDate = weekEndDate(platElderIdDTO.getEndTime());
List<LocalDate> dateList = LocalDateTimeUtils.getDateSeries(weekStartDate, weekEndDate); List<LocalDate> dateList = LocalDateTimeUtils.getDateSeries(weekStartDate, weekEndDate);
......
server-service/src/main/java/com/makeit/service/wechat/impl/PlatElderChildrenInfoUserLoginWechatServiceImpl.java
...@@ -3,11 +3,14 @@ package com.makeit.service.wechat.impl; ...@@ -3,11 +3,14 @@ package com.makeit.service.wechat.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.makeit.dto.platform.auth.PlatOrgSplitDTO; import com.makeit.dto.platform.auth.PlatOrgSplitDTO;
import com.makeit.entity.platform.elder.PlatElderChildrenInfo; import com.makeit.entity.platform.elder.PlatElderChildrenInfo;
import com.makeit.enums.Const;
import com.makeit.enums.HeaderConst;
import com.makeit.service.platform.auth.PlatOrgService; import com.makeit.service.platform.auth.PlatOrgService;
import com.makeit.service.platform.elder.PlatElderChildrenInfoService; import com.makeit.service.platform.elder.PlatElderChildrenInfoService;
import com.makeit.service.wechat.PlatElderChildrenInfoUserLoginWechatService; import com.makeit.service.wechat.PlatElderChildrenInfoUserLoginWechatService;
import com.makeit.utils.data.convert.BeanDtoVoUtils; import com.makeit.utils.data.convert.BeanDtoVoUtils;
import com.makeit.utils.data.id.IdGen; import com.makeit.utils.data.id.IdGen;
import com.makeit.utils.request.RequestUtil;
import com.makeit.utils.sys.FileUtil; import com.makeit.utils.sys.FileUtil;
import com.makeit.utils.third.wechat.WechatLoginPhoneDTO; import com.makeit.utils.third.wechat.WechatLoginPhoneDTO;
import com.makeit.utils.third.wechat.WxUserInfo; import com.makeit.utils.third.wechat.WxUserInfo;
...@@ -57,7 +60,9 @@ public class PlatElderChildrenInfoUserLoginWechatServiceImpl implements PlatElde ...@@ -57,7 +60,9 @@ public class PlatElderChildrenInfoUserLoginWechatServiceImpl implements PlatElde
childrenInfo.setPhone(userInfo.getPhoneNumber()); childrenInfo.setPhone(userInfo.getPhoneNumber());
childrenInfo.setAvatar(userInfo.getAvatarUrl()); childrenInfo.setAvatar(userInfo.getAvatarUrl());
platElderChildrenInfoService.saveOrUpdate(childrenInfo); String token = IdGen.getUUID();
RequestUtil.setHeader(HeaderConst.WECHAT_TOKEN, token);
WechatUserInfo wechatUserVo = BeanDtoVoUtils.convert(childrenInfo, WechatUserInfo.class); WechatUserInfo wechatUserVo = BeanDtoVoUtils.convert(childrenInfo, WechatUserInfo.class);
...@@ -65,11 +70,13 @@ public class PlatElderChildrenInfoUserLoginWechatServiceImpl implements PlatElde ...@@ -65,11 +70,13 @@ public class PlatElderChildrenInfoUserLoginWechatServiceImpl implements PlatElde
u.setAvatarPath(f.getFullUrl()); u.setAvatarPath(f.getFullUrl());
}); });
String token = IdGen.getUUID();
wechatUserVo.setToken(token); wechatUserVo.setToken(token);
TokenUtil.wechatLogin(token, wechatUserVo); TokenUtil.wechatLogin(token, wechatUserVo);
platElderChildrenInfoService.saveOrUpdate(childrenInfo);
return wechatUserVo; return wechatUserVo;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment