|
@@ -205,26 +205,29 @@ public class IndividualLogApiController {
|
|
|
|
|
|
map.put("date",startDate);
|
|
|
|
|
|
- List<Map<String,Object>> list = new ArrayList<>();
|
|
|
- boolean isDanger = false;
|
|
|
- for (PersonDeviceFilterLog personDeviceFilterLog:personDeviceLogList) {
|
|
|
- Map<String, Object> mapChi = new HashMap<>();
|
|
|
- Date recordTime = personDeviceFilterLog.getRecordTime();
|
|
|
- String hour = f.format(recordTime);
|
|
|
-
|
|
|
- mapChi.put("name",hour+"时");
|
|
|
- mapChi.put("value",personDeviceFilterLog.getTemperature());
|
|
|
- double temperatureDou = Double.parseDouble(personDeviceFilterLog.getTemperature().toString());
|
|
|
- if(temperatureDou>=37){
|
|
|
- isDanger = true;
|
|
|
+ if(personDeviceLogList.size()>0) {
|
|
|
+
|
|
|
+ List<Map<String, Object>> list = new ArrayList<>();
|
|
|
+ boolean isDanger = false;
|
|
|
+ for (PersonDeviceFilterLog personDeviceFilterLog : personDeviceLogList) {
|
|
|
+ Map<String, Object> mapChi = new HashMap<>();
|
|
|
+ Date recordTime = personDeviceFilterLog.getRecordTime();
|
|
|
+ String hour = f.format(recordTime);
|
|
|
+
|
|
|
+ mapChi.put("name", hour + "时");
|
|
|
+ mapChi.put("value", personDeviceFilterLog.getTemperature());
|
|
|
+ double temperatureDou = Double.parseDouble(personDeviceFilterLog.getTemperature().toString());
|
|
|
+ if (temperatureDou >= 37) {
|
|
|
+ isDanger = true;
|
|
|
+ }
|
|
|
+ list.add(mapChi);
|
|
|
}
|
|
|
- list.add(mapChi);
|
|
|
- }
|
|
|
|
|
|
- map.put("list",list);
|
|
|
- map.put("danger",isDanger);
|
|
|
+ map.put("list", list);
|
|
|
+ map.put("danger", isDanger);
|
|
|
|
|
|
- totalList.add(map);
|
|
|
+ totalList.add(map);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
messageResult.setData(totalList);
|