Commit Graph

214 Commits

Author SHA1 Message Date
dy
c8179e164d 区域摄像头名称 2025-08-18 20:07:47 +08:00
ae8a1f095b refactor: 移除无用的 RocketMQ 配置
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m1s
2025-08-15 15:22:24 +08:00
lxj
247ad09a58 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 5m52s
# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/AlarmPushController.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/task/DataSyncTask.java
2025-08-15 14:09:57 +08:00
lxj
333fadf6df 事件告警逻辑修改 2025-08-15 14:07:55 +08:00
dy
86ba03167b 1
Some checks failed
/ build-parent-pom (push) Successful in 2m12s
/ build-and-push-services (ruoyi-gateway) (push) Waiting to run
/ build-and-push-services (ruoyi-modules/Property) (push) Waiting to run
/ build-and-push-services (ruoyi-modules/Sis) (push) Waiting to run
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Waiting to run
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Waiting to run
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Waiting to run
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Waiting to run
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Waiting to run
/ build-and-push-services (ruoyi-seata-server) (push) Waiting to run
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Waiting to run
/ build-and-push-services (ruoyi-snailjob-server) (push) Waiting to run
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Waiting to run
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Waiting to run
/ build-and-push-services (ruoyi-auth) (push) Has been cancelled
2025-08-14 17:21:14 +08:00
dy
67b3ae8d17 1 2025-08-14 17:18:33 +08:00
lxj
5e3fd9355d Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
/ build-parent-pom (push) Successful in 1m51s
/ build-common-modules (push) Failing after 6m11s
/ build-and-push-services (ruoyi-auth) (push) Has been skipped
/ build-and-push-services (ruoyi-gateway) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/Property) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/Sis) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Has been skipped
/ build-and-push-services (ruoyi-seata-server) (push) Has been skipped
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Has been skipped
/ build-and-push-services (ruoyi-snailjob-server) (push) Has been skipped
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Has been skipped
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Has been skipped
2025-08-14 09:34:00 +08:00
lxj
ef3c144fe6 增加事件上报类型 2025-08-14 09:33:47 +08:00
9dbccf93a8 websocket
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-13 15:07:54 +08:00
7b74451547 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-12 17:51:42 +08:00
54c423b8cb feat(sis):
- 新增访客管理相关接口和数据结构
- 实现访客登记和二维码生成功能
2025-08-12 17:51:28 +08:00
lxj
a13d4ab51a Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-12 15:49:15 +08:00
lxj
59dc46f019 增加设备报警信息 2025-08-12 15:48:27 +08:00
dy
d1473886f6 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-08-11 10:11:06 +08:00
dy
32b3768789 1 2025-08-11 10:10:36 +08:00
lxj
b378470f06 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-08-11 09:35:22 +08:00
15683799673
0dd0336724 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-08-11 03:01:21 +08:00
15683799673
cc6d89c588 设备增加经度和纬度 2025-08-11 03:00:54 +08:00
631d1f0ffb Merge remote-tracking branch 'origin/master' 2025-08-10 19:07:38 +08:00
ed35a45142 refactor(sis): 1 2025-08-10 19:07:32 +08:00
15683799673
8a6e499368 流媒体接口逻辑优化 2025-08-10 19:04:40 +08:00
5d078e8c8c feat(sis):
- 优化电梯控制逻辑,支持外部按键触发
2025-08-09 23:23:03 +08:00
054a8590ea feat(sis):
- 优化电梯控制逻辑,支持外部按键触发
2025-08-09 23:22:06 +08:00
lxj
99758c1a60 海康增加人像库图片上传 2025-08-09 20:58:21 +08:00
ec301ac993 feat(sis): 新增轿厢电梯控制功能 2025-08-08 23:33:30 +08:00
15683799673
15531ae029 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-07 23:13:53 +08:00
15683799673
4b4e67682b 可视化门禁逻辑完善 2025-08-07 23:13:44 +08:00
989421e244 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-07 22:34:57 +08:00
e3867b7a12 feat(sis): 支持黑名单人员管理
- 新增人员标签类型字段,用于区分红名单、白名单和黑名单
- 修改授权逻辑,黑名单人员不进行授权记录和E8平台同步
- 优化定时任务,对不同名单类型的人员进行差异化处理
- 增加黑名单人员入内的告警功能
2025-08-07 22:34:06 +08:00
dy
e89bd1df04 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-07 14:59:38 +08:00
dy
1a2a9a1035 排班删除和同步告警数据 2025-08-07 14:56:57 +08:00
1c23320f5a Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-07 12:06:33 +08:00
9aa58d2027 feat(sdk): 添加通用API调用方法 2025-08-07 12:06:24 +08:00
dy
6023f35674 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-07 11:25:18 +08:00
dy
2deb9b96f9 1 2025-08-07 11:24:50 +08:00
2a6f258ae5 refactor(sis): - 将原有的单一外部通道号拆分为上键通道号和下键通道号 2025-08-06 20:36:00 +08:00
c78d90a316 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 12:46:14 +08:00
lxj
fedc381713 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemotePrecautionaryImpl.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java
2025-08-06 12:39:06 +08:00
lxj
70fe6d713a 增加设备和门禁的关联关系 2025-08-06 12:35:22 +08:00
17d041e51d feat(sis): 1 2025-08-06 12:03:06 +08:00
a4e40f5123 feat(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 新增 RocketMQ 消息队列配置和相关服务
- 实现远程开门接口和服务方法
- 更新梯控下发逻辑
2025-08-06 09:16:23 +08:00
db58a91252 feat(sis):
- 新增 RocketMQ 消息队列配置和相关服务
- 实现远程开门接口和服务方法
- 更新梯控下发逻辑
2025-08-06 09:14:07 +08:00
a12ee50d08 feat(device): 增加设备绑定楼层信息 2025-08-05 16:35:00 +08:00
b7a4e512f0 feat(auth): 优化授权组相关功能 2025-08-05 14:36:57 +08:00
82740b7d62 refactor(sis): 冗余数据方便查询 2025-08-05 11:54:48 +08:00
c488f666d2 refactor(sis): 1 2025-08-05 11:15:25 +08:00
2a36ddf688 refactor(huawei): 封装返回结果
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 10:57:39 +08:00
5d81537bdb Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 10:51:41 +08:00
bbd895f116 refactor(sis): 1 2025-08-05 10:51:31 +08:00
8093e1cfd7 访客&&大屏
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 09:58:20 +08:00