Quellcode durchsuchen

温度曲线接口修改。

tomatozq vor 5 Jahren
Ursprung
Commit
785a394b96

+ 9 - 3
web/src/main/java/com/jpsoft/smart/modules/mobile/controller/IndividualLogApiController.java

@@ -214,12 +214,18 @@ public class IndividualLogApiController {
                 String startDate = curDay.toString("yyyy-MM-dd");
                 String endDate = curDay.plusDays(1).toString("yyyy-MM-dd");
 
-                PersonDeviceFilterLog personDeviceFilterLog;
+                PersonDeviceFilterLog personDeviceFilterLog=null;
 
                 if (lastDateStr.equals(startDate) && lastPersonLog!=null){
-                    personDeviceFilterLog = lastPersonLog;
+                    //当天最后一条记录
+                    DateTime recordTime = new DateTime(lastPersonLog.getRecordTime());
+
+                    if(recordTime.toString("yyyy-MM-dd").equals(startDate)) {
+                        personDeviceFilterLog = lastPersonLog;
+                    }
                 }
-                else{
+
+                if(personDeviceFilterLog==null){
                     personDeviceFilterLog = personDeviceFilterLogService.findByPersonOrderTemperature(person.getId(), startDate, endDate);
                 }