Merge branch 'master-count-vehicle' into base-modify

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleCountRecordBiz.java

@@ -295,7 +295,7 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
      *
      * @return
      */
-    @Scheduled(cron = "0 */5 * * * *")
+    @Scheduled(cron = "0 0 */2 * * *")
     public void add() {
         Long nowTime = getDayStart();
         Long lastTime = nowTime + 24 * 3600 * 1000 - 1;
@@ -323,6 +323,13 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
             vehicleCountRecord.setDepartureNum(vehicleDepartureList.size());
         }
         Map<String, Object> param = new HashMap<>();
+        SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            startDate = simpleDateFormat1.format(startTime);
+            endDate = simpleDateFormat1.format(endTime);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         param.put("startTime", DateTime.parse(startDate, DATE_TIME_FORMATTER).toDate());
         param.put("endTime", DateTime.parse(endDate, DATE_TIME_FORMATTER).toDate());
         //1代表出车 2代表还车