Commit Graph

507 Commits

Author SHA1 Message Date
89041e783b websocket
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-08-13 15:08:38 +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
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
17d041e51d feat(sis): 1 2025-08-06 12:03:06 +08:00
dy
5a92f9032e 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 11:37:54 +08:00
dy
0a18e0c1a6 排班按月份查询重构 2025-08-06 11:37:29 +08:00
3fa1beca78 feat:工单类型树查询
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 10:08:15 +08:00
4acfdb6b35 访客接口
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 10:02:11 +08:00
00ad9a1330 feat:工单类型树查询
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 09:50:50 +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
f619c65261 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 16:35:46 +08:00
a12ee50d08 feat(device): 增加设备绑定楼层信息 2025-08-05 16:35:00 +08:00
dy
b91201cf7f 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-05 16:27:13 +08:00
dy
86c28e95dd 访客pc端新增 2025-08-05 16:26:53 +08:00
1288d27125 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 14:37:11 +08:00
b7a4e512f0 feat(auth): 优化授权组相关功能 2025-08-05 14:36:57 +08:00
cb84447450 修改了资产bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 12:15:13 +08:00
bbe911119c Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 11:54:55 +08:00
82740b7d62 refactor(sis): 冗余数据方便查询 2025-08-05 11:54:48 +08:00
dy
eb03629e84 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-05 11:22:04 +08:00
c488f666d2 refactor(sis): 1 2025-08-05 11:15:25 +08:00
dy
6d9266ee21 排班不能获取id的bug 2025-08-05 11:07:16 +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
290780379d Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 09:38:50 +08:00
15683799673
59f8e0fc2f 人脸告警数据写入完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 00:44:43 +08:00
15683799673
6b1519a5b6 人脸告警数据写入完成 2025-08-05 00:44:13 +08:00
dy
4316a25f6e 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-04 23:41:53 +08:00
dy
7b37ed293f 排班详情修改 2025-08-04 23:39:43 +08:00
7c52b9b851 feat(elevator): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 23:30:51 +08:00
0db07e6d53 refactor(property): 将 RemoteUnitService 调整为 RemoteBuildingService
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 22:04:41 +08:00
lxj
26b609ea81 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-04 20:01:00 +08:00
lxj
58971070e9 同步代码 2025-08-04 20:00:51 +08:00
0c34fedc8d 访客&&大屏 2025-08-04 19:59:48 +08:00
15f97ac503 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 19:58:49 +08:00
f1625b6e5f feat(sis): 电梯⇄楼层⇄通道关联功能 2025-08-04 19:58:23 +08:00
lxj
291f9e7ffa 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-04 19:52:57 +08:00
lxj
1f4e168b56 同步代码 2025-08-04 19:50:46 +08:00
00be7b4c47 refactor(property): 修改楼层查询接口
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 19:13:26 +08:00
1fcfa11608 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/calback/HikAlarmCallBack.java
2025-08-04 19:10:54 +08:00
cf5757c48f refactor(property): 修改楼层查询接口 2025-08-04 19:08:41 +08:00
lxj
1d474d735e 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-04 19:04:31 +08:00
lxj
7f76de6073 增加无感通行业务逻辑 2025-08-04 19:04:20 +08:00
4f58aa9c1e refactor(sis): 1Vo 类,增加 DeviceInfo 内部类
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 注释掉 Sync
2025-08-04 16:52:30 +08:00
063b424b2b 修改了保洁bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 14:28:30 +08:00
dy
f7db092af8 排班按月查询bug修改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 13:04:32 +08:00
dy
c104a71f76 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-04 10:11:16 +08:00
dy
f9fe218f7a 排班bug修改 2025-08-04 10:10:55 +08:00
c66c81b434 修改了工单管理bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 09:09:34 +08:00