zcloud_gbs
/
zcloud-gbs-primeport
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed：补充一级口门车辆进出信息

koumen
dearLin 2026-05-28 14:12:55 +08:00
parent d1a1590752
commit 7e6bb4d60a
4 changed files with 66 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
start/src/main/resources/templates/primeport-h5.html
View File

@ -1,4 +1,4 @@
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/5/27 16:48:47] App_Identifier[primeport-h5]"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin"/><title>--</title><script>(function () { <!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/5/28 09:54:48] App_Identifier[primeport-h5]"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin"/><title>--</title><script>(function () {
const APP_ENV = { const APP_ENV = {
antd: { antd: {
'ant-prefix': 'micro-temp', 'ant-prefix': 'micro-temp',
@ -20,4 +20,4 @@
redirect: '', redirect: '',
FRAMEWORK: APP_ENV.antd FRAMEWORK: APP_ENV.antd
}; };
})();</script><script defer="defer" src="/primeport-h5/static/js/942.02e830144bca35fa.js"></script><script defer="defer" src="/primeport-h5/static/js/98.5724b20f0ef70ebd.js"></script><script defer="defer" src="/primeport-h5/static/js/main.6d88c1b51621a6e1.js"></script><link href="/primeport-h5/static/css/main.de5125c7f5780dd6.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto;"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息 */console.log("%c@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/5/27 16:48:47] App_Identifier[primeport-h5] Frontend_Branch[master] Backend_Branch[<branch-name>]", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html> })();</script><script defer="defer" src="/primeport-h5/static/js/942.02e830144bca35fa.js"></script><script defer="defer" src="/primeport-h5/static/js/98.5724b20f0ef70ebd.js"></script><script defer="defer" src="/primeport-h5/static/js/main.74657542ff23a7c3.js"></script><link href="/primeport-h5/static/css/main.de5125c7f5780dd6.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto;"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息 */console.log("%c@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/5/28 09:54:48] App_Identifier[primeport-h5] Frontend_Branch[master] Backend_Branch[<branch-name>]", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>

9
web-client/src/main/java/com/zcloud/primeport/dto/EVehicleArrivalDepartureInfoPageQry.java
View File

@ -1,6 +1,7 @@
package com.zcloud.primeport.dto; package com.zcloud.primeport.dto;
import com.alibaba.cola.dto.PageQuery; import com.alibaba.cola.dto.PageQuery;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -25,5 +26,13 @@ public class EVehicleArrivalDepartureInfoPageQry extends PageQuery {
*/ */
private Integer likeIdSequence; private Integer likeIdSequence;
private String vehiclePlateNumber; private String vehiclePlateNumber;
@ApiModelProperty(value = "进港开始时间")
private String startVehicleArrivalTime;
@ApiModelProperty(value = "进港结束时间")
private String endVehicleArrivalTime;
@ApiModelProperty(value = "出港开始时间")
private String startVehicleDepartureTime;
@ApiModelProperty(value = "出港结束时间")
private String endVehicleDepartureTime;
} }

134
web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjSwipeCardRecordCO.java
View File

@ -1,12 +1,9 @@
package com.zcloud.primeport.dto.clientobject; package com.zcloud.primeport.dto.clientobject;
import com.alibaba.cola.dto.ClientObject; import com.alibaba.cola.dto.ClientObject;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.sql.Date;
/** /**
* web-client * web-client
@ -21,141 +18,96 @@ public class MkmjSwipeCardRecordCO extends ClientObject {
private String swipecardrecordid; private String swipecardrecordid;
//所有卡片消息共享的自增长整型数值，从1开始，门禁子系统重启复位到1 //所有卡片消息共享的自增长整型数值，从1开始，门禁子系统重启复位到1
@ApiModelProperty(value = "所有卡片消息共享的自增长整型数值，从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位时间戳 //报警时间，10位时间戳
@ApiModelProperty(value = "报警时间，10位时间戳") private Long alarmDate;
private Integer alarmdate;
//报警等级 1：严重，2：一般，3：轻微 //报警等级 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：报警消失 //报警状态 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-未知 //口罩状态 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 //刷卡时间，格式：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代表需远程验证(需结合平台上远程验证功能使用)，其他参考门禁开门错误码 //开门错误码，0代表成功，96代表需远程验证(需结合平台上远程验证功能使用)，其他参考门禁开门错误码
@ApiModelProperty(value = "开门错误码，0代表成功，96代表需远程验证(需结合平台上远程验证功能使用)，其他参考门禁开门错误码") private String openFailedCod;
private String openfailedcod;
//固定值：evo-accesscontrol //固定值：evo-accesscontrol
@ApiModelProperty(value = "固定值：evo-accesscontrol") // private String from;
private String from;
//extendId标识 //extendId标识
@ApiModelProperty(value = "extendId标识") private Long extendId;
private Long extendid;
//开始时间, 13位时间戳 //开始时间, 13位时间戳
@ApiModelProperty(value = "开始时间, 13位时间戳") private Long beginTime;
private Long begintime;
//通道名称 //通道名称
@ApiModelProperty(value = "通道名称") private String acsChannelName;
private String acschannelname;
//预留字段，暂未使用，默认值为0 //预留字段，暂未使用，默认值为0
@ApiModelProperty(value = "预留字段，暂未使用，默认值为0") private Integer cardStatus;
private Integer cardstatus;
//组织名称 //组织名称
@ApiModelProperty(value = "组织名称") private String orgName;
private String orgname;
//性别 1 男，2 女， 0 未知 //性别 1 男，2 女， 0 未知
@ApiModelProperty(value = "性别 1 男，2 女， 0 未知")
private Integer sex; private Integer sex;
//人员部门id //人员部门id
@ApiModelProperty(value = "人员部门id") private Long deptId;
private Integer 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 成功 //开门结果 0 失败 1 成功
@ApiModelProperty(value = "开门结果 0 失败 1 成功") private Integer openResult;
private Integer openresult;
//人员id //人员id
@ApiModelProperty(value = "人员id") private Long personId;
private Integer personid;
//抓拍图，相对路径 //抓拍图，相对路径
@ApiModelProperty(value = "抓拍图，相对路径") private String recordImage1;
private String recordimage1;
//卡介质 0 IC 1 有源RFID 2 CPU //卡介质 0 IC 1 有源RFID 2 CPU
@ApiModelProperty(value = "卡介质 0 IC 1 有源RFID 2 CPU")
private String category; private String category;
//卡号 //卡号
@ApiModelProperty(value = "卡号") private String cardNumber;
private String cardnumber;
//rfid子类型，0：普通门禁，1：电动车，2：特殊人群关怀， 3：宠物 //rfid子类型，0：普通门禁，1：电动车，2：特殊人群关怀， 3：宠物
@ApiModelProperty(value = "rfid子类型，0：普通门禁，1：电动车，2：特殊人群关怀， 3：宠物") private Integer rfidType;
private Integer rfidtype;
//年龄 //年龄
@ApiModelProperty(value = "年龄")
private Integer age; private Integer age;
//0-非访客，1-访客 //0-非访客，1-访客
@ApiModelProperty(value = "0-非访客，1-访客") private Integer vRecordFlag;
private Integer vrecordflag;
} }

12
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/EVehicleArrivalDepartureInfoRepositoryImpl.java
View File

@ -31,6 +31,18 @@ public class EVehicleArrivalDepartureInfoRepositoryImpl extends BaseRepositoryIm
IPage<EVehicleArrivalDepartureInfoDO> iPage = new Query<EVehicleArrivalDepartureInfoDO>().getPage(params); IPage<EVehicleArrivalDepartureInfoDO> iPage = new Query<EVehicleArrivalDepartureInfoDO>().getPage(params);
QueryWrapper<EVehicleArrivalDepartureInfoDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<EVehicleArrivalDepartureInfoDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); 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"); queryWrapper.orderByDesc("create_time");
IPage<EVehicleArrivalDepartureInfoDO> result = eVehicleArrivalDepartureInfoMapper.selectPage(iPage, queryWrapper); IPage<EVehicleArrivalDepartureInfoDO> result = eVehicleArrivalDepartureInfoMapper.selectPage(iPage, queryWrapper);
return PageHelper.pageToResponse(result, result.getRecords()); return PageHelper.pageToResponse(result, result.getRecords());