修正跨24点查询的bug

潘钊
1 parent b72e7f53
Showing 1 changed file with 7 additions and 4 deletions
src/main/java/com/bsth/server_rs/gps/dao/HistoryGpsDao.java
@@ -5,6 +5,8 @@ import com.bsth.server_rs.base_info.car.Car;
 import com.bsth.server_rs.base_info.car.buffer.CarBufferData;
 import com.bsth.server_rs.gps.entity.HistoryGpsEntity;
 import com.bsth.util.DBUtils_MS;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
@@ -53,6 +55,7 @@ public class HistoryGpsDao {
         return list;
     }
+    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
     private List<HistoryGpsEntity> query(String deviceId, Calendar sCal, Calendar eCal) {
         int sDayOfYear = sCal.get(Calendar.DAY_OF_YEAR);
         int eDayOfYear = eCal.get(Calendar.DAY_OF_YEAR);
@@ -65,17 +68,17 @@ public class HistoryGpsDao {
             list = query(sDayOfYear, st, et, deviceId);
         } else {
             // 跨天
-            Long tempSt = 0L, tempEt = 0L;
+            Long tempSt, tempEt;
             for (int i = sDayOfYear; i <= eDayOfYear; i++) {
                 if (i == sDayOfYear) {
                     tempSt = st;
-                    tempEt = DateUtils.getTimesnight(sCal);
+                    tempEt = fmtyyyyMMdd.parseMillis(fmtyyyyMMdd.print(tempSt)) + 1000 * 60 * 60 * 24;
                 } else if (i == eDayOfYear) {
-                    tempSt = DateUtils.getTimesmorning(sCal);
+                    tempSt = fmtyyyyMMdd.parseMillis(fmtyyyyMMdd.print(et));
                     tempEt = et;
                 } else {
-                    tempSt = DateUtils.getTimesmorning(sCal);
+                    tempSt = DateUtils.getTimesmorning(sCal) * 1000;
                     tempEt = DateUtils.getTimesnight(sCal);
                 }