Commit Graph

220 Commits

Author SHA1 Message Date
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
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
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
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
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
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
lxj
95dfc5ef9b 增加设备定时更新状态任务 2025-07-30 18:41:31 +08:00
6938640419 feat(Sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-30 09:09:27 +08:00
lxj
7ef6d2ab47 设备通道逻辑修改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-30 05:58:21 +08:00
lxj
ef7ca1fa5a 设备通道逻辑修改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-30 05:46:35 +08:00
lxj
1b3fd18873 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-07-30 05:43:08 +08:00
ec23e32ed6 feat(Sis): 删除入驻员工包括删除授权记录和人像库图片,并调用 E8 平台 API 删除客户信息
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-29 23:22:35 +08:00
21985e48e7 fix(sis): 优化人脸照片同步和授权记录更新逻辑 2025-07-29 18:37:03 +08:00
4a73dd53ee Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-29 02:05:15 +08:00
e3e26f46c1 feat(property):
- 新增入驻员工导入功能,支持导入员工信息和人脸数据
2025-07-29 02:04:15 +08:00
lxj
0efbb1051e Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-07-28 20:27:35 +08:00
lxj
ad567ec13a 设备通道逻辑修改 2025-07-28 20:27:21 +08:00
887b23e5ca SOS同步
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-28 17:04:22 +08:00
5274fb8d64 SOS同步
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-28 01:01:25 +08:00
15b25144f0 SOS 2025-07-27 22:40:39 +08:00
b857a2121b refactor(sis): 1 2025-07-27 22:00:41 +08:00
56dcc609d1 refactor(sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-27 19:53:57 +08:00
041db8c435 feat(sis): 添加模拟上下文登录功能 2025-07-27 19:47:05 +08:00
1a900ad3db feat(sis): 添加模拟上下文登录功能 2025-07-27 19:46:18 +08:00
5ad0f652fe refactor(auth): 权限组⇄设备关联功能完善
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-26 23:25:22 +08:00
f4dbcba15f feat(sis): 实现人脸识别后远程开门功能(测试)
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-26 22:32:26 +08:00
127336af6d refactor(sis): 定时任务逻辑 2025-07-26 17:53:57 +08:00
3b7635bf1d feat(auth): 人员授权相关功能修改 2025-07-26 02:37:02 +08:00
lxj
d43b600e51 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-25 21:32:54 +08:00
lxj
d3517de7b6 流媒体服务接口逻辑更改 2025-07-25 21:32:43 +08:00
84e79b0414 feat(sis): 1 2025-07-25 21:29:08 +08:00
2786cd9a7f refactor(sdk): 初始化请求字段
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-24 22:38:24 +08:00
2a2df4e501 feat(Property): dubbo接口调用异常
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-24 21:15:50 +08:00
f2aafe220f feat(sis): 新增个人门禁授权功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-24 19:04:44 +08:00
399f48f1b4 feat(auth-group): 新增授权组门禁和电梯关联功能 2025-07-24 11:20:19 +08:00
1124b832ac feat(sis): 添加权限组⇄设备关联功能 2025-07-23 17:30:27 +08:00
d540a37543 feat(sis): 更新授权组相关实体
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-23 13:09:30 +08:00
5d2aa88690 feat(sis): 添加授权组管理功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-23 10:54:33 +08:00
lxj
67bf690c8a 流媒体服务接口逻辑更改 2025-07-22 19:25:09 +08:00
1c64023502 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-22 11:40:20 +08:00
b95f99532f feat(sis): 电梯授权增加楼层选择功能 2025-07-22 11:40:00 +08:00
lxj
c9c6f229bd 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-21 21:02:13 +08:00
lxj
2d1b6d8ff7 视频监控逻辑完善 2025-07-21 21:01:17 +08:00
15683799673
ed091501d7 增加按需取流接口 2025-07-21 21:00:40 +08:00
15683799673
800a2de30f 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:
#	pom.xml
#	ruoyi-modules/Property/pom.xml
2025-07-21 03:37:26 +08:00
15683799673
365ca2d7bc 物业模块删除厂商
安防模块增加厂商
设备模块逻辑优化
2025-07-21 03:36:07 +08:00
a198e0c720 fix(property): 2025-07-20 19:23:22 +08:00
426717e9cc feat(sis): 新增智能照明控制功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-20 14:24:30 +08:00
498209cb87 feat(sdk): 添加电表和水表通信工具类
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-20 14:01:54 +08:00
15683799673
adafd52d0f 修改安防设备管理模块逻辑
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-19 09:10:20 +08:00
lxj
305705abc0 增加海康摄像头上报事件 2025-07-18 15:13:18 +08:00
e07f690002 refactor(sis): 整合E8相关接口
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-17 19:54:57 +08:00
894cb912f0 refactor(sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-17 16:22:16 +08:00
f35a15fc23 refactor(sis): 字段更改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-17 14:49:38 +08:00
e1f716c70b refactor(property):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 水电气表业务、厂商业务移动至物业模块
2025-07-17 13:12:11 +08:00
3f97caad42 refactor(property):
- 水电气表业务、厂商业务移动至物业模块
2025-07-17 12:38:58 +08:00
177bbe5a8f refactor(sis): - 电梯⇄楼层关联表字段变动
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-17 11:56:35 +08:00
lxj
f866e2ffc6 hik-sdk jna 版本升级
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-17 02:11:58 +08:00
8dbb2aab9d refactor(sis): 楼层下发权限修改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-16 11:18:07 +08:00
c2c0d1ffb4 refactor(sis): 楼层下发权限修改 2025-07-16 11:16:55 +08:00
2c794447d8 refactor(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 移除建筑物楼层信息相关代码,从物业模块引入
2025-07-16 09:42:28 +08:00
15683799673
bbb80f3a63 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-16 02:36:48 +08:00
15683799673
9c5cd99a54 增加视频模块相关代码 2025-07-16 02:36:26 +08:00
15683799673
fa28f2d351 增加视频模块相关代码 2025-07-16 02:35:44 +08:00
fdc70aec0a feat(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 新增楼层信息相关操作
- 新增电梯⇄楼层关联信息相关操作
- 梯控流程补全
2025-07-15 18:45:48 +08:00
172ede3eb3 feat(auth): 人员库授权功能调整 2025-07-15 13:43:55 +08:00
8b340c9e95 refactor(sis): 授权记录模块重新调整
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-14 23:15:29 +08:00
f53dee48ca refactor(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-14 22:02:34 +08:00
c1bcdd367a feat(sis):
- 添加人像写入关联表
 - 人像信息表libId删除
2025-07-14 18:26:35 +08:00