|
@@ -98,6 +98,7 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
|
|
|
List<Integer> electricList = new ArrayList<>();
|
|
|
List<Double> environmentTempList = new ArrayList<>();
|
|
|
List<Object> averangeTemp = new ArrayList<>();
|
|
|
+ List<Integer> exerciseList = new ArrayList<>();
|
|
|
DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
|
for (EartagDataEntity eartagDataEntity : eartagDataEntities) {
|
|
@@ -105,13 +106,14 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
|
|
|
earTempList.add( eartagDataEntity.getEarTemp() );
|
|
|
electricList.add(eartagDataEntity.getExercise());
|
|
|
environmentTempList.add(eartagDataEntity.getEnvTemp());
|
|
|
-
|
|
|
+ sportsList.add(eartagDataEntity.getExercise());
|
|
|
}
|
|
|
resultMap.put("timeList",timeList);
|
|
|
resultMap.put("earTempList",earTempList);
|
|
|
resultMap.put("electricList",electricList);
|
|
|
resultMap.put("environmentTempList",environmentTempList);
|
|
|
-
|
|
|
+ resultMap.put("sportsList",sportsList);
|
|
|
+ resultMap.put("exerciseList",exerciseList);
|
|
|
return resultMap;
|
|
|
|
|
|
}
|