Commit Graph

203 Commits (6dc735e057dd91de9510b9ef614d7fc985d74ce3)

Author SHA1 Message Date
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 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
zhangxiongfeng 1d8809bbdf 获取新增人员id 2026-07-27 19:08:47 +08:00
zhangxiongfeng 8509c92af8 Merge pull request '口门接口' (#4) from koumen into dev
Reviewed-on: #4
2026-07-27 10:24:06 +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
zhaokai d5a23f9768 chore(build): 更新.gitignore配置并移除前端静态资源文件 2026-07-15 13:43:19 +08:00
tianxinlei 316bed23a4 0713 - bug修复 2026-07-13 15:37:43 +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 897c0e43cf 0708 - bug修复 2026-07-08 16:43:55 +08:00
tianxinlei d75f433fc2 0707 - 完善消息通知模板 2026-07-07 16:56:54 +08:00
tianxinlei 5df6cb909b 0707 - 增加消息推送 2026-07-07 09:34:21 +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
zhaokai 9201f401bc fix(close): 修正临时关闭申请中的用户证件号码字段映射 2026-06-15 18:23:41 +08:00
dearLin 7e6bb4d60a fixed:补充一级口门车辆进出信息 2026-05-28 14:12:55 +08:00