|
@@ -276,7 +276,7 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
|
|
|
List<Integer> sportsList = new ArrayList<>();
|
|
|
List<Integer> electricList = new ArrayList<>();
|
|
|
List<Double> environmenttempList = new ArrayList<>();
|
|
|
- List<String> averangeTemp = new ArrayList<>();
|
|
|
+ List<Object> averangeTemp = new ArrayList<>();
|
|
|
for (EartagDataEntity data : eartagDateEntities) {
|
|
|
timeList.add(fmt.format(data.getTime()));
|
|
|
tempList.add(data.getEarTemp());
|
|
@@ -288,7 +288,7 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
|
|
|
electricList.add(data.getBat());
|
|
|
//sleeptime.add(data.getSleepStatus()); 用来存睡眠状态了
|
|
|
environmenttempList.add(data.getEnvTemp());
|
|
|
- averangeTemp.add(getMonthDayHour(data.getTime()) );
|
|
|
+ averangeTemp.add(averange.get(getMonthDayHour( data.getTime() ) ) );
|
|
|
}
|
|
|
|
|
|
map1.put("time",timeList);
|