Commit Graph

523 Commits

Author SHA1 Message Date
9dbccf93a8 websocket
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-13 15:07:54 +08:00
e73d6abf62 修改了工单bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-13 10:21:58 +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
dy
627f2a1a11 bug1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-12 16:42:50 +08:00
dy
f79c5bf59b 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 16:18:35 +08:00
dy
1b64c97626 1 2025-08-12 16:17:54 +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
a7db0253e8 根据id读取用户信息
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-12 11:16:23 +08:00
dy
4861c89c57 根据id读取用户信息 2025-08-11 16:44:26 +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
69e652b224 Merge remote-tracking branch 'origin/master' 2025-08-11 09:39:28 +08:00
af22185111 修改了工单bug 2025-08-11 09:38:57 +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
e47a13c214 Merge remote-tracking branch 'origin/master' 2025-08-08 23:33:38 +08:00
ec301ac993 feat(sis): 新增轿厢电梯控制功能 2025-08-08 23:33:30 +08:00
d5e46d88df H5访客
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-08-08 18:43:48 +08:00
48984a494d 修改了保工单bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-08 11:42:59 +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
6444a9330b 修改了工单bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-07 17:34:18 +08:00
dy
4893a04d39 部分数据不能查询bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-07 17:22:39 +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
20faf13328 修改了保洁bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-07 09:39:08 +08:00
3d6fa49e8f Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 20:37:29 +08:00
2a6f258ae5 refactor(sis): - 将原有的单一外部通道号拆分为上键通道号和下键通道号 2025-08-06 20:36:00 +08:00
dy
29ba1ab5c6 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-06 16:48:15 +08:00
dy
66721b34cd 1 2025-08-06 16:47:46 +08:00
f0a7f2147f 修改了保洁bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 16:40:20 +08:00
2b19146c70 feat:工单类型不分页查询
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 14:00:01 +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