Commit Graph

452 Commits

Author SHA1 Message Date
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
0cb299d383 feat(resource): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 21:36:42 +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
80a42d32ea feat(core): ContentTypeEnum
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-04 19:51:05 +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
6ede822c35 refactor(sis): 面板联动梯控
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 增加 Redis 缓存处理,避免重复下发权限
- 优化代码结构,提取公共方法 liftAuth
2025-08-03 18:05:56 +08:00
bd742b9f16 refactor(sis): 帮助类优化
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-03 17:43:08 +08:00
5028649266 refactor(sis): 开启海康抓拍上报,比对通过后,梯控下发权限功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-03 16:48:22 +08:00
c8e199e68e 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-03 14:41:49 +08:00
8c463bfa66 refactor(job): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-03 14:38:55 +08:00
131adee296 feat(task): 轮询下发电梯权限
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-03 14:26:45 +08:00
6e1c2e612b refactor(job): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-02 16:36:32 +08:00
f7cdf4bc09 refactor(sis): 定时授权任务通过snail-job触发
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-02 15:50:40 +08:00
c366a30488 refactor(property): 优化授权逻辑
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-08-01 14:45:28 +08:00
389ba82659 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-31 20:47:51 +08:00
6c57942886 feat(sis): 解压指定编码GBK 2025-07-31 20:47:18 +08:00
lxj
dc3b6ab197 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-07-31 15:43:02 +08:00
lxj
e016e6d44c 同步通道任务完善 2025-07-31 15:38:04 +08:00
9afeed3108 feat(sis): 重构智能设备通信模块
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-31 15:12:24 +08:00
7af0cee8e9 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-30 19:58:55 +08:00
79f98b5387 refactor(property): 优化人员导入和人脸上传功能 2025-07-30 19:58:22 +08:00
dy
14b6077ea7 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-07-30 18:43:12 +08:00
dy
e69093390c 排班详情 2025-07-30 18:42:41 +08:00
lxj
8f71f5f261 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-07-30 18:41:47 +08:00
lxj
95dfc5ef9b 增加设备定时更新状态任务 2025-07-30 18:41:31 +08:00