Browse Source

最近14天曲线图接口

yanliming 5 năm trước cách đây
mục cha
commit
19e036cab8

+ 20 - 17
web/src/main/java/com/jpsoft/smart/modules/mobile/controller/IndividualLogApiController.java

@@ -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);