Merge remote-tracking branch 'origin/dev' into dev

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

@@ -87,7 +87,6 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
      *
      * @return
      */
-    @Scheduled(cron = "59 59 23 * * ?")
     public void addAll() {
         Long nowTime = getDayStart();
         Long lastTime = nowTime + 24 * 3600 * 1000 - 1;
@@ -226,6 +225,7 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
      *
      * @return
      */
+    @Scheduled(cron = "0 0 2 * * ?")
     public void add() {
         Long nowTime = getDayStart();
         Long lastTime = nowTime + 24 * 3600 * 1000 - 1;

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleCountRecordController.java

@@ -23,7 +23,7 @@ public class VehicleCountRecordController {
     @GetMapping("/app/unauth/test")
     @ResponseBody
     public ObjectRestResponse add() {
-        vehicleCountRecordBiz.add();
+        vehicleCountRecordBiz.addAll();
         return ObjectRestResponse.succ();
     }
 

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleCountRecordMapper.xml

@@ -29,7 +29,7 @@
           and type = #{type}
       </if>
       <if test="startTime != null">
-          and count_date &gt;= #{startTime} and count_date &lt;= #{endTime}
+          and count_date = #{startTime}
       </if>
     </where>
     order by id DESC