return new R<>(map);
}
service层
/**
-
查询一段时间内的折线图
-
@param typeId 查询类型(1:今日,2:7天,3:30天,4:全部,5:其他自定义)
-
@param userId
-
@param startTime
-
@param endTime
-
@return
*/
@Override
public Map<String, Object> getAddTrendLineChart(Integer typeId, Long userId, String startTime, String endTime) throws Exception {
//如果是查询今日的
if (typeId.equals(ReasonEnum.REASON1.getCode())) {
Date dayBegin = NewDateUtil.getDayBegin();
return getTodayChart(dayBegin, userId);
} else if (typeId.equals(ReasonEnum.REASON2.getCode())) {
//查询最近7天的
return getWeekChart(userId, 6);
} else if (typeId.equals(ReasonEnum.REASON3.getCode())) {
//查询最近30天的
return getWeekChart(userId, 29);
} else if (typeId.equals(ReasonEnum.REASON4.getCode())) {
//查询全部的
String endTime2 = NewDateUtil.dateToString(new Date(System.currentTimeMillis()), “yyyy-MM-dd HH:mm:ss”);
String startTime2 = NewDateUtil.dateToString(new Date(1546272000000L), “yyyy-MM-dd HH:mm:ss”);
return getCustomizeChart(userId, startTime2, endTime2);
} else if (typeId.equals(ReasonEnum.REASON5.getCode())) {
//其他自定义
if (StringUtil.isNotNull(startTime) && StringUtil.isNotNull(endTime) && startTime.equals(endTime)) {
Date dayBegin = NewDateUtil.stringToDate(startTime, “yyyy-MM-dd HH:mm:ss”);
return getTodayChart(dayBegin, userId);
} else {
return getCustomizeChart(userId, startTime, endTime);
}
}
throw new RrkException(“typeId查询类型必填,且只能为(1:今日,2:7天,3: