Commit Graph

157 Commits (224385bb124e61149a3c6c69c64281be804393c8)

Author SHA1 Message Date
zhangxiongfeng ca0ebda107 2026.8.3 2026-08-03 14:24:21 +08:00
zhaokai 79c8688642 Merge branch 'koumen' into dev 2026-07-29 11:03:33 +08:00
zhaokai 93a36cd433 Merge branch 'dev_visual_page' into dev 2026-07-29 10:59:03 +08:00
zhaokai 481fe91e7f feat(dashboard): 添加可视化大屏数据统计功能 2026-07-29 10:58:37 +08:00
shenzhidan 3277481dc1 Merge branch 'dev' of http://47.92.113.182:3000/zcloud_gbs/zcloud-gbs-primeport into koumen
# Conflicts:
#	web-domain/src/main/java/com/zcloud/primeport/domain/gateway/DaHuaGateway.java
#	web-infrastructure/src/main/java/com/zcloud/primeport/dahua/api/DaHuaPersonApi.java
#	web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/DaHuaGatewayImpl.java
2026-07-28 17:09:54 +08:00
shenzhidan 0d36024105 1、新增车辆人员同步大华 2026-07-28 17:08:43 +08:00
zhangxiongfeng 946a0aa2a5 人脸上传 2026-07-28 10:26:33 +08:00
zhangxiongfeng 1d8809bbdf 获取新增人员id 2026-07-27 19:08:47 +08:00
zhangxiongfeng 3cbc28e17f 口门接口
# Conflicts:
#	start/src/main/resources/bootstrap.yml
2026-07-27 10:18:34 +08:00
zhangxiongfeng 81d4242c31 Merge branch 'dev' of http://47.92.113.182:3000/zcloud_gbs/zcloud-gbs-primeport into koumen
# Conflicts:
#	start/src/main/resources/bootstrap.yml
2026-07-27 10:07:51 +08:00
zhaokai a81c46c457 feat(closedArea): 添加封闭区域可视化大屏功能 2026-07-27 09:45:38 +08:00
zhangxiongfeng d243fe5ed3 口门接口 2026-07-27 08:47:38 +08:00
zhangxiongfeng 83d0b39672 大华接口对接 2026-07-22 16:42:11 +08:00
tianxinlei 77b4764810 0713 - bug修复 2026-07-13 10:33:12 +08:00
tianxinlei c88b59b805 0710 - bug修复 2026-07-10 17:59:23 +08:00
tianxinlei 608c51aa0a 0709 - bug修复 2026-07-09 16:35:23 +08:00
tianxinlei d75f433fc2 0707 - 完善消息通知模板 2026-07-07 16:56:54 +08:00
tianxinlei 7667276c30 0706 - bug修改+增加消息推送和待办的公共执行器 2026-07-07 08:32:54 +08:00
tianxinlei 2847068115 0703 - bug修改 2026-07-03 15:01:43 +08:00
tianxinlei 5620914fb1 0701 - bug修改 2026-07-02 08:47:43 +08:00
tianxinlei 3c49092b13 0701 - bug修改 2026-07-01 14:33:02 +08:00
tianxinlei 3327942642 0627 - bug修改 2026-06-27 15:18:53 +08:00
tianxinlei a5fc467659 625 - bug修改 2026-06-25 12:18:31 +08:00
dearLin 7e6bb4d60a fixed:补充一级口门车辆进出信息 2026-05-28 14:12:55 +08:00
dearLin d1a1590752 fixed:补充一级口门车辆进出信息 2026-05-27 18:16:55 +08:00
dearLin cabeab57dc fixed:补充一级口门车辆进出信息 2026-05-27 17:59:23 +08:00
dearLin b697d8990d fixed: 17182 没有显示驳回状态数据 所有申请页面都需要有驳回状态的数据 监管端和企业端都有 2026-05-27 08:45:03 +08:00
dearLin d4c2779336 fix: 审批人重复校验、查询过滤补全及车辆统计修正
- 新增 GET /checkExistByUserId/{userId} 审批人重复检查接口
- 新增 save 时审批人重复校验,存在则抛 BizException
- personnelVehicleManagementList 查询支持 name/projectName 过滤
- vehicleApply/list 支持 gateLevelAuthAreaId 港区 JSON 筛选
- personnelVehicleManagementList 车辆数统计去掉 audit_flag=2 限制

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-26 18:03:54 +08:00
dearLin 3304e16943 feat: video/list接口支持isOnline在线状态查询和筛选
- VideoDO/VideoCO 新增 isOnline、type 字段
- VideoPageQry 新增 eqIsOnline 查询参数
- 查询改为 LEFT JOIN vi_video 视图,通过 video_resource_id 关联
- xgfPersonAuditList 新增 employeePersonUserName 姓名查询
- 新增 VideoQueryExe 单元测试

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-26 15:30:45 +08:00
lishiwei acd4efe71a 补充视频名称和摄像头数量字段 2026-05-22 17:37:25 +08:00
lishiwei ded8ee64d7 每日00:25二级门禁车辆定时任务 2026-05-14 17:22:05 +08:00
lishiwei 6a16b9484a 每日00:20二级门禁人员定时任务(含手机号变更 身份证兜底查询逻辑) 2026-05-14 17:20:28 +08:00
lishiwei a84d04a9bc 修改二级车辆查询语句别名错误 2026-05-14 17:08:12 +08:00
lishiwei f2b0ea637a refactor: 优化二级门禁车辆审批流程
增加内部车和临时车的一级门禁查询逻辑
2026-05-14 10:46:36 +08:00
lishiwei 74a55d82b2 feat: 同步门禁权限到一级系统 2026-05-11 14:10:56 +08:00
lishiwei b3dffc6577 refactor: 优化闭区人员申请表映射字段命名
- user_face_url -> user_face_images
- apply_person_user_name -> user_name
2026-05-09 17:06:31 +08:00
lishiwei e2c3007c1f feat: 更新车辆黑名单查询字段 2026-05-06 08:51:41 +08:00
dearLin 75419ffd05 feat:接入海康二级口门进出记录 2026-04-30 16:47:35 +08:00
dearLin 145235c9de feat:接入海康二级口门进出记录 2026-04-30 14:30:19 +08:00
lishiwei 74b7259593 Merge remote-tracking branch 'origin/koumen' into koumen 2026-04-29 18:16:12 +08:00
lishiwei 056678d640 1、车辆申请分页列表增加非驳回条件
2、部门车辆录入字段补充
3、移除黑名单补充名称&违规状态补充
4、车牌号唯一性校验增加非驳回条件
5、审批&申请记录按时间倒排
2026-04-29 18:16:05 +08:00
lishiwei b7d7e65f28 1、封闭区域随行人员增加人资标志
2、封闭区域列表不查询全部区域
2026-04-29 18:12:08 +08:00
dearLin 0126a0587f feat:接入海康二级口门进出记录 2026-04-29 18:05:46 +08:00
dearLin 84d835abc8 feat:接入海康二级口门进出记录 2026-04-29 16:30:41 +08:00
dearLin 3009e4edcf feat:接入海康二级口门进出记录 2026-04-29 15:48:01 +08:00
dearLin 6fda8745fe feat:接入大华一级口门进出记录 2026-04-23 09:39:18 +08:00
dearLin a16262165f feat:接入大华一级口门进出记录 2026-04-23 09:02:56 +08:00
dearLin 1dc1f2e7da feat:一级人员门禁设备对接 2026-04-21 09:44:59 +08:00
dearLin 94dffef375 feat:临时访客一级口门申请 2026-04-20 14:34:37 +08:00
dearLin 6e331ede6f feat:临时访客一级口门申请 2026-04-17 15:35:07 +08:00