diff --git a/start/src/main/resources/templates/primeport-h5.html b/start/src/main/resources/templates/primeport-h5.html index 6ad3171..dc76b16 100644 --- a/start/src/main/resources/templates/primeport-h5.html +++ b/start/src/main/resources/templates/primeport-h5.html @@ -1,4 +1,4 @@ ---
\ No newline at end of file + })();
\ No newline at end of file diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/EVehicleArrivalDepartureInfoPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/EVehicleArrivalDepartureInfoPageQry.java index 5ae0772..ea18e8d 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/EVehicleArrivalDepartureInfoPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/EVehicleArrivalDepartureInfoPageQry.java @@ -1,6 +1,7 @@ package com.zcloud.primeport.dto; import com.alibaba.cola.dto.PageQuery; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -25,5 +26,13 @@ public class EVehicleArrivalDepartureInfoPageQry extends PageQuery { */ private Integer likeIdSequence; private String vehiclePlateNumber; + @ApiModelProperty(value = "进港开始时间") + private String startVehicleArrivalTime; + @ApiModelProperty(value = "进港结束时间") + private String endVehicleArrivalTime; + @ApiModelProperty(value = "出港开始时间") + private String startVehicleDepartureTime; + @ApiModelProperty(value = "出港结束时间") + private String endVehicleDepartureTime; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjSwipeCardRecordCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjSwipeCardRecordCO.java index 33c18e9..44148a0 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjSwipeCardRecordCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjSwipeCardRecordCO.java @@ -1,12 +1,9 @@ package com.zcloud.primeport.dto.clientobject; import com.alibaba.cola.dto.ClientObject; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.sql.Date; - /** * web-client @@ -21,141 +18,96 @@ public class MkmjSwipeCardRecordCO extends ClientObject { private String swipecardrecordid; //所有卡片消息共享的自增长整型数值，从1开始，门禁子系统重启复位到1 @ApiModelProperty(value = "所有卡片消息共享的自增长整型数值，从1开始，门禁子系统重启复位到1") - private Integer id; + private Long id; //节点编码 - @ApiModelProperty(value = "节点编码") - private String nodecode; + private String nodeCode; //报警编号 - @ApiModelProperty(value = "报警编号") - private String alarmcode; + private String alarmCode; //报警图片路径 - @ApiModelProperty(value = "报警图片路径") - private String alarmpicture; + private String alarmPicture; //节点类型 - @ApiModelProperty(value = "节点类型") - private String nodetype; + private String nodeType; //报警时间，10位时间戳 - @ApiModelProperty(value = "报警时间，10位时间戳") - private Integer alarmdate; + private Long alarmDate; //报警等级 1：严重，2：一般，3：轻微 - @ApiModelProperty(value = "报警等级 1：严重，2：一般，3：轻微") - private Integer alarmgrade; + private Integer alarmGrade; //单元类型 - @ApiModelProperty(value = "单元类型") - private Integer unittype; + private Integer unitType; //报警类型 - @ApiModelProperty(value = "报警类型") - private Integer alarmtype; + private Integer alarmType; //通道序号 - @ApiModelProperty(value = "通道序号") - private Integer channelseq; + private Integer channelSeq; //通道名称 - @ApiModelProperty(value = "通道名称") - private String channelname; + private String channelName; //报警状态 1：报警产生，2：报警消失 - @ApiModelProperty(value = "报警状态 1：报警产生，2：报警消失") - private Integer alarmstat; + private Integer alarmStat; //部门名称 - @ApiModelProperty(value = "部门名称") - private String deptname; + private String deptName; //通道编号 - @ApiModelProperty(value = "通道编号") - private String acschannelcode; + private String acsChannelCode; //口罩状态 3-戴口罩，2-未戴口罩，1-未识别，0-未知 - @ApiModelProperty(value = "口罩状态 3-戴口罩，2-未戴口罩，1-未识别，0-未知") - private Integer maskstate; + private Integer maskState; //进出门类型: 详见 读卡器业务类型字典 - @ApiModelProperty(value = "进出门类型: 详见 读卡器业务类型字典") - private String enterorexit; + private String enterOrExit; //开门类型字符串 - @ApiModelProperty(value = "开门类型字符串") - private String opentypestr; + private String openTypeStr; //刷卡时间，格式：yyyy-MM:dd HH:mm:ss - @ApiModelProperty(value = "刷卡时间，格式：yyyy-MM:dd HH:mm:ss") - private String swingtime; + private String swingTime; //设备名称 - @ApiModelProperty(value = "设备名称") - private String devicename; + private String deviceName; //人员编号 - @ApiModelProperty(value = "人员编号") - private String personcode; + private String personCode; //开门类型, 详见开门类型 字典 - @ApiModelProperty(value = "开门类型, 详见开门类型 字典") - private String opentype; + private String openType; //组织编码 - @ApiModelProperty(value = "组织编码") - private String orgcode; + private String orgCode; //证件类型 - @ApiModelProperty(value = "证件类型") - private String papertype; + private String paperType; //证件号 - @ApiModelProperty(value = "证件号") - private String papernumber; + private String paperNumber; //错误详情 - @ApiModelProperty(value = "错误详情") - private String errordetail; + private String errorDetail; //开门错误码，0代表成功，96代表需远程验证(需结合平台上远程验证功能使用)，其他参考门禁开门错误码 - @ApiModelProperty(value = "开门错误码，0代表成功，96代表需远程验证(需结合平台上远程验证功能使用)，其他参考门禁开门错误码") - private String openfailedcod; + private String openFailedCod; //固定值：evo-accesscontrol - @ApiModelProperty(value = "固定值：evo-accesscontrol") - private String from; +// private String from; //extendId标识 - @ApiModelProperty(value = "extendId标识") - private Long extendid; + private Long extendId; //开始时间, 13位时间戳 - @ApiModelProperty(value = "开始时间, 13位时间戳") - private Long begintime; + private Long beginTime; //通道名称 - @ApiModelProperty(value = "通道名称") - private String acschannelname; + private String acsChannelName; //预留字段，暂未使用，默认值为0 - @ApiModelProperty(value = "预留字段，暂未使用，默认值为0") - private Integer cardstatus; + private Integer cardStatus; //组织名称 - @ApiModelProperty(value = "组织名称") - private String orgname; + private String orgName; //性别 1 男，2 女， 0 未知 - @ApiModelProperty(value = "性别 1 男，2 女， 0 未知") private Integer sex; //人员部门id - @ApiModelProperty(value = "人员部门id") - private Integer deptid; + private Long deptId; //卡类型 - @ApiModelProperty(value = "卡类型") - private Integer cardtype; + private Integer cardType; //设备编号 - @ApiModelProperty(value = "设备编号") - private String devicecode; + private String deviceCode; //人员姓名 - @ApiModelProperty(value = "人员姓名") - private String personname; + private String personName; //刷卡人在平台上的图片，相对路径 - @ApiModelProperty(value = "刷卡人在平台上的图片，相对路径") - private String personimg; + private String personImg; //开门结果 0 失败 1 成功 - @ApiModelProperty(value = "开门结果 0 失败 1 成功") - private Integer openresult; + private Integer openResult; //人员id - @ApiModelProperty(value = "人员id") - private Integer personid; + private Long personId; //抓拍图，相对路径 - @ApiModelProperty(value = "抓拍图，相对路径") - private String recordimage1; + private String recordImage1; //卡介质 0 IC 1 有源RFID 2 CPU - @ApiModelProperty(value = "卡介质 0 IC 1 有源RFID 2 CPU") private String category; //卡号 - @ApiModelProperty(value = "卡号") - private String cardnumber; + private String cardNumber; //rfid子类型，0：普通门禁，1：电动车，2：特殊人群关怀， 3：宠物 - @ApiModelProperty(value = "rfid子类型，0：普通门禁，1：电动车，2：特殊人群关怀， 3：宠物") - private Integer rfidtype; + private Integer rfidType; //年龄 - @ApiModelProperty(value = "年龄") private Integer age; //0-非访客，1-访客 - @ApiModelProperty(value = "0-非访客，1-访客") - private Integer vrecordflag; + private Integer vRecordFlag; } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/EVehicleArrivalDepartureInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/EVehicleArrivalDepartureInfoRepositoryImpl.java index c5ee4f0..20f7f3f 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/EVehicleArrivalDepartureInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/EVehicleArrivalDepartureInfoRepositoryImpl.java @@ -31,6 +31,18 @@ public class EVehicleArrivalDepartureInfoRepositoryImpl extends BaseRepositoryIm IPage iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + if (params.get("startVehicleArrivalTime") != null && !"".equals(params.get("startVehicleArrivalTime"))) { + queryWrapper.ge("vehicle_arrival_time", params.get("startVehicleArrivalTime")); + } + if (params.get("endVehicleArrivalTime") != null && !"".equals(params.get("endVehicleArrivalTime"))) { + queryWrapper.le("vehicle_arrival_time", params.get("endVehicleArrivalTime")); + } + if (params.get("startVehicleDepartureTime") != null && !"".equals(params.get("startVehicleDepartureTime"))) { + queryWrapper.ge("vehicle_departure_time", params.get("startVehicleDepartureTime")); + } + if (params.get("endVehicleDepartureTime") != null && !"".equals(params.get("endVehicleDepartureTime"))) { + queryWrapper.le("vehicle_departure_time", params.get("endVehicleDepartureTime")); + } queryWrapper.orderByDesc("create_time"); IPage result = eVehicleArrivalDepartureInfoMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords());