Commit Graph

483 Commits

Author SHA1 Message Date
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
dy
44beda8f34 1
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m2s
2025-08-15 10:54:13 +08:00
dy
77bfdd2823 1
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 4m54s
2025-08-15 10:29:54 +08:00
dy
da70fcc869 1
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Has been cancelled
2025-08-15 10:26:01 +08:00
dy
e3e070e411 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-08-15 10:24:41 +08:00
dy
f05fbc967d 1 2025-08-15 10:24:33 +08:00
fc4d7a2bdf 物业模块打包报错
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Failing after 3m28s
2025-08-14 23:17:45 +08:00
9a4be9e609 新增工作流3
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Failing after 2m7s
2025-08-14 21:33:46 +08:00
b75b799432 新增调查问卷功能
Some checks failed
/ build-and-push-services (ruoyi-auth) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-gateway) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-modules/Property) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-modules/Sis) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-seata-server) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-snailjob-server) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Blocked by required conditions
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Blocked by required conditions
/ build-parent-pom (push) Has been cancelled
2025-08-14 17:23:36 +08:00
dy
86ba03167b 1
Some checks failed
/ build-parent-pom (push) Successful in 2m12s
/ build-and-push-services (ruoyi-gateway) (push) Waiting to run
/ build-and-push-services (ruoyi-modules/Property) (push) Waiting to run
/ build-and-push-services (ruoyi-modules/Sis) (push) Waiting to run
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Waiting to run
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Waiting to run
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Waiting to run
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Waiting to run
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Waiting to run
/ build-and-push-services (ruoyi-seata-server) (push) Waiting to run
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Waiting to run
/ build-and-push-services (ruoyi-snailjob-server) (push) Waiting to run
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Waiting to run
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Waiting to run
/ build-and-push-services (ruoyi-auth) (push) Has been cancelled
2025-08-14 17:21:14 +08:00
dy
67b3ae8d17 1 2025-08-14 17:18:33 +08:00
dy
9abb69888b 排班区域 2025-08-14 15:41:00 +08:00
dy
74e5323934 部门名称 2025-08-14 15:16:53 +08:00
dy
0fa3b43853 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
/ build-parent-pom (push) Successful in 2m3s
/ build-and-push-services (ruoyi-auth) (push) Failing after 1m4s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 1m3s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 1m33s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 36s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 52s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Failing after 1m3s
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Failing after 1m1s
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Failing after 1s
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Failing after 52s
/ build-and-push-services (ruoyi-seata-server) (push) Failing after 21s
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Failing after 21s
/ build-and-push-services (ruoyi-snailjob-server) (push) Failing after 20s
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Failing after 44s
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Failing after 42s
2025-08-14 12:31:35 +08:00
dy
e41835c95e 远程调用 2025-08-14 12:31:17 +08:00
lxj
5e3fd9355d Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
/ build-parent-pom (push) Successful in 1m51s
/ build-common-modules (push) Failing after 6m11s
/ build-and-push-services (ruoyi-auth) (push) Has been skipped
/ build-and-push-services (ruoyi-gateway) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/Property) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/Sis) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Has been skipped
/ build-and-push-services (ruoyi-seata-server) (push) Has been skipped
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Has been skipped
/ build-and-push-services (ruoyi-snailjob-server) (push) Has been skipped
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Has been skipped
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Has been skipped
2025-08-14 09:34:00 +08:00
lxj
ef3c144fe6 增加事件上报类型 2025-08-14 09:33:47 +08:00
dy
a6b586836d Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-08-14 09:16:57 +08:00
dy
cef84284bb 排班区域管理 2025-08-14 09:16:19 +08:00
51c6dd2cc1 物业模块打包错误
Some checks failed
/ build-parent-pom (push) Successful in 2m6s
/ build-common-modules (push) Failing after 56s
/ build-and-push-services (ruoyi-auth) (push) Has been skipped
/ build-and-push-services (ruoyi-gateway) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/Property) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/Sis) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Has been skipped
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Has been skipped
/ build-and-push-services (ruoyi-seata-server) (push) Has been skipped
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Has been skipped
/ build-and-push-services (ruoyi-snailjob-server) (push) Has been skipped
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Has been skipped
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Has been skipped
2025-08-14 01:57:52 +08:00
dy
005dbc1110 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-08-13 16:24:14 +08:00
dy
b43c3b25e0 bug 2025-08-13 16:21:30 +08:00
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