Commit Graph

226 Commits (3274e7e1bd2bc983644d07bb0b2652e9de373b23)

Author SHA1 Message Date
zhangxiongfeng 3274e7e1bd 临时车辆审批修改 2026-08-05 14:05:27 +08:00
zhangxiongfeng 5ea394a7b4 Merge remote-tracking branch 'origin/dev_dahua_department' into dev_dahua_department 2026-08-05 11:21:02 +08:00
zhangxiongfeng b0801e7122 大华微服务修改微服务 2026-08-05 11:19:36 +08:00
zhangxiongfeng bbd77af32f 大华微服务修改微服务 2026-08-05 11:15:07 +08:00
zhangxiongfeng c4ae60c686 大华微服务修改微服务 2026-08-05 10:50:08 +08:00
zhangxiongfeng cd4b1be635 大华微服务修改微服务 2026-08-05 10:47:40 +08:00
zhangxiongfeng 63e7b0fe69 Merge remote-tracking branch 'origin/dev' into dev 2026-08-05 10:39:36 +08:00
zhangxiongfeng d4a7f92806 Merge branch 'dev_dahua_department' into dev 2026-08-05 10:27:43 +08:00
zhangxiongfeng e81b45fcd1 大华微服务修改1.0 2026-08-05 10:25:41 +08:00
shenzhidan 113fadfe8a 1.临时访客同步大华 2026-08-05 10:07:36 +08:00
shenzhidan 77f915192d 1.优化人脸同步大华 2026-08-05 10:07:31 +08:00
shenzhidan bf0c288063 1.上传人脸修复 2026-08-05 10:07:23 +08:00
shenzhidan 56e01d59b4 新增相关方人员车辆大华同步执行器 2026-08-05 10:07:08 +08:00
shenzhidan 04f9106abd 1、新增车辆人员同步大华 2026-08-05 10:06:26 +08:00
shenzhidan d7c6c82bb8 集成大华通行记录增量同步与定时任务 2026-08-05 10:05:49 +08:00
shenzhidan 9502b52bf6 1.优化人脸同步大华 2026-08-05 10:02:11 +08:00
shenzhidan 2934139574 1.同步大华平台设备 组织架构信息 2026-08-05 10:01:00 +08:00
shenzhidan aabba19ec9 1.同步大华平台设备 组织架构信息 2026-08-05 10:00:05 +08:00
zhangxiongfeng 2f3c4eefd9 大华微服务修改1.0 2026-08-05 08:45:21 +08:00
zhangxiongfeng 93cf3cbbdc 大华微服务修改1.0 2026-08-05 08:44:22 +08:00
zhangxiongfeng 12b39d78d0 Merge remote-tracking branch 'origin/dev_dahua_department' into dev 2026-08-04 13:54:10 +08:00
zhangxiongfeng 6dc735e057 大华微服务修改 2026-08-04 11:30:49 +08:00
zhangxiongfeng 92b48e7d5f 5 2026-08-04 09:14:51 +08:00
zhangxiongfeng 5eb8642399 Merge remote-tracking branch 'origin/dev' into dev_dahua_department 2026-08-03 17:55:17 +08:00
zhangxiongfeng 1998cbeda7 Merge branch 'dev_dahua_department' into dev 2026-08-03 14:31:47 +08:00
zhangxiongfeng 3084892564 Merge remote-tracking branch 'origin/dev' into dev 2026-08-03 14:31:04 +08:00
zhangxiongfeng 224385bb12 Merge branch 'koumen' into dev_dahua_department 2026-08-03 14:28:32 +08:00
zhangxiongfeng ca0ebda107 2026.8.3 2026-08-03 14:24:21 +08:00
zhaokai 5a7a62f7ad Merge branch 'dev_visual_page' into dev 2026-08-01 09:55:03 +08:00
zhaokai 19fb2f0d43 refactor(dashboard): 优化控制器代码结构并添加注释
- 为
2026-08-01 09:54:14 +08:00
zhaokai 1ba3106787 Merge branch 'dev_visual_page' into dev 2026-07-30 08:38:44 +08:00
zhaokai b2cbf09902 fix(dashboard): 修正仪表板数据查询逻辑 2026-07-30 08:38:21 +08:00
zhangxiongfeng e0401dc004 Merge remote-tracking branch 'origin/dev' into dev 2026-07-30 08:33:46 +08:00
shenzhidan 1d93c0a201 1.临时访客同步大华 2026-07-29 17:55:00 +08:00
zhangxiongfeng d999973b22 Merge remote-tracking branch 'origin/dev' into dev 2026-07-29 17:18:50 +08:00
shenzhidan 11e495a15a 1.优化人脸同步大华 2026-07-29 16:52:12 +08:00
shenzhidan dc1432e092 Merge remote-tracking branch 'origin/dev' into dev 2026-07-29 11:05:00 +08:00
shenzhidan 00de04fd98 1.上传人脸修复 2026-07-29 11:03:56 +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 1366309b02 Merge branch 'dev' of http://47.92.113.182:3000/zcloud_gbs/zcloud-gbs-primeport into koumen 2026-07-29 10:31:23 +08:00
zhangxiongfeng f8e1dcaa39 Merge remote-tracking branch 'origin/dev' into koumen 2026-07-29 08:43:07 +08:00
zhangxiongfeng 8e6ea56f4f Merge remote-tracking branch 'origin/koumen' into dev 2026-07-29 08:42:27 +08:00
zhaokai 4106f40aa0 config(spring): 切换配置文件加载顺序 2026-07-28 18:11:32 +08:00
shenzhidan 857efdb611 新增相关方人员车辆大华同步执行器 2026-07-28 17:43:58 +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 6bf56c1cc4 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	web-app/src/main/java/com/zcloud/primeport/service/DaHuaServiceImpl.java
#	web-client/src/main/java/com/zcloud/primeport/api/DaHuaServiceI.java
#	web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/DaHuaGatewayImpl.java
2026-07-27 19:10:16 +08:00