Commit Graph

500 Commits

Author SHA1 Message Date
15683799673
9e346ba882 屏蔽海康sdk 2025-08-20 13:06:06 +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
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
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
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