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

Compare commits

base: zcloud_gbs:7e6bb4d60afb874f524a46b1fc1dbce656358b47
Branches Tags
zcloud_gbs:koumen
zcloud_gbs:master
zcloud_gbs:zhanneixin
..
compare: zcloud_gbs:cabeab57dcdcc7c46af7134d438f231848659d0c
Branches Tags
zcloud_gbs:koumen
zcloud_gbs:master
zcloud_gbs:zhanneixin

No commits in common. "7e6bb4d60afb874f524a46b1fc1dbce656358b47" and "cabeab57dcdcc7c46af7134d438f231848659d0c" have entirely different histories.
7e6bb4d60a ... cabeab57dc

6 changed files with 100 additions and 69 deletions
Show Stats 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/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 () {
<!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 () {
const APP_ENV = {
antd: {
'ant-prefix': 'micro-temp',
@ -20,4 +20,4 @@
redirect: '',
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.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>
})();</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>

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

@ -1,7 +1,6 @@
package com.zcloud.primeport.dto;
import com.alibaba.cola.dto.PageQuery;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -26,13 +25,5 @@ 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;
}

2
web-client/src/main/java/com/zcloud/primeport/dto/MkmjSwipeCardRecordPageQry.java
View File

@ -1,6 +1,7 @@
package com.zcloud.primeport.dto;
import com.alibaba.cola.dto.PageQuery;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -25,7 +26,6 @@ public class MkmjSwipeCardRecordPageQry extends PageQuery {
*/
private Integer likeId;
private String cardNo;
private String likeDeviceName;
private String swingTimeStart;
private String swingTimeEnd;
}

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

@ -1,9 +1,12 @@
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
@ -18,96 +21,141 @@ public class MkmjSwipeCardRecordCO extends ClientObject {
private String swipecardrecordid;
//所有卡片消息共享的自增长整型数值，从1开始，门禁子系统重启复位到1
@ApiModelProperty(value = "所有卡片消息共享的自增长整型数值，从1开始，门禁子系统重启复位到1")
private Long id;
private Integer id;
//节点编码
private String nodeCode;
@ApiModelProperty(value = "节点编码")
private String nodecode;
//报警编号
private String alarmCode;
@ApiModelProperty(value = "报警编号")
private String alarmcode;
//报警图片路径
private String alarmPicture;
@ApiModelProperty(value = "报警图片路径")
private String alarmpicture;
//节点类型
private String nodeType;
@ApiModelProperty(value = "节点类型")
private String nodetype;
//报警时间，10位时间戳
private Long alarmDate;
@ApiModelProperty(value = "报警时间，10位时间戳")
private Integer alarmdate;
//报警等级 1：严重，2：一般，3：轻微
private Integer alarmGrade;
@ApiModelProperty(value = "报警等级 1：严重，2：一般，3：轻微")
private Integer alarmgrade;
//单元类型
private Integer unitType;
@ApiModelProperty(value = "单元类型")
private Integer unittype;
//报警类型
private Integer alarmType;
@ApiModelProperty(value = "报警类型")
private Integer alarmtype;
//通道序号
private Integer channelSeq;
@ApiModelProperty(value = "通道序号")
private Integer channelseq;
//通道名称
private String channelName;
@ApiModelProperty(value = "通道名称")
private String channelname;
//报警状态 1：报警产生，2：报警消失
private Integer alarmStat;
@ApiModelProperty(value = "报警状态 1：报警产生，2：报警消失")
private Integer alarmstat;
//部门名称
private String deptName;
@ApiModelProperty(value = "部门名称")
private String deptname;
//通道编号
private String acsChannelCode;
@ApiModelProperty(value = "通道编号")
private String acschannelcode;
//口罩状态 3-戴口罩，2-未戴口罩，1-未识别，0-未知
private Integer maskState;
@ApiModelProperty(value = "口罩状态 3-戴口罩，2-未戴口罩，1-未识别，0-未知")
private Integer maskstate;
//进出门类型: 详见 读卡器业务类型字典
private String enterOrExit;
@ApiModelProperty(value = "进出门类型: 详见 读卡器业务类型字典")
private String enterorexit;
//开门类型字符串
private String openTypeStr;
@ApiModelProperty(value = "开门类型字符串")
private String opentypestr;
//刷卡时间，格式：yyyy-MM:dd HH:mm:ss
private String swingTime;
@ApiModelProperty(value = "刷卡时间，格式：yyyy-MM:dd HH:mm:ss")
private String swingtime;
//设备名称
private String deviceName;
@ApiModelProperty(value = "设备名称")
private String devicename;
//人员编号
private String personCode;
@ApiModelProperty(value = "人员编号")
private String personcode;
//开门类型, 详见开门类型 字典
private String openType;
@ApiModelProperty(value = "开门类型, 详见开门类型 字典")
private String opentype;
//组织编码
private String orgCode;
@ApiModelProperty(value = "组织编码")
private String orgcode;
//证件类型
private String paperType;
@ApiModelProperty(value = "证件类型")
private String papertype;
//证件号
private String paperNumber;
@ApiModelProperty(value = "证件号")
private String papernumber;
//错误详情
private String errorDetail;
@ApiModelProperty(value = "错误详情")
private String errordetail;
//开门错误码，0代表成功，96代表需远程验证(需结合平台上远程验证功能使用)，其他参考门禁开门错误码
private String openFailedCod;
@ApiModelProperty(value = "开门错误码，0代表成功，96代表需远程验证(需结合平台上远程验证功能使用)，其他参考门禁开门错误码")
private String openfailedcod;
//固定值：evo-accesscontrol
// private String from;
@ApiModelProperty(value = "固定值：evo-accesscontrol")
private String from;
//extendId标识
private Long extendId;
@ApiModelProperty(value = "extendId标识")
private Long extendid;
//开始时间, 13位时间戳
private Long beginTime;
@ApiModelProperty(value = "开始时间, 13位时间戳")
private Long begintime;
//通道名称
private String acsChannelName;
@ApiModelProperty(value = "通道名称")
private String acschannelname;
//预留字段，暂未使用，默认值为0
private Integer cardStatus;
@ApiModelProperty(value = "预留字段，暂未使用，默认值为0")
private Integer cardstatus;
//组织名称
private String orgName;
@ApiModelProperty(value = "组织名称")
private String orgname;
//性别 1 男，2 女， 0 未知
@ApiModelProperty(value = "性别 1 男，2 女， 0 未知")
private Integer sex;
//人员部门id
private Long deptId;
@ApiModelProperty(value = "人员部门id")
private Integer deptid;
//卡类型
private Integer cardType;
@ApiModelProperty(value = "卡类型")
private Integer cardtype;
//设备编号
private String deviceCode;
@ApiModelProperty(value = "设备编号")
private String devicecode;
//人员姓名
private String personName;
@ApiModelProperty(value = "人员姓名")
private String personname;
//刷卡人在平台上的图片，相对路径
private String personImg;
@ApiModelProperty(value = "刷卡人在平台上的图片，相对路径")
private String personimg;
//开门结果 0 失败 1 成功
private Integer openResult;
@ApiModelProperty(value = "开门结果 0 失败 1 成功")
private Integer openresult;
//人员id
private Long personId;
@ApiModelProperty(value = "人员id")
private Integer personid;
//抓拍图，相对路径
private String recordImage1;
@ApiModelProperty(value = "抓拍图，相对路径")
private String recordimage1;
//卡介质 0 IC 1 有源RFID 2 CPU
@ApiModelProperty(value = "卡介质 0 IC 1 有源RFID 2 CPU")
private String category;
//卡号
private String cardNumber;
@ApiModelProperty(value = "卡号")
private String cardnumber;
//rfid子类型，0：普通门禁，1：电动车，2：特殊人群关怀， 3：宠物
private Integer rfidType;
@ApiModelProperty(value = "rfid子类型，0：普通门禁，1：电动车，2：特殊人群关怀， 3：宠物")
private Integer rfidtype;
//年龄
@ApiModelProperty(value = "年龄")
private Integer age;
//0-非访客，1-访客
private Integer vRecordFlag;
@ApiModelProperty(value = "0-非访客，1-访客")
private Integer vrecordflag;
}

8
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/EVehicleArrivalDepartureInfoDO.java
View File

@ -1,9 +1,12 @@
package com.zcloud.primeport.persistence.dataobject;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jjb.saas.framework.repository.basedo.BaseDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
/**
@ -15,6 +18,7 @@ import lombok.NoArgsConstructor;
@Data
@TableName("dc_db_2059565538433609728")
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class EVehicleArrivalDepartureInfoDO extends BaseDO {
//data_version
@ApiModelProperty(value = "data_version")
@ -82,8 +86,8 @@ public class EVehicleArrivalDepartureInfoDO extends BaseDO {
//vehicle_sequence_number
@ApiModelProperty(value = "vehicle_sequence_number")
private String vehicleSequenceNumber;
// @TableId(type = IdType.ASSIGN_ID)
// private Long jjbsaasdatacenterid;
@TableId(type = IdType.ASSIGN_ID)
private Long jjbsaasdatacenterid;
}

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

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