地面车实时数据

ruoyi-admin/src/main/java/com/ruoyi/web/controller/parkLot/ParkLotController.java

@@ -17,6 +17,7 @@ import org.joda.time.format.DateTimeFormatter;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.text.ParseException;
@@ -70,16 +71,22 @@ public class ParkLotController extends BaseController {
      * @return
      */
     @PostMapping("/tempCarInRecords")
-    public TableDataInfo tempCarInRecords(String plateNo, String startTime, String endTime, String pageNo, String pageSize) {
+    public TableDataInfo tempCarInRecords(@Validated @RequestBody TempCarInRecordVo tempCarInRecordVo) {
         //所有固定车车牌
-        ArrayList chargeList = chargeList(plateNo);
+        ArrayList chargeList = chargeList(tempCarInRecordVo.getPlateNo());
         DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
-        DateTime parseStartTime = DateTime.parse(startTime, formatter);
-        DateTime parseEndTime = DateTime.parse(endTime, formatter);
-        startTime = parseStartTime.toString("yyyy-MM-dd'T'HH:mm:ss") + "+08:00";
-        endTime = parseEndTime.toString("yyyy-MM-dd'T'HH:mm:ss") + "+08:00";
+        String startTime = tempCarInRecordVo.getStartTime();
+        String endTime = tempCarInRecordVo.getEndTime();
+        if (StringUtils.isNotBlank(startTime)){
+            DateTime parseStartTime = DateTime.parse(startTime, formatter);
+            startTime = parseStartTime.toString("yyyy-MM-dd'T'HH:mm:ss") + "+08:00";
+        }
+        if (StringUtils.isNotBlank(endTime)){
+            DateTime parseEndTime = DateTime.parse(endTime, formatter);
+            endTime = parseEndTime.toString("yyyy-MM-dd'T'HH:mm:ss") + "+08:00";
+        }
         //获取所有在场车辆
-        String result = GetCameraPreviewURL.GetTempCarInRecordsURL(plateNo, startTime, endTime, pageNo, pageSize);
+        String result = GetCameraPreviewURL.GetTempCarInRecordsURL(tempCarInRecordVo.getPlateNo(), startTime, endTime, tempCarInRecordVo.getPageNo(), tempCarInRecordVo.getPageSize());
         /**
          * {
          *     "code": "0",
@@ -119,11 +126,11 @@ public class ParkLotController extends BaseController {
                     String plateNoTempCarInRecord = jsonObjectTempCarInRecord.getString("plateNo");
                     boolean contains = chargeList.contains(plateNoTempCarInRecord);
                     if (contains){
-                        TempCarInRecordVo tempCarInRecordVo = new TempCarInRecordVo();
-                        tempCarInRecordVo.setPlateNo(plateNoTempCarInRecord);
-                        tempCarInRecordVo.setParkTime(jsonObjectTempCarInRecord.getString("parkTime"));
-                        tempCarInRecordVo.setInTime(zDate(jsonObjectTempCarInRecord.getString("inTime")));
-                        tempCarInRecordList.add(tempCarInRecordVo);
+                        TempCarInRecordVo tempCarInRecord = new TempCarInRecordVo();
+                        tempCarInRecord.setPlateNo(plateNoTempCarInRecord);
+                        tempCarInRecord.setParkTime(jsonObjectTempCarInRecord.getString("parkTime"));
+                        tempCarInRecord.setInTime(zDate(jsonObjectTempCarInRecord.getString("inTime")));
+                        tempCarInRecordList.add(tempCarInRecord);
                     }
                 }
             }

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TempCarInRecordVo.java

@@ -16,6 +16,48 @@ public class TempCarInRecordVo {
      * 入场时间
      */
     private String inTime;
+    /**
+     * 开始时间
+     */
+    private String startTime;
+    /**
+     * 结束时间
+     */
+    private String endTime;
+    private String pageNo;
+    private String pageSize;
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(String pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public String getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(String pageSize) {
+        this.pageSize = pageSize;
+    }
 
     public String getPlateNo() {
         return plateNo;