Commit Graph

693 Commits

Author SHA1 Message Date
db9b1e1cd3 修改了工单bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m27s
2025-08-21 14:11:51 +08:00
dy
0385bef3f4 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 6m31s
2025-08-21 11:30:49 +08:00
dy
eba9e78695 反查 2025-08-21 11:30:38 +08:00
15683799673
be3992c1dc 增加人脸抓拍,人脸上报消费者
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m20s
2025-08-21 02:53:04 +08:00
dy
5c9672dc18 分包
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m17s
2025-08-20 23:51:53 +08:00
dy
5fb396575d 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 6m21s
2025-08-20 22:08:51 +08:00
dy
f23b02fe51 处理排班跨月且覆盖当月最后一天的情况,如排班从当月开始,下个月结束 2025-08-20 22:08:01 +08:00
lxj
63c95ecda8 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 6m22s
2025-08-20 17:58:25 +08:00
lxj
62d9a21627 海康设备对接单独拆分 2025-08-20 17:57:09 +08:00
5c7a76b855 修正nacos配置文件
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 7m4s
2025-08-20 14:52:02 +08:00
15683799673
d5d8b80f49 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 6m41s
2025-08-20 13:06:13 +08:00
15683799673
9e346ba882 屏蔽海康sdk 2025-08-20 13:06:06 +08:00
6e83b36987 sis部署
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m35s
2025-08-20 12:50:52 +08:00
2ec65fe29f Merge remote-tracking branch 'origin/master'
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m43s
2025-08-20 11:58:52 +08:00
d392021952 feat(property): 添加智能灯控功能 2025-08-20 11:58:37 +08:00
3a44280abe 新增热门活动自动更新状态
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m50s
2025-08-20 10:46:52 +08:00
a056feae53 Merge remote-tracking branch 'origin/master'
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m44s
2025-08-19 18:06:28 +08:00
eecf869640 feat(Property): 新增灯控开关信息相关功能 2025-08-19 18:05:58 +08:00
dy
f7d1f81940 1
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Has been cancelled
2025-08-19 18:03:46 +08:00
dy
4f62b3bea3 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-08-19 17:38:34 +08:00
dy
9034f0ef7a 1 2025-08-19 17:38:24 +08:00
c1c3950b2d 新增热门活动
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m32s
2025-08-19 16:31:09 +08:00
0ee671fbcf 新增热门活动
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m35s
2025-08-19 14:36:13 +08:00
dy
7376a7a9be 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 6m35s
2025-08-19 09:57:31 +08:00
dy
e450c66385 排班的区域管理 2025-08-19 09:56:59 +08:00
dy
6397085fe9 排班的区域管理 2025-08-19 09:54:33 +08:00
6d3849fa64 修正访客上传图片
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m18s
2025-08-18 20:43:12 +08:00
dy
23cab413c2 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-08-18 20:21:24 +08:00
dy
c8179e164d 区域摄像头名称 2025-08-18 20:07:47 +08:00
38e75e6b6b 修正访客上传图片
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m15s
2025-08-18 19:46:03 +08:00
06ab323f21 修正访客上传图片
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m17s
2025-08-18 17:59:39 +08:00
50ddc1e954 新增常见问题功能
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m24s
2025-08-18 17:24:05 +08:00
187763e0e5 Merge remote-tracking branch 'origin/master'
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m22s
2025-08-18 16:54:27 +08:00
8849b1d889 feat(property): 访客登记同步 E8 平台门禁 2025-08-18 16:54:10 +08:00
fea2972dd0 修改了调查问卷bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m22s
2025-08-18 14:13:43 +08:00
be5d00040d refactor(sis): 将 remoteHWId 修改为 remoteHwId
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m13s
2025-08-18 11:30:01 +08:00
15683799673
e0abf1bd13 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 6m18s
2025-08-18 09:07:28 +08:00
15683799673
5e164ae2ac 事件处理逻辑完善 2025-08-18 09:07:17 +08:00
dy
c5f6744623 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 6m17s
2025-08-17 22:04:01 +08:00
dy
2e0695c1c0 区域管理 2025-08-17 22:02:59 +08:00
15683799673
a0927b1e6e Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-08-17 07:03:22 +08:00
15683799673
2716324734 事件指派 完成 ,查询当前用户告警信息 2025-08-17 07:02:49 +08:00
785f903e2a 物业模块
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m38s
2025-08-15 19:44:00 +08:00
5a9cc74405 修改了调查问卷bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m52s
2025-08-15 17:21:59 +08:00
dy
e383f112d2 1
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m42s
2025-08-15 16:00:44 +08:00
dy
e66f29c665 1
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Failing after 2m43s
2025-08-15 15:56:48 +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
80a44540d8 新增了调查问卷
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 5m50s
2025-08-15 11:42:57 +08:00