refactor(): 修改人车记录的时间范围查询参数

web-app/src/main/java/com/zcloud/primeport/service/ClosedAreaServiceImpl.java

@@ -128,9 +128,9 @@ public class ClosedAreaServiceImpl implements ClosedAreaServiceI {
         Map<String, Object> params = new HashMap<>();
         params.put("closedAreaId", qry.getClosedAreaId());
         params.put("personName", qry.getPersonName());
-        if (qry.getTimeRange() != null && qry.getTimeRange().size() == 2) {
+        if (qry.getStartTime() != null) {
-            params.put("startTime", qry.getTimeRange().get(0));
+            params.put("startTime", qry.getStartTime());
-            params.put("endTime", qry.getTimeRange().get(1));
+            params.put("endTime", qry.getEndTime());
         }
         params.put("pageIndex", qry.getPageIndex());
         params.put("pageSize", qry.getPageSize());
@@ -142,13 +142,13 @@ public class ClosedAreaServiceImpl implements ClosedAreaServiceI {
         Map<String, Object> params = new HashMap<>();
         params.put("closedAreaId", qry.getClosedAreaId());
         params.put("vehiclePlateNumber", qry.getVehiclePlateNumber());
-        if (qry.getVehicleArrivalTime() != null && qry.getVehicleArrivalTime().size() == 2) {
+        if (qry.getArrivalStartTime() != null) {
-            params.put("arrivalStartTime", qry.getVehicleArrivalTime().get(0));
+            params.put("arrivalStartTime", qry.getArrivalStartTime());
-            params.put("arrivalEndTime", qry.getVehicleArrivalTime().get(1));
+            params.put("arrivalEndTime", qry.getArrivalEndTime());
         }
-        if (qry.getVehicleDepartureTime() != null && qry.getVehicleDepartureTime().size() == 2) {
+        if (qry.getDepartureStartTime() != null) {
-            params.put("departureStartTime", qry.getVehicleDepartureTime().get(0));
+            params.put("departureStartTime", qry.getDepartureStartTime());
-            params.put("departureEndTime", qry.getVehicleDepartureTime().get(1));
+            params.put("departureEndTime", qry.getDepartureEndTime());
         }
         params.put("pageIndex", qry.getPageIndex());
         params.put("pageSize", qry.getPageSize());

web-client/src/main/java/com/zcloud/primeport/dto/PersonInOutRecordQry.java

@@ -25,6 +25,9 @@ public class PersonInOutRecordQry extends PageQuery {
     @ApiModelProperty(value = "人员姓名（模糊查询）", name = "personName")
     private String personName;
 
-    @ApiModelProperty(value = "时间范围（格式：yyyy-MM-dd）", name = "timeRange")
+    @ApiModelProperty(value = "开始时间（格式：yyyy-MM-dd）", name = "startTime")
-    private List<String> timeRange;
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间（格式：yyyy-MM-dd）", name = "endTime")
+    private String endTime;
 }

web-client/src/main/java/com/zcloud/primeport/dto/VehicleInOutRecordQry.java

@@ -25,9 +25,15 @@ public class VehicleInOutRecordQry extends PageQuery {
     @ApiModelProperty(value = "车牌号（模糊查询）", name = "vehiclePlateNumber")
     private String vehiclePlateNumber;
 
-    @ApiModelProperty(value = "进场时间范围（格式：yyyy-MM-dd）", name = "vehicleArrivalTime")
+    @ApiModelProperty(value = "进场开始时间（格式：yyyy-MM-dd）", name = "ArrivalStartTime")
-    private List<String> vehicleArrivalTime;
+    private String arrivalStartTime;
 
-    @ApiModelProperty(value = "出场时间范围（格式：yyyy-MM-dd）", name = "vehicleDepartureTime")
+    @ApiModelProperty(value = "进场结束时间（格式：yyyy-MM-dd）", name = "ArrivalEndTime")
-    private List<String> vehicleDepartureTime;
+    private String arrivalEndTime;
+
+    @ApiModelProperty(value = "出场开始时间（格式：yyyy-MM-dd）", name = "departureTime")
+    private String departureStartTime;
+
+    @ApiModelProperty(value = "出场结束时间（格式：yyyy-MM-dd）", name = "departureTime")
+    private String departureEndTime;
 }

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/HkAccessRecordDO.java

@@ -1,6 +1,7 @@
 package com.zcloud.primeport.persistence.dataobject;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -64,9 +65,11 @@ public class HkAccessRecordDO extends BaseDO {
     private String cardNo;
 
     @ApiModelProperty(value = "事件发生时间（通行时间）", name = "eventTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime eventTime;
 
     @ApiModelProperty(value = "海康平台入库时间", name = "hkCreateTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime hkCreateTime;
 
     @ApiModelProperty(value = "通行抓拍图片地址", name = "recordImageUrl")
@@ -79,5 +82,6 @@ public class HkAccessRecordDO extends BaseDO {
     private String rawData;
 
     @ApiModelProperty(value = "最近同步时间", name = "lastSyncTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime lastSyncTime;
 }

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/HkVehicleAccessRecordDO.java

@@ -1,6 +1,7 @@
 package com.zcloud.primeport.persistence.dataobject;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -58,9 +59,11 @@ public class HkVehicleAccessRecordDO extends BaseDO {
     private Integer enterOrExit;
 
     @ApiModelProperty(value = "事件发生时间（通行时间）", name = "eventTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime eventTime;
 
     @ApiModelProperty(value = "海康平台入库时间", name = "hkCreateTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime hkCreateTime;
 
     @ApiModelProperty(value = "通行抓拍图片地址", name = "recordImageUrl")
@@ -73,5 +76,6 @@ public class HkVehicleAccessRecordDO extends BaseDO {
     private String rawData;
 
     @ApiModelProperty(value = "最近同步时间", name = "lastSyncTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime lastSyncTime;
 }