Compare commits

..

718 Commits

Author SHA1 Message Date
lxj
86116cbf5c 设备同步逻辑修改
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 13m12s
2025-09-04 10:46:53 +08:00
lxj
e98890cd79 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-09-03 14:24:39 +08:00
lxj
287672d28b 取消华为盒子比对失败上报,没有授权记录上报 2025-09-03 14:24:26 +08:00
06bf8220d8 修改了巡检明细bug 2025-09-03 09:35:28 +08:00
dy
ddf00d23d6 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-09-02 15:36:22 +08:00
dy
a02864c003 区域回显 2025-09-02 15:36:12 +08:00
ecc1dadb4f Merge remote-tracking branch 'origin/master' 2025-09-01 18:07:56 +08:00
863366de7e feat(property): webSocket定时推送仪表状态功能
- 新增 HeartbeatTasks 类用于管理心跳任务
2025-09-01 18:07:33 +08:00
lxj
bb4ac2bcb8 增加人员聚集,非法停车自动指派操作 2025-09-01 17:18:50 +08:00
15683799673
046e9d925a 增加人员聚集,停车消费者
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m55s
2025-08-31 22:40:48 +08:00
15683799673
0d83a93a7b 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 13m46s
2025-08-31 19:11:33 +08:00
15683799673
d29c901352 添加人员聚集报警,非法停车报警 2025-08-31 19:11:26 +08:00
4890e9c8e3 refactor(property): 1 2025-08-31 14:12:45 +08:00
f9544ad4e1 feat(property): 优化水电气表树结构和状态获取功能
- 在 queryMeterInfoTree 方法中添加 isMeter 参数,用于控制是否返回仪表信息
- 修改 getMeterStatus 方法,增加 meterType 参数,用于指定水电气类型
- 优化 TbMeterInfoController 中的路由设计,使用 query 参数替代路径参数- 在获取仪表状态时增加异常处理,确保数据获取失败时能够返回所有数据并设置通信状态为 0
- 在 HttpUtil.post 方法中增加超时设置,提高请求稳定性
2025-08-31 12:44:04 +08:00
b1f0ce3d3c refactor(Property): 修改仪表信息获取和处理逻辑 2025-08-30 22:42:12 +08:00
28f44a1c5f feat(Property): 1 2025-08-30 21:14:04 +08:00
85a943a697 Merge remote-tracking branch 'origin/master' 2025-08-30 21:03:35 +08:00
10033dd646 feat(Property): 添加水/电/气表当前读数和状态获取功能 2025-08-30 21:03:26 +08:00
15683799673
fe8c5a76f3 Merge branch 'prod' of http://47.109.37.87:3000/by2025/SmartParks
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 13m13s
2025-08-30 06:36:57 +08:00
15683799673
3c6595e591 增加事件自动指派操作 2025-08-30 06:36:27 +08:00
97a3c106cb 修复自动排班bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m33s
2025-08-30 01:13:36 +08:00
14b8370f44 Merge pull request 'master' (#4) from master into prod
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 18m10s
Reviewed-on: #4
2025-08-29 23:30:39 +08:00
0b22169649 修改了自动派单bug 2025-08-29 21:22:59 +08:00
826684ed66 修改了自动派单排序 2025-08-29 20:43:58 +08:00
e2fbd251b3 修改了自动派单排序 2025-08-29 20:19:48 +08:00
2200ef4880 修改了自动派单排序 2025-08-29 20:16:10 +08:00
ff2bc3cf93 Merge pull request 'master' (#3) from master into prod
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 18m49s
Reviewed-on: #3
2025-08-29 18:47:06 +08:00
659f3089e4 修改了自动派单排序 2025-08-29 17:19:48 +08:00
ce0c4b201c 修改了自动派单排序 2025-08-29 16:50:21 +08:00
bad3ffdf4c 修改了保洁订单排序 2025-08-29 16:46:22 +08:00
0e0646f4b8 Merge remote-tracking branch 'origin/master' 2025-08-29 15:50:12 +08:00
fbc07ac629 refactor(property): 重构能源趋势接口
-分别返回今日和昨日、本月和上月、今年和去年的趋势数据
2025-08-29 15:50:00 +08:00
lxj
d8f5713a3d 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 12m54s
2025-08-29 11:30:16 +08:00
lxj
8afc12f3b6 修复设备添加无法调用sdk模块登录的问题 2025-08-29 11:30:00 +08:00
710379c1a4 Merge remote-tracking branch 'origin/master' 2025-08-29 09:15:34 +08:00
ac5cff7cc6 feat(sis): 1 2025-08-29 09:15:24 +08:00
15683799673
6d2741a8a5 增加事件类型判断
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 11m56s
2025-08-28 20:40:49 +08:00
15683799673
0233dad442 修改sis模块时区问题
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m9s
2025-08-28 20:16:35 +08:00
15683799673
feb16fc4b7 Merge branch 'prod' of http://47.109.37.87:3000/by2025/SmartParks
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m7s
# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/config/RocketMQClusterConfig.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/MeterRecordConsumer.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/producer/ProducerService.java
2025-08-28 19:54:41 +08:00
c773aed9c7 Merge remote-tracking branch 'origin/master' 2025-08-28 19:52:22 +08:00
db29ef77fa refactor(sis): 1 2025-08-28 19:52:11 +08:00
15683799673
fecaa7921d 增加门禁可视化 设备绑定关系解绑操作 2025-08-28 19:51:06 +08:00
15683799673
92cb1fcd63 修复门禁可视化无法播放的问题 2025-08-28 19:48:04 +08:00
lsm
fbcc6ec713 更新 ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/ZeroSensationPassageServiceImpl.java
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m35s
放开黑名单上报
2025-08-28 19:34:20 +08:00
f3591e7ff1 Merge pull request 'master' (#2) from master into prod
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 17m15s
Reviewed-on: #2
2025-08-28 17:28:27 +08:00
lxj
6d25db8c59 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-08-28 16:08:42 +08:00
15683799673
57e9ac1079 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-08-28 16:06:29 +08:00
d6623bb9da Merge remote-tracking branch 'origin/master' 2025-08-28 15:28:38 +08:00
efeafd5e13 refactor(sis): 替换图片URL 2025-08-28 15:28:05 +08:00
130e3aeb04 修改了物业排序 2025-08-28 15:18:46 +08:00
cfff5df7d0 refactor(property): 优化能源趋势查询接口返回值类型 2025-08-28 15:05:01 +08:00
lxj
1b138ab299 视频流适配内外网播放
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m27s
2025-08-28 09:09:33 +08:00
lxj
b7e9dfa148 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/config/RocketMQClusterConfig.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/MeterRecordConsumer.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/producer/ProducerService.java
2025-08-28 04:16:35 +08:00
76c0aa74f1 feat(property): 添加用电/水/气趋势分析功能 2025-08-28 01:21:12 +08:00
15683799673
825e1ed183 Merge branch 'prod' of http://47.109.37.87:3000/by2025/SmartParks
# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/config/RocketMQClusterConfig.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/MeterRecordConsumer.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/producer/ProducerService.java
2025-08-27 20:29:15 +08:00
lxj
c2f0b64e6f 修复比对失败没写入事件表的问题
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m7s
2025-08-27 19:42:33 +08:00
e61b56b05e feat(property): 添加自动抄表功能 2025-08-27 19:28:24 +08:00
eb1b2084b5 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/MeterRecordConsumer.java
2025-08-27 19:28:05 +08:00
4d76a4df45 feat(property): 添加自动抄表功能 2025-08-27 19:27:02 +08:00
lxj
0330b023a3 修复打包失败
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m38s
2025-08-27 19:18:46 +08:00
lxj
1eb95bf6f6 修复打包失败
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m8s
2025-08-27 18:37:12 +08:00
lxj
df9adf700c Merge branch 'prod' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Failing after 9m11s
2025-08-27 18:22:20 +08:00
368eea91e8 修改了水电抄表bug 2025-08-27 18:14:14 +08:00
lxj
19e259a15e 修复配置文件 2025-08-27 18:10:11 +08:00
816b90e9e1 修改了水电抄表bug 2025-08-27 18:07:27 +08:00
6133d7761d 修改了水电抄表bug 2025-08-27 18:03:49 +08:00
lxj
318da3f0ee Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/RocketMqConstants.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/FaceCaptureConsumer.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/FaceCompareConsumer.java
2025-08-27 18:01:31 +08:00
lxj
3c8eb59165 rocketmq消费者组修改 2025-08-27 17:59:56 +08:00
3c480d92f0 修改了水电抄表bug 2025-08-27 17:58:28 +08:00
78d97e14ee refactor(rocketmq): 1 2025-08-27 15:46:17 +08:00
c2c1818ba6 refactor(rocketmq): 1 2025-08-27 15:43:27 +08:00
3ebc58f5e3 refactor(rocketmq): 手动装配rocketMQ 2025-08-26 21:02:38 +08:00
07b9e8b722 Merge remote-tracking branch 'origin/master' 2025-08-26 20:33:13 +08:00
b20828a800 feat(rocketmq): 添加仪表记录消费者和生产者服务 2025-08-26 20:32:51 +08:00
9c0b0bad03 修改工单bug 2025-08-26 17:28:16 +08:00
c4495d2cf2 Merge pull request '修改了车辆收费bug' (#1) from master into prod
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 11m47s
Reviewed-on: #1
2025-08-26 13:57:40 +08:00
a16c333759 修改了车辆收费bug 2025-08-26 13:12:50 +08:00
6e84a1c646 发布
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 16m48s
2025-08-26 10:52:59 +08:00
a6b0277ff6 fix:绿植租赁方案删除 2025-08-26 10:26:47 +08:00
ef0976c621 Merge remote-tracking branch 'origin/master' 2025-08-26 09:50:12 +08:00
e949122b37 修改了车辆收费bug 2025-08-26 09:47:32 +08:00
638a98a4c6 Merge remote-tracking branch 'origin/master' 2025-08-25 18:35:32 +08:00
360f87ea0d 更新 .gitea/workflows/master.yml 2025-08-25 18:35:30 +08:00
555de9f5aa refactor(property): 1 2025-08-25 18:34:30 +08:00
da131cda5c 修改了物业一些bug
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Failing after 12m36s
2025-08-25 17:31:33 +08:00
c86f887d3e 更新 .gitea/workflows/master.yml
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 17m20s
2025-08-25 16:31:56 +08:00
2c127576a0 删除 .gitea/workflows/dev.yml
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Has been cancelled
2025-08-25 16:31:11 +08:00
15a0f3f884 更新 ruoyi-modules/Property/Dockerfile
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m25s
2025-08-24 17:51:22 +08:00
0d4754eef9 Merge remote-tracking branch 'origin/master'
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m51s
2025-08-24 16:58:14 +08:00
dad6666107 feat(ImageUtil): 添加图片压缩方向处理功能 2025-08-24 16:58:03 +08:00
dy
87b77b26d1 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-23 22:55:22 +08:00
dy
0584a44601 H5新增访客 2025-08-23 22:55:11 +08:00
15683799673
18bd1724c4 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-23 19:53:54 +08:00
15683799673
c8475f818d 修复告警详情图片获取不对的问题 2025-08-23 19:53:46 +08:00
d3a1d16b8f 修改了物业一些bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m25s
2025-08-23 19:17:29 +08:00
5ec2a67049 新增了单位接口
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m20s
2025-08-23 16:36:45 +08:00
9eeca6f32e 新增了单位接口
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m55s
2025-08-23 15:27:13 +08:00
8966b52cc5 修改了移动端新增工单
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 8m6s
2025-08-23 13:52:58 +08:00
b022d3a68c 修改了会议室等bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m15s
2025-08-22 20:52:39 +08:00
63e5abc003 修改了会议室等bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m17s
2025-08-22 20:41:13 +08:00
1d8b948a13 更新 .gitea/workflows/master.yml
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m21s
2025-08-22 20:27:29 +08:00
953a545ba6 更新 .gitea/workflows/master.yml 2025-08-22 20:26:28 +08:00
a8dc8d99df 更新 .gitea/workflows/dev.yml
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m22s
2025-08-22 20:13:25 +08:00
fb7e5c7e19 更新 .gitea/workflows/dev.yml
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Has been cancelled
2025-08-22 20:12:29 +08:00
1b5204e6ed 更新 .gitea/workflows/dev.yml
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Has been cancelled
2025-08-22 20:11:57 +08:00
8340f5cf6a 修改了会议室等bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m24s
2025-08-22 20:03:34 +08:00
lxj
9897bb8db7 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 6m25s
2025-08-22 18:14:28 +08:00
lxj
4a62ad17c3 修改详情逻辑 2025-08-22 18:14:17 +08:00
1e39769309 更新 ruoyi-modules/Sis/Dockerfile
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m20s
2025-08-22 17:55:44 +08:00
lxj
df9e3b77ff 删除hik sdk 和宇试文档
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Failing after 5m40s
2025-08-22 17:46:07 +08:00
lxj
42b5c78658 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Has been cancelled
2025-08-22 17:44:44 +08:00
lxj
49401d42ba 增加事件处理详情 2025-08-22 17:44:33 +08:00
1aa576a9ae 修改了权限bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m25s
2025-08-22 17:33:25 +08:00
dy
d0ccd668fa 修改前端不返回设备bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m30s
2025-08-22 16:29:37 +08:00
dy
3c144d00e5 前端不传集合时状态改不了的bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m19s
2025-08-22 14:48:31 +08:00
359a380937 修正nacos配置pom,添加默认配置
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m55s
2025-08-22 13:51:40 +08:00
a36667e599 修正nacos配置pom,添加默认配置
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Has been cancelled
2025-08-22 12:16:51 +08:00
1d8ad14ebc 修正nacos配置pom,添加默认配置
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m50s
2025-08-22 11:51:23 +08:00
lxj
73e47e5127 修改开放环境参数配置
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m46s
2025-08-22 10:22:27 +08:00
2e314b2901 feat(sis): 添加图片压缩工具类并优化访客照片上传逻辑
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 7m17s
2025-08-21 23:14:12 +08:00
2103be1de5 refactor(sis): 1
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m19s
2025-08-21 18:10:30 +08:00
2a143bb147 修改了工单bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m25s
2025-08-21 17:35:28 +08:00
37966e73c1 refactor(sis): 1
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m26s
2025-08-21 15:10:54 +08:00
f01d28b21e 修改了工单bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m21s
2025-08-21 14:27:30 +08:00
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
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
d9cf6ef530 物业模块
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 4m40s
2025-08-14 23:55:35 +08:00
d13f58cb95 物业模块
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Failing after 3m24s
2025-08-14 23:46:20 +08:00
9110c152aa 物业模块
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Has been cancelled
2025-08-14 23:43:25 +08:00
42b926bf75 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.gitea/workflows/master.yml
2025-08-14 23:41:47 +08:00
f488acf9cc 物业模块打包报错 2025-08-14 23:41:27 +08:00
6075704524 更新 .gitea/workflows/master.yml 2025-08-14 23:39:56 +08:00
63ee355745 物业模块打包报错 2025-08-14 23:37:12 +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
2becd3e7ce 新增工作流3
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Failing after 3m23s
2025-08-14 21:27:44 +08:00
be52875780 新增工作流3
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Failing after 1m54s
2025-08-14 21:24:11 +08:00
9d12fc7fdd 新增工作流3
Some checks failed
Build and Push to Docker Registry / 构建并推送镜像到Docker Registry (push) Failing after 1m54s
2025-08-14 21:17:29 +08:00
d235ac8e81 新增工作流3
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Failing after 1m51s
2025-08-14 21:12:12 +08:00
44e6a1b556 新增工作流3
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Failing after 1m52s
2025-08-14 21:07:03 +08:00
db30232834 新增工作流3
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Failing after 1m56s
2025-08-14 20:41:54 +08:00
515d473da0 新增工作流3
Some checks failed
Build and Push to SmartParks Registry / 构建并推送镜像到仓库注册表 (push) Failing after 1m53s
2025-08-14 20:35:16 +08:00
78a33f408f 新增工作流3
Some checks failed
Build and Push to SmartParks Registry / 构建并推送镜像到仓库注册表 (push) Failing after 1m53s
2025-08-14 20:32:26 +08:00
1179cbd77a 新增工作流3
Some checks failed
Build and Push to SmartParks Registry / 构建并推送镜像到仓库注册表 (push) Failing after 2m0s
2025-08-14 20:21:49 +08:00
c1ee3a3328 新增工作流3
Some checks failed
Build and Push to SmartParks Registry / 构建并推送镜像到仓库注册表 (push) Failing after 2m1s
2025-08-14 20:17:21 +08:00
93af6976da 新增工作流3
Some checks failed
Build and Push to SmartParks Registry / 构建并推送镜像到仓库注册表 (push) Failing after 1m54s
2025-08-14 20:14:14 +08:00
81d60e3832 新增工作流3
Some checks failed
Build and Push to SmartParks Registry / 构建并推送镜像到仓库注册表 (push) Failing after 1m53s
2025-08-14 20:11:04 +08:00
7c8ddfcda5 新增工作流3
Some checks failed
Build and Push to SmartParks Registry / 构建并推送镜像到仓库注册表 (push) Failing after 14s
2025-08-14 20:09:16 +08:00
72b431f1a9 新增工作流3
Some checks failed
Build and Push to SmartParks Registry / 构建并推送镜像到仓库注册表 (push) Failing after 0s
2025-08-14 20:08:14 +08:00
1e35f72bd9 新增工作流3
Some checks failed
Build and Push Docker Images / build-and-push (push) Failing after 2m47s
2025-08-14 19:39:06 +08:00
c5ab0b0217 新增工作流3
Some checks failed
Build and Push Docker Images / build-and-push (push) Failing after 13s
2025-08-14 19:38:20 +08:00
0db34e94fd 新增工作流3
Some checks failed
Build and Push Docker Images / build-and-push (push) Failing after 0s
2025-08-14 19:37:31 +08:00
9d0e22e9e6 新增工作流3
Some checks are pending
Build and Push Docker Images / build-and-push (push) Waiting to run
2025-08-14 19:36:39 +08:00
78cba4532d 新增工作流
Some checks failed
Build and Push Docker Images / build-and-push (push) Failing after 1m51s
2025-08-14 19:32:22 +08:00
64538d32e9 新增工作流
Some checks failed
Build and Push Docker Images / build-and-push (push) Failing after 2m0s
2025-08-14 19:29:17 +08:00
0a25ddc8ef 新增工作流
Some checks failed
Build and Push Docker Images / build-and-push (push) Failing after 14s
2025-08-14 19:26:12 +08:00
46735c04ba 新增工作流
Some checks failed
Build and Push Docker Images / build-and-push (push) Failing after 0s
2025-08-14 19:25:24 +08:00
6ceea97200 新增工作流
Some checks are pending
Build and Push Docker Images / build-and-push (push) Waiting to run
2025-08-14 19:23:51 +08:00
4b3ed9dbaf 修改基础镜像3
Some checks failed
/ build-parent-pom (push) Successful in 2m9s
/ build-and-push-services (ruoyi-auth) (push) Failing after 57s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 52s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 55s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 32s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 53s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Failing after 53s
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Failing after 56s
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Failing after 1m8s
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Failing after 58s
/ build-and-push-services (ruoyi-seata-server) (push) Failing after 19s
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Failing after 20s
/ build-and-push-services (ruoyi-snailjob-server) (push) Failing after 22s
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Failing after 52s
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Failing after 50s
2025-08-14 17:30:14 +08:00
bdaa8f2c99 Merge remote-tracking branch 'origin/master'
Some checks failed
/ build-parent-pom (push) Successful in 2m3s
/ build-and-push-services (ruoyi-auth) (push) Failing after 56s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 53s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 56s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 33s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 53s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Failing after 52s
/ 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-modules/ruoyi-system) (push) Has been cancelled
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Has been cancelled
2025-08-14 17:25:22 +08:00
c7e81a892c 修改基础镜像1 2025-08-14 17:24:34 +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
563aacd2b0 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-08-14 17:19:00 +08:00
007c40b9e6 修改基础镜像1
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:18:34 +08:00
dy
67b3ae8d17 1 2025-08-14 17:18:33 +08:00
6a7a0a344f 修改基础镜像
Some checks failed
/ build-parent-pom (push) Successful in 2m6s
/ build-common-modules (push) Successful in 1m44s
/ build-and-push-services (ruoyi-auth) (push) Failing after 45s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 40s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 1m23s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 32s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 42s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Failing after 42s
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Failing after 48s
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Failing after 57s
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Failing after 48s
/ 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 23s
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Failing after 40s
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Failing after 37s
2025-08-14 17:09:22 +08:00
11087e3f33 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.gitea/workflows/dev.yml
2025-08-14 17:08:55 +08:00
61883eff21 修改基础镜像 2025-08-14 17:08:31 +08:00
ee0664c23b 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Successful in 2m9s
/ build-common-modules (push) Successful in 1m48s
/ build-and-push-services (ruoyi-auth) (push) Failing after 48s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 1m17s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 1m30s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 26s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 1m7s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Failing after 1m17s
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Failing after 1m10s
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Failing after 1m18s
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Failing after 1m19s
/ build-and-push-services (ruoyi-seata-server) (push) Failing after 17s
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Failing after 18s
/ build-and-push-services (ruoyi-snailjob-server) (push) Failing after 20s
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Has been cancelled
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Has been cancelled
2025-08-14 16:59:00 +08:00
a8b21eeaa3 修改基础镜像
Some checks failed
/ build-parent-pom (push) Successful in 2m3s
/ build-and-push-services (ruoyi-auth) (push) Failing after 1m7s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 1m9s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 1m39s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 34s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 1m3s
/ 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-modules/ruoyi-job) (push) Has been cancelled
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Has been cancelled
2025-08-14 16:52:36 +08:00
d9264b65ab 修改基础镜像
Some checks failed
/ build-parent-pom (push) Successful in 2m5s
/ build-and-push-services (ruoyi-auth) (push) Failing after 1m8s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 1m7s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 1m30s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 33s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 1m19s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Failing after 1m33s
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Failing after 1m21s
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Failing after 1m34s
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Failing after 1m20s
/ build-and-push-services (ruoyi-seata-server) (push) Failing after 20s
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Failing after 21s
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Waiting to run
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Has been cancelled
/ build-and-push-services (ruoyi-snailjob-server) (push) Has been cancelled
2025-08-14 16:44:11 +08:00
8b9e053517 修改基础镜像
Some checks failed
/ build-parent-pom (push) Successful in 2m6s
/ build-and-push-services (ruoyi-auth) (push) Failing after 1m24s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 1m26s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 1m37s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 35s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 1m1s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Failing after 1m31s
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Failing after 1m29s
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Failing after 1m34s
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Failing after 0s
/ build-and-push-services (ruoyi-seata-server) (push) Failing after 21s
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Failing after 20s
/ build-and-push-services (ruoyi-snailjob-server) (push) Failing after 22s
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Failing after 1m29s
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Failing after 1m14s
2025-08-14 16:28:30 +08:00
6410e15b88 修改基础镜像
Some checks failed
/ build-parent-pom (push) Successful in 2m5s
/ build-and-push-services (ruoyi-auth) (push) Failing after 1m23s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 1m26s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 1m38s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 34s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 1m2s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Failing after 1m32s
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Failing after 1m29s
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Failing after 1m27s
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Failing after 1m27s
/ build-and-push-services (ruoyi-seata-server) (push) Failing after 21s
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Failing after 1s
/ build-and-push-services (ruoyi-snailjob-server) (push) Failing after 22s
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Failing after 1m54s
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Failing after 1m51s
2025-08-14 15:57:04 +08:00
8bbe92db4e 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Successful in 2m0s
/ build-and-push-services (ruoyi-auth) (push) Failing after 1m38s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 1m38s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 1m39s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 37s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 1m4s
/ 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-modules/ruoyi-resource) (push) Has been cancelled
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Has been cancelled
2025-08-14 15:50:05 +08:00
9bf0fb3568 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Successful in 2m4s
/ build-and-push-services (ruoyi-auth) (push) Failing after 1m3s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 1m2s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 1m30s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 32s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 48s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Failing after 1m3s
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Failing after 54s
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Failing after 1m4s
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Failing after 54s
/ build-and-push-services (ruoyi-seata-server) (push) Failing after 19s
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Failing after 22s
/ build-and-push-services (ruoyi-snailjob-server) (push) Failing after 21s
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Has been cancelled
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Has been cancelled
2025-08-14 15:42:10 +08:00
dy
87b641138d Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
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 15:41:17 +08:00
dy
9abb69888b 排班区域 2025-08-14 15:41:00 +08:00
cfd7a4de87 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Successful in 2m6s
/ build-and-push-services (ruoyi-auth) (push) Failing after 1m5s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 1m4s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 1m31s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 34s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 53s
/ 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-modules/ruoyi-resource) (push) Has been cancelled
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Has been cancelled
2025-08-14 15:29:20 +08:00
20c27a8f7f 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Successful in 2m5s
/ build-and-push-services (ruoyi-auth) (push) Failing after 1m3s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 1m3s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 2s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 29s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 48s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Failing after 47s
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Failing after 50s
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Failing after 1m20s
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Failing after 57s
/ build-and-push-services (ruoyi-seata-server) (push) Failing after 20s
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Failing after 22s
/ build-and-push-services (ruoyi-snailjob-server) (push) Failing after 21s
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Failing after 45s
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Has been cancelled
2025-08-14 15:22:14 +08:00
dy
2cc45acc37 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 1m6s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 1m5s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 32s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 49s
/ 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-modules/ruoyi-job) (push) Has been cancelled
/ build-and-push-services (ruoyi-modules/Property) (push) Has been cancelled
2025-08-14 15:17:13 +08:00
dy
74e5323934 部门名称 2025-08-14 15:16:53 +08:00
2556be5019 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Successful in 2m6s
/ 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 1m32s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 32s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 46s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Failing after 1m18s
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Failing after 1m7s
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Failing after 1m2s
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Failing after 56s
/ build-and-push-services (ruoyi-seata-server) (push) Failing after 19s
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Failing after 22s
/ build-and-push-services (ruoyi-snailjob-server) (push) Failing after 21s
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Failing after 1m2s
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Failing after 48s
2025-08-14 14:32:37 +08:00
52cb5277f1 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Successful in 2m3s
/ build-and-push-services (ruoyi-auth) (push) Failing after 1m7s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 1m5s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 1m58s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 33s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 47s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Failing after 1m1s
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Failing after 49s
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Failing after 1m3s
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Failing after 52s
/ build-and-push-services (ruoyi-seata-server) (push) Failing after 18s
/ 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-snailjob-server) (push) Has been cancelled
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Has been cancelled
2025-08-14 14:25:32 +08:00
92adf7e010 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Successful in 2m4s
/ build-and-push-services (ruoyi-auth) (push) Failing after 59s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 58s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 2s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 30s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 50s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Failing after 46s
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Failing after 49s
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Failing after 1m19s
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Failing after 53s
/ build-and-push-services (ruoyi-seata-server) (push) Failing after 21s
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Failing after 22s
/ build-and-push-services (ruoyi-snailjob-server) (push) Failing after 23s
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Has been cancelled
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Has been cancelled
2025-08-14 14:18:44 +08:00
7e36a04fae 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Successful in 2m10s
/ build-and-push-services (ruoyi-auth) (push) Failing after 1m7s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 1m5s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 2s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 31s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 49s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Failing after 48s
/ 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-modules/ruoyi-resource) (push) Has been cancelled
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Has been cancelled
2025-08-14 14:13:49 +08:00
6533f6720f 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Successful in 2m0s
/ build-and-push-services (ruoyi-auth) (push) Failing after 1m3s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 1m3s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 1m31s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 36s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 51s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Failing after 1m1s
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Failing after 59s
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Failing after 1m2s
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Failing after 58s
/ build-and-push-services (ruoyi-seata-server) (push) Failing after 21s
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Failing after 23s
/ build-and-push-services (ruoyi-snailjob-server) (push) Failing after 23s
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Has been cancelled
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Has been cancelled
2025-08-14 14:05:37 +08:00
f5b011a869 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Successful in 2m6s
/ build-and-push-services (ruoyi-auth) (push) Failing after 1m8s
/ build-and-push-services (ruoyi-gateway) (push) Has been cancelled
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 1m31s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 30s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 49s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Has been cancelled
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Has been cancelled
/ build-and-push-services (ruoyi-seata-server) (push) Has been cancelled
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Has been cancelled
/ build-and-push-services (ruoyi-snailjob-server) (push) Has been cancelled
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Has been cancelled
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Has been cancelled
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Has been cancelled
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Has been cancelled
2025-08-14 14:01:00 +08:00
0d6a1b268d 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Successful in 2m2s
/ build-and-push-services (ruoyi-auth) (push) Failing after 1m7s
/ build-and-push-services (ruoyi-gateway) (push) Waiting to run
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 1m42s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 34s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 50s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Failing after 49s
/ 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-modules/ruoyi-resource) (push) Has been cancelled
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Has been cancelled
2025-08-14 13:56:06 +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
b9b0a04099 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Successful in 2m0s
/ build-and-push-services (ruoyi-auth) (push) Failing after 1m0s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 59s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 1m0s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 27s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 42s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Failing after 36s
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Failing after 44s
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Failing after 3m32s
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Failing after 3m13s
/ build-and-push-services (ruoyi-seata-server) (push) Failing after 19s
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Failing after 17s
/ build-and-push-services (ruoyi-snailjob-server) (push) Failing after 20s
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Failing after 39s
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Failing after 38s
2025-08-14 12:14:12 +08:00
f807f37395 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Successful in 1m55s
/ build-and-push-services (ruoyi-auth) (push) Failing after 26s
/ build-and-push-services (ruoyi-gateway) (push) Failing after 27s
/ build-and-push-services (ruoyi-modules/Property) (push) Failing after 26s
/ build-and-push-services (ruoyi-modules/Sis) (push) Failing after 27s
/ build-and-push-services (ruoyi-modules/ruoyi-gen) (push) Failing after 27s
/ build-and-push-services (ruoyi-modules/ruoyi-job) (push) Failing after 25s
/ build-and-push-services (ruoyi-modules/ruoyi-resource) (push) Failing after 25s
/ build-and-push-services (ruoyi-modules/ruoyi-system) (push) Failing after 25s
/ build-and-push-services (ruoyi-modules/ruoyi-workflow) (push) Failing after 26s
/ build-and-push-services (ruoyi-seata-server) (push) Failing after 17s
/ build-and-push-services (ruoyi-sentinel-dashboard) (push) Failing after 17s
/ build-and-push-services (ruoyi-snailjob-server) (push) Failing after 17s
/ build-and-push-services (ruoyi-visual/ruoyi-monitor) (push) Failing after 24s
/ build-and-push-services (ruoyi-visual/ruoyi-nacos) (push) Failing after 23s
2025-08-14 12:04:13 +08:00
8c32e29571 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Successful in 1m51s
/ build-common-modules (push) Failing after 50s
/ 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 11:55:03 +08:00
de44deae2e 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Successful in 1m50s
/ build-common-modules (push) Failing after 49s
/ 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 11:35:56 +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
edf514b25d 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Successful in 7m26s
/ build-common-modules (push) Failing after 55s
/ 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 02:40:47 +08:00
afc0e69319 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-and-push (ruoyi-auth) (push) Failing after 21s
/ build-and-push (ruoyi-modules/Property) (push) Failing after 21s
/ build-and-push (ruoyi-modules/Sis) (push) Failing after 22s
/ build-and-push (ruoyi-modules/ruoyi-gen) (push) Failing after 21s
/ build-and-push (ruoyi-modules/ruoyi-job) (push) Failing after 22s
/ build-and-push (ruoyi-modules/ruoyi-resource) (push) Failing after 20s
/ build-and-push (ruoyi-modules/ruoyi-system) (push) Failing after 21s
/ build-and-push (ruoyi-modules/ruoyi-workflow) (push) Failing after 21s
/ build-and-push (ruoyi-seata-server) (push) Failing after 21s
/ build-and-push (ruoyi-snailjob-server) (push) Waiting to run
/ build-and-push (ruoyi-visual/ruoyi-monitor) (push) Waiting to run
/ build-and-push (ruoyi-visual/ruoyi-nacos) (push) Waiting to run
/ build-and-push (ruoyi-gateway) (push) Has been cancelled
/ build-and-push (ruoyi-sentinel-dashboard) (push) Has been cancelled
2025-08-14 02:36:55 +08:00
269c105282 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-all (push) Failing after 18s
/ build-and-push-images (ruoyi-auth) (push) Has been skipped
/ build-and-push-images (ruoyi-gateway) (push) Has been skipped
/ build-and-push-images (ruoyi-modules/Property) (push) Has been skipped
/ build-and-push-images (ruoyi-modules/Sis) (push) Has been skipped
/ build-and-push-images (ruoyi-modules/ruoyi-gen) (push) Has been skipped
/ build-and-push-images (ruoyi-modules/ruoyi-job) (push) Has been skipped
/ build-and-push-images (ruoyi-modules/ruoyi-resource) (push) Has been skipped
/ build-and-push-images (ruoyi-modules/ruoyi-system) (push) Has been skipped
/ build-and-push-images (ruoyi-modules/ruoyi-workflow) (push) Has been skipped
/ build-and-push-images (ruoyi-seata-server) (push) Has been skipped
/ build-and-push-images (ruoyi-sentinel-dashboard) (push) Has been skipped
/ build-and-push-images (ruoyi-snailjob-server) (push) Has been skipped
/ build-and-push-images (ruoyi-visual/ruoyi-monitor) (push) Has been skipped
/ build-and-push-images (ruoyi-visual/ruoyi-nacos) (push) Has been skipped
2025-08-14 02:26:30 +08:00
573bd4cb8c 更新 .gitea/workflows/dev.yml 2025-08-14 02:24:24 +08:00
e52ee15f0f 更新 .gitea/workflows/dev.yml 2025-08-14 02:19:06 +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
cf473bcbc8 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Failing after 8m53s
/ build-common-modules (push) Has been skipped
/ 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:41:25 +08:00
8bbf5f0eca 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Failing after 1m50s
/ build-common-modules (push) Has been skipped
/ 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:30:54 +08:00
d7c4b2ba54 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Failing after 1m1s
/ build-common-modules (push) Has been skipped
/ 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:27:48 +08:00
43f07b7396 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Failing after 1m3s
/ build-common-modules (push) Has been skipped
/ 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:22:44 +08:00
33ea126b95 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Failing after 27s
/ build-common-modules (push) Has been skipped
/ 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:17:03 +08:00
7bbf011dcf 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Failing after 18s
/ build-common-modules (push) Has been skipped
/ 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:11:07 +08:00
22dadcfdd9 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Failing after 16s
/ build-common-modules (push) Has been skipped
/ 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:08:21 +08:00
f2d66263af 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-parent-pom (push) Failing after 18s
/ build-common-modules (push) Has been skipped
/ 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:06:52 +08:00
507c2e4d8d 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-common-modules (push) Failing after 25s
/ build-and-push (ruoyi-auth) (push) Has been skipped
/ build-and-push (ruoyi-gateway) (push) Has been skipped
/ build-and-push (ruoyi-modules/Property) (push) Has been skipped
/ build-and-push (ruoyi-modules/Sis) (push) Has been skipped
/ build-and-push (ruoyi-modules/ruoyi-gen) (push) Has been skipped
/ build-and-push (ruoyi-modules/ruoyi-job) (push) Has been skipped
/ build-and-push (ruoyi-modules/ruoyi-resource) (push) Has been skipped
/ build-and-push (ruoyi-modules/ruoyi-system) (push) Has been skipped
/ build-and-push (ruoyi-modules/ruoyi-workflow) (push) Has been skipped
/ build-and-push (ruoyi-seata-server) (push) Has been skipped
/ build-and-push (ruoyi-sentinel-dashboard) (push) Has been skipped
/ build-and-push (ruoyi-snailjob-server) (push) Has been skipped
/ build-and-push (ruoyi-visual/ruoyi-monitor) (push) Has been skipped
/ build-and-push (ruoyi-visual/ruoyi-nacos) (push) Has been skipped
2025-08-14 01:00:01 +08:00
d0f825e4c9 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-common-modules (push) Failing after 18s
/ build-and-push (ruoyi-auth) (push) Has been skipped
/ build-and-push (ruoyi-gateway) (push) Has been skipped
/ build-and-push (ruoyi-modules/Property) (push) Has been skipped
/ build-and-push (ruoyi-modules/Sis) (push) Has been skipped
/ build-and-push (ruoyi-modules/ruoyi-gen) (push) Has been skipped
/ build-and-push (ruoyi-modules/ruoyi-job) (push) Has been skipped
/ build-and-push (ruoyi-modules/ruoyi-resource) (push) Has been skipped
/ build-and-push (ruoyi-modules/ruoyi-system) (push) Has been skipped
/ build-and-push (ruoyi-modules/ruoyi-workflow) (push) Has been skipped
/ build-and-push (ruoyi-seata-server) (push) Has been skipped
/ build-and-push (ruoyi-sentinel-dashboard) (push) Has been skipped
/ build-and-push (ruoyi-snailjob-server) (push) Has been skipped
/ build-and-push (ruoyi-visual/ruoyi-monitor) (push) Has been skipped
/ build-and-push (ruoyi-visual/ruoyi-nacos) (push) Has been skipped
2025-08-14 00:56:23 +08:00
4341c88b1c 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-common-modules (push) Failing after 17s
/ build-and-push (ruoyi-auth) (push) Has been skipped
/ build-and-push (ruoyi-gateway) (push) Has been skipped
/ build-and-push (ruoyi-modules/Property) (push) Has been skipped
/ build-and-push (ruoyi-modules/Sis) (push) Has been skipped
/ build-and-push (ruoyi-modules/ruoyi-gen) (push) Has been skipped
/ build-and-push (ruoyi-modules/ruoyi-job) (push) Has been skipped
/ build-and-push (ruoyi-modules/ruoyi-resource) (push) Has been skipped
/ build-and-push (ruoyi-modules/ruoyi-system) (push) Has been skipped
/ build-and-push (ruoyi-modules/ruoyi-workflow) (push) Has been skipped
/ build-and-push (ruoyi-seata-server) (push) Has been skipped
/ build-and-push (ruoyi-sentinel-dashboard) (push) Has been skipped
/ build-and-push (ruoyi-snailjob-server) (push) Has been skipped
/ build-and-push (ruoyi-visual/ruoyi-monitor) (push) Has been skipped
/ build-and-push (ruoyi-visual/ruoyi-nacos) (push) Has been skipped
2025-08-14 00:52:56 +08:00
03fc2de13b 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-and-push (ruoyi-auth) (push) Blocked by required conditions
/ build-and-push (ruoyi-gateway) (push) Blocked by required conditions
/ build-and-push (ruoyi-modules/Property) (push) Blocked by required conditions
/ build-and-push (ruoyi-modules/Sis) (push) Blocked by required conditions
/ build-and-push (ruoyi-modules/ruoyi-gen) (push) Blocked by required conditions
/ build-and-push (ruoyi-modules/ruoyi-job) (push) Blocked by required conditions
/ build-and-push (ruoyi-modules/ruoyi-resource) (push) Blocked by required conditions
/ build-and-push (ruoyi-modules/ruoyi-system) (push) Blocked by required conditions
/ build-and-push (ruoyi-modules/ruoyi-workflow) (push) Blocked by required conditions
/ build-and-push (ruoyi-seata-server) (push) Blocked by required conditions
/ build-and-push (ruoyi-sentinel-dashboard) (push) Blocked by required conditions
/ build-and-push (ruoyi-snailjob-server) (push) Blocked by required conditions
/ build-and-push (ruoyi-visual/ruoyi-monitor) (push) Blocked by required conditions
/ build-and-push (ruoyi-visual/ruoyi-nacos) (push) Blocked by required conditions
/ build-common-modules (push) Has been cancelled
2025-08-14 00:52:42 +08:00
dcda333d43 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-and-push (ruoyi-auth) (push) Failing after 37s
/ build-and-push (ruoyi-gateway) (push) Failing after 5m49s
/ build-and-push (ruoyi-modules/Property) (push) Failing after 26s
/ build-and-push (ruoyi-modules/Sis) (push) Failing after 26s
/ build-and-push (ruoyi-modules/ruoyi-gen) (push) Failing after 27s
/ build-and-push (ruoyi-modules/ruoyi-job) (push) Failing after 27s
/ build-and-push (ruoyi-modules/ruoyi-resource) (push) Failing after 26s
/ build-and-push (ruoyi-modules/ruoyi-system) (push) Failing after 25s
/ build-and-push (ruoyi-modules/ruoyi-workflow) (push) Failing after 27s
/ build-and-push (ruoyi-seata-server) (push) Failing after 22s
/ build-and-push (ruoyi-sentinel-dashboard) (push) Failing after 22s
/ build-and-push (ruoyi-snailjob-server) (push) Failing after 23s
/ build-and-push (ruoyi-visual/ruoyi-monitor) (push) Failing after 25s
/ build-and-push (ruoyi-visual/ruoyi-nacos) (push) Failing after 30s
2025-08-14 00:44:35 +08:00
86939591f5 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-and-push (ruoyi-gateway) (push) Failing after 22s
/ build-and-push (ruoyi-modules/Property) (push) Failing after 22s
/ build-and-push (ruoyi-modules/Sis) (push) Failing after 22s
/ build-and-push (ruoyi-modules/ruoyi-job) (push) Waiting to run
/ build-and-push (ruoyi-modules/ruoyi-resource) (push) Waiting to run
/ build-and-push (ruoyi-modules/ruoyi-system) (push) Waiting to run
/ build-and-push (ruoyi-modules/ruoyi-workflow) (push) Waiting to run
/ build-and-push (ruoyi-seata-server) (push) Waiting to run
/ build-and-push (ruoyi-sentinel-dashboard) (push) Waiting to run
/ build-and-push (ruoyi-snailjob-server) (push) Waiting to run
/ build-and-push (ruoyi-visual/ruoyi-monitor) (push) Waiting to run
/ build-and-push (ruoyi-visual/ruoyi-nacos) (push) Waiting to run
/ build-and-push (ruoyi-auth) (push) Has been cancelled
/ build-and-push (ruoyi-modules/ruoyi-gen) (push) Has been cancelled
2025-08-14 00:43:20 +08:00
284d7a938c 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-and-push (ruoyi-auth) (push) Failing after 22s
/ build-and-push (ruoyi-gateway) (push) Failing after 5m43s
/ build-and-push (ruoyi-modules/Property) (push) Failing after 22s
/ build-and-push (ruoyi-modules/Sis) (push) Failing after 23s
/ build-and-push (ruoyi-modules/ruoyi-gen) (push) Failing after 22s
/ build-and-push (ruoyi-modules/ruoyi-job) (push) Failing after 22s
/ build-and-push (ruoyi-modules/ruoyi-resource) (push) Failing after 23s
/ build-and-push (ruoyi-modules/ruoyi-system) (push) Failing after 21s
/ build-and-push (ruoyi-modules/ruoyi-workflow) (push) Failing after 22s
/ build-and-push (ruoyi-seata-server) (push) Failing after 22s
/ build-and-push (ruoyi-sentinel-dashboard) (push) Failing after 23s
/ build-and-push (ruoyi-snailjob-server) (push) Failing after 21s
/ build-and-push (ruoyi-visual/ruoyi-monitor) (push) Failing after 23s
/ build-and-push (ruoyi-visual/ruoyi-nacos) (push) Failing after 24s
2025-08-14 00:36:59 +08:00
c6e482b498 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-and-push (ruoyi-gateway) (push) Failing after 23s
/ build-and-push (ruoyi-modules/Property) (push) Failing after 23s
/ build-and-push (ruoyi-modules/Sis) (push) Failing after 23s
/ build-and-push (ruoyi-modules/ruoyi-gen) (push) Failing after 24s
/ build-and-push (ruoyi-modules/ruoyi-job) (push) Failing after 22s
/ build-and-push (ruoyi-modules/ruoyi-resource) (push) Failing after 23s
/ build-and-push (ruoyi-modules/ruoyi-system) (push) Failing after 22s
/ build-and-push (ruoyi-modules/ruoyi-workflow) (push) Failing after 22s
/ build-and-push (ruoyi-seata-server) (push) Failing after 22s
/ build-and-push (ruoyi-sentinel-dashboard) (push) Failing after 22s
/ build-and-push (ruoyi-snailjob-server) (push) Failing after 23s
/ build-and-push (ruoyi-visual/ruoyi-monitor) (push) Failing after 22s
/ build-and-push (ruoyi-visual/ruoyi-nacos) (push) Has been cancelled
/ build-and-push (ruoyi-auth) (push) Has been cancelled
2025-08-14 00:32:07 +08:00
aa94f476b6 更新 .gitea/workflows/dev.yml 2025-08-14 00:24:28 +08:00
abc1fdbc7a 更新 .gitea/workflows/dev.yml 2025-08-14 00:20:00 +08:00
cf60740347 更新 .gitea/workflows/dev.yml 2025-08-14 00:19:06 +08:00
b09ba939ae 更新 .gitea/workflows/dev.yml 2025-08-14 00:18:25 +08:00
4130a863de 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-and-push (ruoyi-auth) (push) Failing after 6m22s
/ build-and-push (ruoyi-gateway) (push) Failing after 1m0s
/ build-and-push (ruoyi-modules/Property) (push) Failing after 1m3s
/ build-and-push (ruoyi-modules/ruoyi-job) (push) Waiting to run
/ build-and-push (ruoyi-modules/ruoyi-resource) (push) Waiting to run
/ build-and-push (ruoyi-modules/ruoyi-system) (push) Waiting to run
/ build-and-push (ruoyi-modules/ruoyi-workflow) (push) Waiting to run
/ build-and-push (ruoyi-seata-server) (push) Waiting to run
/ build-and-push (ruoyi-sentinel-dashboard) (push) Waiting to run
/ build-and-push (ruoyi-snailjob-server) (push) Waiting to run
/ build-and-push (ruoyi-visual/ruoyi-monitor) (push) Waiting to run
/ build-and-push (ruoyi-visual/ruoyi-nacos) (push) Waiting to run
/ build-and-push (ruoyi-modules/ruoyi-gen) (push) Has been cancelled
/ build-and-push (ruoyi-modules/Sis) (push) Has been cancelled
2025-08-13 23:47:59 +08:00
26c292ea96 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-and-push (ruoyi-auth) (push) Failing after 9s
/ build-and-push (ruoyi-gateway) (push) Failing after 5s
/ build-and-push (ruoyi-modules/Property) (push) Failing after 5s
/ build-and-push (ruoyi-modules/Sis) (push) Failing after 5s
/ build-and-push (ruoyi-modules/ruoyi-gen) (push) Failing after 5s
/ build-and-push (ruoyi-modules/ruoyi-job) (push) Failing after 5s
/ build-and-push (ruoyi-modules/ruoyi-resource) (push) Failing after 5s
/ build-and-push (ruoyi-modules/ruoyi-system) (push) Failing after 5s
/ build-and-push (ruoyi-modules/ruoyi-workflow) (push) Failing after 5s
/ build-and-push (ruoyi-seata-server) (push) Failing after 5s
/ build-and-push (ruoyi-sentinel-dashboard) (push) Failing after 5s
/ build-and-push (ruoyi-snailjob-server) (push) Failing after 5s
/ build-and-push (ruoyi-visual/ruoyi-monitor) (push) Failing after 5s
/ build-and-push (ruoyi-visual/ruoyi-nacos) (push) Failing after 4s
2025-08-13 21:43:40 +08:00
fb80f4bba6 更新 .gitea/workflows/dev.yml
Some checks failed
/ build-and-push (ruoyi-auth) (push) Failing after 2s
/ build-and-push (ruoyi-gateway) (push) Failing after 1s
/ build-and-push (ruoyi-modules/Property) (push) Failing after 1s
/ build-and-push (ruoyi-modules/Sis) (push) Failing after 1s
/ build-and-push (ruoyi-modules/ruoyi-gen) (push) Failing after 1s
/ build-and-push (ruoyi-modules/ruoyi-job) (push) Failing after 1s
/ build-and-push (ruoyi-modules/ruoyi-resource) (push) Failing after 1s
/ build-and-push (ruoyi-modules/ruoyi-system) (push) Failing after 1s
/ build-and-push (ruoyi-modules/ruoyi-workflow) (push) Failing after 1s
/ build-and-push (ruoyi-seata-server) (push) Failing after 1s
/ build-and-push (ruoyi-sentinel-dashboard) (push) Failing after 1s
/ build-and-push (ruoyi-snailjob-server) (push) Failing after 1s
/ build-and-push (ruoyi-visual/ruoyi-monitor) (push) Failing after 1s
/ build-and-push (ruoyi-visual/ruoyi-nacos) (push) Failing after 1s
2025-08-13 21:38:57 +08:00
ae4969dad8 cicd
Some checks failed
/ build-and-push (ruoyi-auth) (push) Failing after 13s
/ build-and-push (ruoyi-gateway) (push) Failing after 0s
/ build-and-push (ruoyi-modules/Property) (push) Failing after 1s
/ build-and-push (ruoyi-modules/Sis) (push) Failing after 0s
/ build-and-push (ruoyi-modules/ruoyi-gen) (push) Failing after 0s
/ build-and-push (ruoyi-modules/ruoyi-job) (push) Failing after 0s
/ build-and-push (ruoyi-modules/ruoyi-resource) (push) Failing after 0s
/ build-and-push (ruoyi-modules/ruoyi-system) (push) Failing after 0s
/ build-and-push (ruoyi-modules/ruoyi-workflow) (push) Failing after 1s
/ build-and-push (ruoyi-seata-server) (push) Failing after 1s
/ build-and-push (ruoyi-sentinel-dashboard) (push) Failing after 1s
/ build-and-push (ruoyi-snailjob-server) (push) Failing after 1s
/ build-and-push (ruoyi-visual/ruoyi-monitor) (push) Failing after 1s
/ build-and-push (ruoyi-visual/ruoyi-nacos) (push) Failing after 1s
2025-08-13 20:45:58 +08:00
018714f352 cicd
Some checks failed
/ build-and-push (ruoyi-auth) (push) Failing after 0s
/ build-and-push (ruoyi-gateway) (push) Failing after 0s
/ build-and-push (ruoyi-modules/Property) (push) Failing after 0s
/ build-and-push (ruoyi-modules/Sis) (push) Failing after 0s
/ build-and-push (ruoyi-modules/ruoyi-gen) (push) Failing after 0s
/ build-and-push (ruoyi-modules/ruoyi-job) (push) Failing after 0s
/ build-and-push (ruoyi-modules/ruoyi-resource) (push) Failing after 0s
/ build-and-push (ruoyi-modules/ruoyi-system) (push) Failing after 0s
/ build-and-push (ruoyi-modules/ruoyi-workflow) (push) Failing after 0s
/ build-and-push (ruoyi-seata-server) (push) Failing after 0s
/ build-and-push (ruoyi-sentinel-dashboard) (push) Failing after 0s
/ build-and-push (ruoyi-snailjob-server) (push) Failing after 0s
/ build-and-push (ruoyi-visual/ruoyi-monitor) (push) Failing after 0s
/ build-and-push (ruoyi-visual/ruoyi-nacos) (push) Failing after 0s
2025-08-13 19:19:19 +08:00
d971fa0b92 cicd
Some checks failed
/ build-and-push (ruoyi-auth) (push) Failing after 30s
/ build-and-push (ruoyi-gateway) (push) Failing after 30s
/ build-and-push (ruoyi-modules/Property) (push) Failing after 30s
/ build-and-push (ruoyi-modules/Sis) (push) Failing after 0s
/ build-and-push (ruoyi-modules/ruoyi-gen) (push) Failing after 11s
/ build-and-push (ruoyi-modules/ruoyi-job) (push) Failing after 0s
/ build-and-push (ruoyi-modules/ruoyi-resource) (push) Failing after 0s
/ build-and-push (ruoyi-modules/ruoyi-system) (push) Failing after 0s
/ build-and-push (ruoyi-modules/ruoyi-workflow) (push) Failing after 0s
/ build-and-push (ruoyi-seata-server) (push) Failing after 0s
/ build-and-push (ruoyi-sentinel-dashboard) (push) Failing after 0s
/ build-and-push (ruoyi-snailjob-server) (push) Failing after 0s
/ build-and-push (ruoyi-visual/ruoyi-monitor) (push) Failing after 0s
/ build-and-push (ruoyi-visual/ruoyi-nacos) (push) Failing after 0s
2025-08-13 19:15:23 +08:00
727e984726 cicd
Some checks are pending
/ build-and-push (ruoyi-auth) (push) Waiting to run
/ build-and-push (ruoyi-gateway) (push) Waiting to run
/ build-and-push (ruoyi-modules/Property) (push) Waiting to run
/ build-and-push (ruoyi-modules/Sis) (push) Waiting to run
/ build-and-push (ruoyi-modules/ruoyi-gen) (push) Waiting to run
/ build-and-push (ruoyi-modules/ruoyi-job) (push) Waiting to run
/ build-and-push (ruoyi-modules/ruoyi-resource) (push) Waiting to run
/ build-and-push (ruoyi-modules/ruoyi-system) (push) Waiting to run
/ build-and-push (ruoyi-modules/ruoyi-workflow) (push) Waiting to run
/ build-and-push (ruoyi-seata-server) (push) Waiting to run
/ build-and-push (ruoyi-sentinel-dashboard) (push) Waiting to run
/ build-and-push (ruoyi-snailjob-server) (push) Waiting to run
/ build-and-push (ruoyi-visual/ruoyi-monitor) (push) Waiting to run
/ build-and-push (ruoyi-visual/ruoyi-nacos) (push) Waiting to run
2025-08-13 18:31:34 +08:00
6c4a404799 cicd
Some checks failed
/ build-and-push (ruoyi-auth) (push) Has been cancelled
/ build-and-push (ruoyi-gateway) (push) Has been cancelled
/ build-and-push (ruoyi-modules/Property) (push) Has been cancelled
/ build-and-push (ruoyi-modules/Sis) (push) Has been cancelled
/ build-and-push (ruoyi-modules/ruoyi-gen) (push) Has been cancelled
/ build-and-push (ruoyi-modules/ruoyi-job) (push) Has been cancelled
/ build-and-push (ruoyi-modules/ruoyi-resource) (push) Has been cancelled
/ build-and-push (ruoyi-modules/ruoyi-system) (push) Has been cancelled
/ build-and-push (ruoyi-modules/ruoyi-workflow) (push) Has been cancelled
/ build-and-push (ruoyi-seata-server) (push) Has been cancelled
/ build-and-push (ruoyi-sentinel-dashboard) (push) Has been cancelled
/ build-and-push (ruoyi-snailjob-server) (push) Has been cancelled
/ build-and-push (ruoyi-visual/ruoyi-monitor) (push) Has been cancelled
/ build-and-push (ruoyi-visual/ruoyi-nacos) (push) Has been cancelled
2025-08-13 17:56:12 +08:00
e41944c908 cicd
Some checks failed
/ build-and-push (ruoyi-auth) (push) Failing after 1m14s
/ build-and-push (ruoyi-gateway) (push) Failing after 5s
/ build-and-push (ruoyi-modules/Property) (push) Failing after 4s
/ build-and-push (ruoyi-modules/Sis) (push) Failing after 34s
/ build-and-push (ruoyi-modules/ruoyi-gen) (push) Failing after 33s
/ build-and-push (ruoyi-modules/ruoyi-job) (push) Failing after 34s
/ build-and-push (ruoyi-modules/ruoyi-resource) (push) Failing after 33s
/ build-and-push (ruoyi-modules/ruoyi-system) (push) Failing after 34s
/ build-and-push (ruoyi-modules/ruoyi-workflow) (push) Failing after 1m14s
/ build-and-push (ruoyi-seata-server) (push) Failing after 33s
/ build-and-push (ruoyi-sentinel-dashboard) (push) Failing after 34s
/ build-and-push (ruoyi-snailjob-server) (push) Failing after 3s
/ build-and-push (ruoyi-visual/ruoyi-monitor) (push) Failing after 34s
/ build-and-push (ruoyi-visual/ruoyi-nacos) (push) Failing after 1m4s
2025-08-13 16:50:03 +08:00
f4706ad097 更新 .gitea/workflows/dev.yml 2025-08-13 16:42:19 +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
65586d21a3 更新 .gitea/workflows/dev.yml 2025-08-13 15:39:59 +08:00
d005fec88c 更新 .gitea/workflows/dev.yml 2025-08-13 15:38:48 +08:00
2ffeb25d82 更新 .gitea/workflows/dev.yml 2025-08-13 15:37:20 +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
lxj
99758c1a60 海康增加人像库图片上传 2025-08-09 20:58:21 +08:00
e47a13c214 Merge remote-tracking branch 'origin/master' 2025-08-08 23:33:38 +08:00
ec301ac993 feat(sis): 新增轿厢电梯控制功能 2025-08-08 23:33:30 +08:00
d5e46d88df H5访客
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-08-08 18:43:48 +08:00
48984a494d 修改了保工单bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-08 11:42:59 +08:00
15683799673
15531ae029 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-07 23:13:53 +08:00
15683799673
4b4e67682b 可视化门禁逻辑完善 2025-08-07 23:13:44 +08:00
989421e244 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-07 22:34:57 +08:00
e3867b7a12 feat(sis): 支持黑名单人员管理
- 新增人员标签类型字段,用于区分红名单、白名单和黑名单
- 修改授权逻辑,黑名单人员不进行授权记录和E8平台同步
- 优化定时任务,对不同名单类型的人员进行差异化处理
- 增加黑名单人员入内的告警功能
2025-08-07 22:34:06 +08:00
6444a9330b 修改了工单bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-07 17:34:18 +08:00
dy
4893a04d39 部分数据不能查询bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-07 17:22:39 +08:00
dy
e89bd1df04 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-07 14:59:38 +08:00
dy
1a2a9a1035 排班删除和同步告警数据 2025-08-07 14:56:57 +08:00
1c23320f5a Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-07 12:06:33 +08:00
9aa58d2027 feat(sdk): 添加通用API调用方法 2025-08-07 12:06:24 +08:00
dy
6023f35674 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-07 11:25:18 +08:00
dy
2deb9b96f9 1 2025-08-07 11:24:50 +08:00
20faf13328 修改了保洁bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-07 09:39:08 +08:00
3d6fa49e8f Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 20:37:29 +08:00
2a6f258ae5 refactor(sis): - 将原有的单一外部通道号拆分为上键通道号和下键通道号 2025-08-06 20:36:00 +08:00
dy
29ba1ab5c6 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-06 16:48:15 +08:00
dy
66721b34cd 1 2025-08-06 16:47:46 +08:00
f0a7f2147f 修改了保洁bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 16:40:20 +08:00
2b19146c70 feat:工单类型不分页查询
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 14:00:01 +08:00
c78d90a316 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 12:46:14 +08:00
lxj
fedc381713 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:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/dubbo/RemotePrecautionaryImpl.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java
2025-08-06 12:39:06 +08:00
lxj
70fe6d713a 增加设备和门禁的关联关系 2025-08-06 12:35:22 +08:00
17d041e51d feat(sis): 1 2025-08-06 12:03:06 +08:00
dy
5a92f9032e 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-06 11:37:54 +08:00
dy
0a18e0c1a6 排班按月份查询重构 2025-08-06 11:37:29 +08:00
3fa1beca78 feat:工单类型树查询
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 10:08:15 +08:00
4acfdb6b35 访客接口
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 10:02:11 +08:00
00ad9a1330 feat:工单类型树查询
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-06 09:50:50 +08:00
a4e40f5123 feat(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 新增 RocketMQ 消息队列配置和相关服务
- 实现远程开门接口和服务方法
- 更新梯控下发逻辑
2025-08-06 09:16:23 +08:00
db58a91252 feat(sis):
- 新增 RocketMQ 消息队列配置和相关服务
- 实现远程开门接口和服务方法
- 更新梯控下发逻辑
2025-08-06 09:14:07 +08:00
f619c65261 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 16:35:46 +08:00
a12ee50d08 feat(device): 增加设备绑定楼层信息 2025-08-05 16:35:00 +08:00
dy
b91201cf7f 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-05 16:27:13 +08:00
dy
86c28e95dd 访客pc端新增 2025-08-05 16:26:53 +08:00
1288d27125 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 14:37:11 +08:00
b7a4e512f0 feat(auth): 优化授权组相关功能 2025-08-05 14:36:57 +08:00
cb84447450 修改了资产bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 12:15:13 +08:00
bbe911119c Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-08-05 11:54:55 +08:00
82740b7d62 refactor(sis): 冗余数据方便查询 2025-08-05 11:54:48 +08:00
dy
eb03629e84 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-05 11:22:04 +08:00
c488f666d2 refactor(sis): 1 2025-08-05 11:15:25 +08:00
dy
6d9266ee21 排班不能获取id的bug 2025-08-05 11:07:16 +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
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
dy
40a9cb65b8 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 16:18:15 +08:00
dy
6965b78db0 排班详情 2025-07-30 16:17:52 +08:00
17f342ed76 修改园区管理bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-30 16:06:47 +08:00
f0beb7be5e Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-30 09:18:39 +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
b7fa3cd788 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-29 18:37:26 +08:00
21985e48e7 fix(sis): 优化人脸照片同步和授权记录更新逻辑 2025-07-29 18:37:03 +08:00
9602ef96f7 修改园区管理bug 2025-07-29 17:27:56 +08:00
dy
d42e2c627f 班次id无法查询bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-29 17:15:45 +08:00
dy
28143d17e7 详情bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-29 16:59:17 +08:00
dy
b303ab6faa 新增固定班制主键重复修复
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-29 15:47:40 +08:00
dy
da0ba9aa0a 抽取公共方法
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-29 11:08:59 +08:00
dy
bff00b7b4a 新增排班问题处理 2025-07-29 11:06:29 +08:00
dy
64c3355e05 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-29 09:38:01 +08:00
dy
00b85990f4 修改 2025-07-29 09:37:11 +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
95b3be486a 修改园区管理bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-28 17:00:27 +08:00
fe7620fac4 修改园区管理bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-28 15:30:13 +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
cd9227be31 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-27 23:11:06 +08:00
dy
bee90b70d1 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-27 22:54:10 +08:00
dy
f92ef72238 1 2025-07-27 22:53:46 +08:00
15b25144f0 SOS 2025-07-27 22:40:39 +08:00
23e3100146 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-27 22:00:54 +08:00
b857a2121b refactor(sis): 1 2025-07-27 22:00:41 +08:00
dy
b3813dfe75 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-27 21:01:18 +08:00
dy
ae44ccb565 周期表不能插入bug及修改 2025-07-27 21:01:02 +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
4458432b5d Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-27 19:47:17 +08:00
041db8c435 feat(sis): 添加模拟上下文登录功能 2025-07-27 19:47:05 +08:00
1a900ad3db feat(sis): 添加模拟上下文登录功能 2025-07-27 19:46:18 +08:00
7bdd9ff072 新增采购功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-27 17:10:30 +08:00
dy
eb7d29640b 详情返回无打卡日期bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-27 17:07:58 +08:00
dy
dd733fe5e2 数据无返回bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-27 16:01:55 +08:00
dy
ff7bf241cb 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-27 15:28:22 +08:00
dy
a043e18ba6 默认值
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-27 15:22:50 +08:00
dy
751e65774f 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-27 15:03:21 +08:00
dy
2150602335 1 2025-07-27 15:01:43 +08:00
dy
f5159ab5f7 1 2025-07-27 14:43:13 +08:00
dy
cd2703080d 考勤组插入bug 2025-07-27 14:42:07 +08:00
dy
ca4d366d74 考勤组插入bug 2025-07-27 14:41:53 +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
47f389c560 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-26 17:54:17 +08:00
127336af6d refactor(sis): 定时任务逻辑 2025-07-26 17:53:57 +08:00
ba0c495c42 新增车辆管理功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-26 17:53:48 +08:00
d070a52487 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-26 02:37:23 +08:00
3b7635bf1d feat(auth): 人员授权相关功能修改 2025-07-26 02:37:02 +08:00
99336196e0 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-25 23:19:44 +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
b1fb876181 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-25 21:29:19 +08:00
84e79b0414 feat(sis): 1 2025-07-25 21:29:08 +08:00
819105a470 修改了社区bug 2025-07-25 18:17:34 +08:00
dy
c0d43c01c6 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 10:28:21 +08:00
dy
6cc04a9cac 修改id传值 2025-07-25 10:26:31 +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
a1942c34cb Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-24 11:20:40 +08:00
399f48f1b4 feat(auth-group): 新增授权组门禁和电梯关联功能 2025-07-24 11:20:19 +08:00
eaef24b3b7 app功能列表
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-24 11:07:28 +08:00
c49bc001bb 修改了社区bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-24 10:58:17 +08:00
81ebb3e8c1 修改了社区bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-24 10:20:38 +08:00
31291b4413 增加工单看板功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-23 20:52:32 +08:00
dy
a24c9dce47 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-23 19:28:14 +08:00
dy
2631febd2a 新增时间的问题 2025-07-23 19:27:43 +08:00
8ae12277d8 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-23 17:32:11 +08:00
1124b832ac feat(sis): 添加权限组⇄设备关联功能 2025-07-23 17:30:27 +08:00
dy
919d0937cd 考勤组bug修改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-23 17:13:41 +08:00
dy
1388e918c3 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-23 16:20:57 +08:00
dy
5da0665092 考勤组bug修改 2025-07-23 16:20:25 +08:00
e026c73627 修改了会议记录bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-23 15:20:06 +08:00
99c15c311f 修改了会议记录bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-23 15:01:21 +08:00
2c8d32f945 feat(property): 添加权限组字段
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-23 13:15:13 +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
350b8f511c 新增客户服务功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-23 09:28:20 +08:00
359e73fa97 新增客户服务功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-22 20:53:33 +08:00
lxj
9ac415d6fc 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-22 19:25:18 +08:00
lxj
67bf690c8a 流媒体服务接口逻辑更改 2025-07-22 19:25:09 +08:00
dy
ab9fc43996 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-22 15:49:47 +08:00
dy
c289a25829 日历的具体考勤和班次信息 2025-07-22 15:49:18 +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
77b345e017 sso
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-22 10:13:14 +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
9fc7fb0fde 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:00:50 +08:00
15683799673
ed091501d7 增加按需取流接口 2025-07-21 21:00:40 +08:00
1e9efc77ed 修改了工单bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-21 20:56:46 +08:00
0b90663d3d 修改了工单bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-21 14:37:15 +08:00
dy
4010cc7dfa 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-21 10:10:30 +08:00
dy
f3973d2595 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
# Conflicts:
#	pom.xml
2025-07-21 10:07:51 +08:00
dy
34d7b40645 时间格式化问题 2025-07-21 10:04:56 +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
7511227e51 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-20 19:23:41 +08:00
a198e0c720 fix(property): 2025-07-20 19:23:22 +08:00
0e5e73be26 sso
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-20 18:50:36 +08:00
f45442e954 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-20 15:02:02 +08:00
63b96a79d6 fix(property): 2025-07-20 15:01:54 +08:00
e6c3c7d88a 修改了费用bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-20 14:52:38 +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
dy
f24df2e494 依赖冲突
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-20 10:32:06 +08:00
dy
0c0ecf8f93 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-19 17:15:01 +08:00
dy
8c4748c9a3 修复排班bug 2025-07-19 17:12:58 +08:00
dy
e4c21c831b 修复排班bug 2025-07-19 17:10:57 +08:00
073e235179 refactor(property): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-19 16:55:27 +08:00
98fb035a97 refactor(property): meter_type字典转换
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-19 16:21:55 +08:00
eb5efd9a6c refactor(property): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-19 13:52:02 +08:00
5a88e94c23 refactor(property): 水电气表字段更改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-19 13:42:03 +08:00
b4228c0425 feat(property): 添加仪表抄记功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-19 12:38:54 +08:00
dy
49ec73df49 1 2025-07-19 09:52:37 +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
aa5b0b9478 修改了费用bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-18 20:57:02 +08:00
6163532f39 修改了费用bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-18 17:48:04 +08:00
lxj
b7d225c107 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-18 15:13:31 +08:00
lxj
305705abc0 增加海康摄像头上报事件 2025-07-18 15:13:18 +08:00
dy
625be80cf2 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-18 11:07:22 +08:00
dy
5d042a2151 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-18 10:10:48 +08:00
dy
75292374fa 排班 2025-07-18 10:04:38 +08:00
dy
72b3e40124 排班 2025-07-18 10:03:44 +08:00
dy
d8dfde621e 排班 2025-07-18 10:03:20 +08:00
9c0591dfaa Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-18 09:22:10 +08:00
9f2c4658a0 新增费用功能 2025-07-18 09:21:44 +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
ec2d00ac72 refactor(sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-17 16:39:37 +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
7928aa16f8 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-16 22:01:53 +08:00
43933c83c5 feat(property): floor 2025-07-16 22:01:36 +08:00
dy
f16a9e0897 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 19:15:46 +08:00
dy
63dd804ced 固定班制的新增业务 2025-07-16 19:15:27 +08:00
dbf9346953 新增设备管理功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-16 17:40:37 +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
3511a0b8c1 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-16 10:13:29 +08:00
ed97e7cefb feat(property):
- 新增查询所有楼层和根据单元ID查询楼层的功能
- 在新增楼层时增加同一单元楼层重复校验
2025-07-16 10:12:24 +08:00
dy
365ec14925 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 09:45:45 +08:00
dy
978c1f6f9e 新增状态常量使用 2025-07-16 09:45:29 +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
dy
47c35c603c 修改班次管理业务逻辑 2025-07-15 22:42:05 +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
dy
94b0156479 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-07-15 15:17:08 +08:00
dy
bd484cf106 考勤基本代码 2025-07-15 15:16:47 +08:00
a04a6b5571 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-15 13:44:12 +08:00
172ede3eb3 feat(auth): 人员库授权功能调整 2025-07-15 13:43:55 +08:00
e473d9b905 修改巡检任务bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-15 12:28:30 +08:00
54655ae6d6 修改巡检任务bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-15 11:52:38 +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
9305db7f7a Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-14 18:27:07 +08:00
c1bcdd367a feat(sis):
- 添加人像写入关联表
 - 人像信息表libId删除
2025-07-14 18:26:35 +08:00
71814b3b5b 修改工单类型bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-14 17:34:15 +08:00
83cc3a4f84 feat(sis): 人像关系id
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-14 14:32:08 +08:00
2d14253d5c feat(sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-14 11:24:59 +08:00
eb8665c872 Merge remote-tracking branch 'origin/master' 2025-07-14 11:23:05 +08:00
7440f1bc9a feat(sis): 新增人像库-人像图片关联 2025-07-14 11:22:19 +08:00
0cf20a8408 1、入驻单位状态修改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-14 10:14:18 +08:00
lxj
250d308a7f 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-13 17:45:26 +08:00
lxj
30f70fd08d 梯控对接 2025-07-13 17:43:02 +08:00
25ffc7adc7 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-12 15:45:55 +08:00
43171c2cac refactor(sis): 华为盒子心跳保活 2025-07-12 15:45:36 +08:00
lxj
3e81ca335f 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-12 14:00:47 +08:00
lxj
5ad50d96b9 hik sdk 对接人脸抓拍 2025-07-12 13:52:44 +08:00
6246f897cb refactor(sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-12 11:15:51 +08:00
767551cb34 refactor(sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-12 10:43:31 +08:00
f11f199f51 refactor(sis): - 华为人脸对比改动
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-12 09:58:22 +08:00
34dc9d652b refactor(sis): - 华为人脸对比改动 2025-07-12 09:57:55 +08:00
421bc821eb refactor(sis): - E8同步
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-11 19:27:20 +08:00
13eee82adc Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-11 17:57:34 +08:00
493c0e641f refactor(sis): - E8同步 2025-07-11 17:57:17 +08:00
7c9f400cfd 新增巡检功能
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-11 17:30:18 +08:00
dy
1beae8d9af 修改不能按条件查询的bug
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 23s
2025-07-11 11:15:28 +08:00
dy
8c6e6507df Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-07-11 10:07:04 +08:00
dy
0fe62c735c 修改备注不能为空的问题 2025-07-11 10:01:41 +08:00
15683799673
be7002153c 授权逻辑更改
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 21s
2025-07-11 07:37:41 +08:00
6a7095ec58 refactor(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 同步删除华为盒子人像
 - 华为盒子人脸比对接口
2025-07-10 22:59:53 +08:00
7db6d2adac refactor(sis):
- 同步删除华为盒子人像
 - 华为盒子人脸比对接口
2025-07-10 22:58:42 +08:00
d70d99fb9a refactor(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 人员库业务逻辑调整
- 人像信息业务逻辑调整
- 华为盒子服务
2025-07-10 21:05:13 +08:00
lxj
2347d46a9b Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-10 18:36:58 +08:00
lxj
815fe53f1a 增加梯控服务 2025-07-10 18:36:45 +08:00
dy
6127223a78 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-07-10 14:50:22 +08:00
dy
f9ea62db04 1 2025-07-10 14:43:57 +08:00
4e60d1f3d1 修改工单类型bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-10 14:30:34 +08:00
cf920532dd 更新 .gitea/workflows/dev.yml
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-10 11:36:32 +08:00
f319a320ce 更新 .gitea/workflows/dev.yml 2025-07-10 11:21:32 +08:00
15683799673
f98e94ecd1 增加电梯表 2025-07-10 08:45:01 +08:00
8ad79b4369 更新 .gitea/workflows/dev.yml 2025-07-10 01:58:53 +08:00
2eab7e5242 新增工单类型表
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 13m26s
2025-07-09 18:17:51 +08:00
ca962395f6 Merge remote-tracking branch 'origin/master' 2025-07-09 18:17:10 +08:00
lxj
302c4be55c Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-09 18:11:07 +08:00
lxj
c7ff295d76 增加hik梯控操作 2025-07-09 18:10:52 +08:00
7ccce852e9 新增工单类型表 2025-07-09 16:26:10 +08:00
52cffa205c 新增mapper注解
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-09 13:46:30 +08:00
dy
8233524b2b 默认设置新增订单时为未退订
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-09 13:17:40 +08:00
dy
74c7a809d9 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-09 13:08:13 +08:00
dy
a8b1254b96 实体类新增is_unbooking字段 2025-07-09 13:07:59 +08:00
eb1ec10c86 修改了会议预约记录列表bug
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-09 12:38:05 +08:00
21c149bf0c 修改了会议预约记录bug
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 12m42s
2025-07-09 09:16:54 +08:00
dy
e3e4e38f91 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m44s
2025-07-08 23:41:23 +08:00
dy
a5dae3530d 解决新增问题和根据id查询问题 2025-07-08 23:41:03 +08:00
f69326343e 修改了会议预约bug
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 8m37s
2025-07-08 16:13:56 +08:00
c49bb4cdb3 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-08 16:08:38 +08:00
bb98a34fa6 1、 2025-07-08 16:08:19 +08:00
ba9202e6ca 修改了会议设置bug
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 13m8s
2025-07-07 17:30:03 +08:00
7dc0a87a23 修改了会议设置bug
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 10s
2025-07-07 17:20:28 +08:00
dy
1ca5352a9d Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 13m54s
2025-07-07 15:27:33 +08:00
dy
a349719de9 解决总价不能上传的问题 2025-07-07 15:27:21 +08:00
7b40b084c1 1、绿植统计下单客户总数
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m42s
2025-07-07 14:16:01 +08:00
9a34602030 1、租赁订单
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 22m59s
2025-07-05 17:38:27 +08:00
73b4581836 新增支付状态枚举接口
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-07-05 15:54:34 +08:00
322a9944e8 新增支付状态枚举接口
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-05 15:45:50 +08:00
487480c0e1 更新 ruoyi-modules/Property/Dockerfile
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 38s
2025-07-05 14:25:46 +08:00
da70a913a9 Merge remote-tracking branch 'origin/master'
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 4m25s
2025-07-05 11:51:37 +08:00
594f6d8759 更新 .gitea/workflows/dev.yml
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-07-05 11:50:34 +08:00
5b45214bbe Merge remote-tracking branch 'origin/master' 2025-07-05 11:49:09 +08:00
20f6cc8541 refactor(sis): base64指定格式JPG 2025-07-05 11:48:57 +08:00
521dac9d14 更新 .gitea/workflows/dev.yml
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 4m5s
2025-07-05 11:27:51 +08:00
4e2ce2f922 更新 .gitea/workflows/dev.yml
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 4m33s
2025-07-05 11:15:12 +08:00
d09c0c7df8 新增会议室设置和会议室增值服务
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 4m11s
2025-07-05 11:07:04 +08:00
9217befba8 refactor(sis): 1
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m43s
2025-07-05 10:07:46 +08:00
c5a5fccb57 更新 .gitea/workflows/dev.yml
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-07-05 09:52:18 +08:00
8f0fc2fd32 更新 .gitea/workflows/dev.yml 2025-07-05 09:52:07 +08:00
42c55b757a 更新 .gitea/workflows/dev.yml
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7s
2025-07-05 09:51:32 +08:00
2c6733d1ea 上传文件至 ruoyi-modules/Property
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 10m27s
2025-07-04 18:03:29 +08:00
1e16f5efc8 更新 .gitea/workflows/dev.yml
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-07-04 18:02:58 +08:00
014a157921 1、绿植租赁统计
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-07-04 17:59:19 +08:00
f9a7990de9 更新 .gitea/workflows/dev.yml
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m20s
2025-07-04 17:44:53 +08:00
79d55e458f 新增会议室设置和会议室增值服务
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m43s
2025-07-04 14:57:15 +08:00
dy
398e19f2f7 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-07-03 12:05:10 +08:00
dy
4a20ec11db 保洁订单详情 2025-07-03 12:04:51 +08:00
dy
147c67b5ad 保洁订单详情 2025-07-03 09:36:04 +08:00
9a8ccb1f57 1、租赁订单统计
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled
2025-07-02 17:58:52 +08:00
lxj
84de853d7c 人脸远程报警完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 17:54:54 +08:00
d300606070 refactor(sis): 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 11:41:24 +08:00
bb94581a59 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-02 11:20:59 +08:00
6029392c7a refactor(sis): 将E8门禁设备 ID 类型从 Integer改为 Long 2025-07-02 11:20:35 +08:00
dy
3ff380ab50 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-02 10:39:47 +08:00
dy
ba5225f4c7 1 2025-07-02 10:39:36 +08:00
a065d72724 refactor(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- E8平台授权逻辑调整
2025-07-01 21:17:22 +08:00
baf9502b61 Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-01 17:12:41 +08:00
9a1a87800f feat(sis):
- 图像库图片改为通过ossId获取
- SisPersonLibImg 字段 imgUrl 更改为 imgOssId,类型同步更改
- 移除SisDeviceManage 中的 accessControlId 字段
2025-07-01 17:10:04 +08:00
dy
49d512970d 依赖
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-01 15:15:16 +08:00
dy
5ed4796d3c Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-07-01 15:13:48 +08:00
dy
2a2b400760 保洁逻辑修改 2025-07-01 15:13:38 +08:00
lxj
26be25d9cb 增加property-api模块
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-07-01 10:47:38 +08:00
15683799673
d2638de4e4 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-01 08:46:07 +08:00
15683799673
b70c3f2ee1 增加门禁查询树接口 2025-07-01 08:45:45 +08:00
dy
1b158eb6ae Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
# Conflicts:
#	ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbBuildingVo.java
2025-06-30 20:09:22 +08:00
dy
b8ccb255d5 保洁查询和新增的问题 2025-06-30 20:05:58 +08:00
dy
7c95a690ea 保洁查询和新增的问题 2025-06-30 20:00:07 +08:00
86503753bb 1、绿植租赁订单
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2、绿植租赁收费
3、绿植租赁订单养护
2025-06-30 17:21:30 +08:00
75cc08fa99 驼峰变动
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-30 10:13:07 +08:00
15683799673
3837c2f2ef 增加门禁授权
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-30 06:17:21 +08:00
15683799673
6ea6c79341 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-06-29 18:30:05 +08:00
15683799673
968200b4c0 1 2025-06-29 18:29:59 +08:00
116abb4113 refactor(sis): E8授权逻辑更改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-29 17:17:02 +08:00
abeac0c7c7 refactor(sis): 优化授权
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-29 16:19:26 +08:00
39f35fe58b feat(sis): 添加 E8平台对应关系模块
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-29 11:49:31 +08:00
15683799673
8b065703cd 增加门禁设备
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-29 02:59:43 +08:00
15683799673
6b1e9253af 综合管理模块完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-28 22:48:11 +08:00
873cf303c2 feat(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 人像授权
 - 上传图片简化
2025-06-28 13:42:09 +08:00
3560c80c41 feat(sis):
- 修改人像图片
2025-06-28 10:23:42 +08:00
15683799673
62b1e1b803 1
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-28 02:41:55 +08:00
15683799673
0d8a4608ce 人像库图片完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-28 01:35:17 +08:00
15683799673
3721689ce7 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:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java
2025-06-28 01:33:02 +08:00
15683799673
a259305f90 人像库图片完成 2025-06-28 01:28:31 +08:00
15683799673
18f37be0d5 人像库图片完成 2025-06-28 01:27:04 +08:00
e13230dc4e feat(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 人像图片与宇视平台同步操作(新增,删除),关联表同步写入/删除,可选同步至E8平台
2025-06-28 00:50:50 +08:00
9b2904ad06 feat(sis):
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
- 人像库操作与宇视平台同步操作(新增,删除),关联表同步写入/删除
- 人像图片与宇视平台同步操作(新增,删除),关联表同步写入/删除,可选同步至E8平台
- 关联关系改为id关联
2025-06-27 23:53:22 +08:00
4fb1de5a9b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CodePrefixConstants.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisLibDeviceRef.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceImgRefBo.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisLibDeviceRefBo.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceImgRefVo.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisLibDeviceRefVo.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisLibDeviceRefService.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java
2025-06-27 23:44:10 +08:00
3deaea69bb feat(sis):
- 人像库操作与宇视平台同步操作(新增,删除),关联表同步写入/删除
- 人像图片与宇视平台同步操作(新增,删除),关联表同步写入/删除,可选同步至E8平台
- 关联关系改为id关联
2025-06-27 23:13:34 +08:00
15683799673
7216b08530 人像库页面以及后端完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-27 22:18:14 +08:00
15683799673
e55ecffb98 java 实体类型long改int
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-27 20:28:33 +08:00
15683799673
f85f2a75e0 修改报错
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-27 17:54:38 +08:00
dy
b4f2dfd632 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-06-27 17:43:29 +08:00
dy
0e8cb20ffd 修改区域查询和新增保洁管理的问题 2025-06-27 17:42:40 +08:00
lxj
56b40bd5ad 人像库完成
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
2025-06-27 17:13:01 +08:00
dy
c7446fde32 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 6m55s
2025-06-27 09:20:07 +08:00
dy
ac3e1d0330 修改线上nacos配置 2025-06-27 09:19:53 +08:00
lxj
eba821a141 Merge branch 'master' of http://192.168.110.207:3000/by2025/SmartParks
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 8m34s
2025-06-26 22:02:09 +08:00
lxj
f2a1bdc0bf 页面修改 2025-06-26 22:01:48 +08:00
dy
bea34b0999 处理新增保洁订单的问题 2025-06-26 21:59:39 +08:00
dy
7bd6aa9977 处理新增保洁订单的问题 2025-06-26 21:59:24 +08:00
dy
850b312820 修改nacos配置问题
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 7m39s
2025-06-26 18:16:14 +08:00
1201 changed files with 78105 additions and 6963 deletions

View File

@@ -1,52 +0,0 @@
name: Gitea Actions Demo
run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
on: [push]
jobs:
Explore-Gitea-Actions:
runs-on: ubuntu-22.04
steps:
- name: Checkout code
uses: http://127.0.0.1:3000/bichangxiong/checkout@v4 # 使用 Gitea 镜像
with:
fetch-depth: 1 # 只拉取最新一次提交
- name: Maven
run: mvn clean install
- name: Build with Maven
run: mvn -B package -DskipTests -pl ruoyi-modules/Property -am
- name: cp
run: copy ./ruoyi-modules/Property/target/Property.jar C:\devtool\server
- name: kill
run: Get-NetTCPConnection -LocalPort 10001 -State Listen -ErrorAction SilentlyContinue | Where-Object { $_.OwningProcess -ne $null } | ForEach-Object { Stop-Process -Id $_.OwningProcess -Force -ErrorAction SilentlyContinue }
- name: run
run: java -jar C:\devtool\server\Property.jar
# - copy ./ruoyi-modules/Property/target/Property.jar C:\devtool\server
# - pwd
# - java -jar ./docker/jar/Property.jar
# - name: cd
# run: cd ruoyi-modules/Property
# - name: Build with Maven
# run: mvn -B clean package -DskipTests --file pom.xml
# - name: Start Spring Cloud Services
# run: |
# # 启动顺序示例:注册中心 -> 配置中心 -> 网关 -> 业务服务
# echo "Starting Server..."
# java -jar Property.jar
# SERVER_PIDS[0]=$!
# # 等待注册中心启动
# sleep 30
# done
# 保持工作流运行,避免服务被终止
# wait
# env:
# JAVA_OPTS: "-Xmx512m -Xms256m"
# timeout-minutes: 20

View File

@@ -0,0 +1,94 @@
name: Build and Push to Target Registry
# 监听master分支的推送事件
on:
push:
branches: [ prod ]
jobs:
build-and-deploy:
name: 构建并推送镜像到目标仓库
runs-on: ubuntu
timeout-minutes: 30
steps:
- name: 拉取代码
uses: http://git.missmoc.top/mocheng/checkout@v4
with:
fetch-depth: 0
- name: 使用Maven构建项目
run: |
echo "===== 开始Maven构建 ====="
/maven/apache-maven-3.9.11/bin/mvn clean package -DskipTests
echo "===== Maven构建完成 ====="
- name: 构建并推送Docker镜像
env:
# 替换为你的Docker Registry地址例如localhost:5000 或 192.168.1.100:5000
TARGET_REGISTRY: 127.0.0.1:5000
# 目标仓库中的项目名称
TARGET_PROJECT: smartparks
run: |
echo "===== 环境信息 ====="
echo "目标仓库: $TARGET_REGISTRY/$TARGET_PROJECT"
# 【删除登录步骤】因为仓库无认证,无需登录
echo "===== 查找项目中的Dockerfile ====="
dockerfiles=$(find . -type f -name "Dockerfile" ! -path "./.git/*")
if [ -z "$dockerfiles" ]; then
echo "警告未找到任何Dockerfile"
exit 0
fi
# 处理每个Dockerfile后续构建、推送逻辑与之前类似保持不变
echo "$dockerfiles" | while read -r dockerfile; do
echo "===== 处理Dockerfile: $dockerfile ====="
docker_context=$(dirname "$dockerfile")
image_tag=$(echo "$docker_context" | sed 's|./||g' | tr '/' '-' | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9_-]//g')
full_image_name="$TARGET_REGISTRY/$TARGET_PROJECT:$image_tag-${{ github.sha }}"
echo "镜像名称: $full_image_name"
# 检查JAR包是否存在
echo "===== 检查JAR包 ====="
jar_files=$(find "$docker_context" -name "*.jar" -type f)
if [ -z "$jar_files" ]; then
echo "警告:在 $docker_context 目录中未找到JAR包"
continue
fi
echo "找到JAR包"
echo "$jar_files"
echo "===== 构建镜像 ====="
if ! docker build -t "$full_image_name" -f "$dockerfile" "$docker_context"; then
echo "错误:构建镜像失败"
exit 1
fi
echo "===== 推送镜像到仓库 ====="
if ! docker push "$full_image_name"; then
echo "错误:推送镜像失败,请检查仓库是否可访问"
exit 1
fi
# 推送latest标签逻辑保持不变
latest_image="$TARGET_REGISTRY/$TARGET_PROJECT:$image_tag-latest"
echo "===== 推送最新标签: $latest_image ====="
docker tag "$full_image_name" "$latest_image"
if ! docker push "$latest_image"; then
echo "错误推送latest标签失败"
exit 1
fi
done
echo "===== 清理操作 ====="
docker system prune -f
echo "===== 所有操作完成 ===="
- name: 重启服务
run: |
kubectl rollout restart deployment sis -n smartparks
kubectl rollout restart deployment property -n smartparks

BIN
lib/hik/jna-4.5.2_1.jar Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="GB2312"?>
<SdkLocal>
<SdkLog>
<logLevel>3</logLevel><!--req, 1-ERROR, 2-DEBUG, 3-INFO-->
<logDirectory>./SDKLOG/</logDirectory><!--the end of the string must be '/'-->
<autoDelete>true</autoDelete><!--true: There are less than 10 files in the directory, it will be auto deleted by sdk when the files are more than 10; false: No upper limit to the number of log files-->
</SdkLog>
<HeartbeatCfg>
<Interval>120</Interval> <!-- <20><><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><EFBFBD><EBA3AC><EFBFBD><EFBFBD>0<EFBFBD><30>ʹ<EFBFBD><CAB9>Ĭ<EFBFBD><C4AC>ֵ120s<30><73>ȡֵ<C8A1><D6B5>ΧΪ[30, 120] С<><D0A1>30s<30><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ30s<30><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD>120s<30><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ120s-->
<Count>1</Count> <!-- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ص<EFBFBD><D8B5><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>0<EFBFBD><30>ʹ<EFBFBD><CAB9>Ĭ<EFBFBD><C4AC>ֵ1<D6B5><31>-->
</HeartbeatCfg>
</SdkLocal>

Binary file not shown.

Binary file not shown.

BIN
lib/hik/linux64/libNPQos.so Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
lib/hik/linux64/libhpr.so Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
lib/hik/linux64/libz.so Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1 @@
The dll in this directory<72><79>iconv.dll,libxml2.dll,zlib1.dll,calib.dll<6C><6C>only used in ClientDemo.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

View File

@@ -0,0 +1,25 @@
{
"Devices": [{
"ID": 0,
"SerialNumber": "DS-K221020240130V010006CHGB5685986",
"ChannelNumber": 0,
"StartChannel": 1,
"AlarmInNum": 0,
"AlarmOutNum": 2,
"IPChanNum": 0,
"MirrorChanNum": 0,
"StartMirrorChanNo": 0,
"LocalNodeName": "192.168.110.196",
"DeviceType": 864,
"DiskNum": 0,
"LoginUserName": "admin",
"LoginUserPwd": "qweasd123",
"DeviceIP": "192.168.110.196",
"DeviceMultiIP": "0.0.0.0",
"DevicePort": 8000,
"DeviceName": "",
"LoginMode": 0,
"Https": 0,
"Channels": []
}]
}

BIN
lib/hik/win64/GdiPlus.dll Normal file

Binary file not shown.

BIN
lib/hik/win64/GdiPlus.lib Normal file

Binary file not shown.

BIN
lib/hik/win64/HCCore.dll Normal file

Binary file not shown.

BIN
lib/hik/win64/HCCore.lib Normal file

Binary file not shown.

BIN
lib/hik/win64/HCNetSDK.dll Normal file

Binary file not shown.

BIN
lib/hik/win64/HCNetSDK.lib Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
lib/hik/win64/HXVA.dll Normal file

Binary file not shown.

BIN
lib/hik/win64/HmMerge.dll Normal file

Binary file not shown.

View File

BIN
lib/hik/win64/LocalXml.zip Normal file

Binary file not shown.

BIN
lib/hik/win64/MP_Render.dll Normal file

Binary file not shown.

BIN
lib/hik/win64/NPQos.dll Normal file

Binary file not shown.

BIN
lib/hik/win64/OpenAL32.dll Normal file

Binary file not shown.

BIN
lib/hik/win64/PlayCtrl.dll Normal file

Binary file not shown.

BIN
lib/hik/win64/PlayCtrl.lib Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
lib/hik/win64/hlog.dll Normal file

Binary file not shown.

BIN
lib/hik/win64/hpr.dll Normal file

Binary file not shown.

Binary file not shown.

BIN
lib/hik/win64/libmmd.dll Normal file

Binary file not shown.

Binary file not shown.

BIN
lib/hik/win64/zlib1.dll Normal file

Binary file not shown.

60
pom.xml
View File

@@ -58,7 +58,8 @@
<warm-flow.version>1.7.3</warm-flow.version>
<!-- mq配置 -->
<rocketmq.version>2.3.0</rocketmq.version>
<!-- hik sdk 配置 -->
<hik-sdk.version>1.0</hik-sdk.version>
<!-- 插件版本 -->
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
@@ -69,19 +70,16 @@
<profiles>
<profile>
<id>dev</id>
<id>local</id>
<properties>
<!-- 环境标识,需要与配置文件的名称相对应 -->
<profiles.active>dev</profiles.active>
<nacos.server>127.0.0.1:8848</nacos.server>
<logstash.address>127.0.0.1:4560</logstash.address>
<!-- <nacos.server>47.109.37.87:8848</nacos.server>-->
<!-- <logstash.address>47.109.37.87:4560</logstash.address>-->
<nacos.server>10.20.1.65:8848</nacos.server>
<logstash.address>10.20.1.65:4560</logstash.address>
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
<nacos.username>nacos</nacos.username>
<nacos.password>nacos</nacos.password>
<!-- <logstash.address>127.0.0.1:4560</logstash.address>-->
</properties>
<activation>
<!-- 默认环境 -->
@@ -89,17 +87,43 @@
</activation>
</profile>
<profile>
<id>prod</id>
<id>dev</id>
<properties>
<profiles.active>prod</profiles.active>
<nacos.server>127.0.0.1:8848</nacos.server>
<!-- 环境标识,需要与配置文件的名称相对应 -->
<profiles.active>dev</profiles.active>
<nacos.server>113.249.101.254:8848</nacos.server>
<logstash.address>113.249.101.254:4560</logstash.address>
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
<nacos.username>nacos</nacos.username>
<nacos.password>by@2025??</nacos.password>
</properties>
</profile>
<profile>
<id>test</id>
<properties>
<!-- 环境标识,需要与配置文件的名称相对应 -->
<profiles.active>test</profiles.active>
<nacos.server>192.168.24.101:8848</nacos.server>
<logstash.address>192.168.24.101:4560</logstash.address>
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
<nacos.username>nacos</nacos.username>
<nacos.password>nacos</nacos.password>
</properties>
</profile>
<profile>
<id>prod</id>
<properties>
<profiles.active>prod</profiles.active>
<nacos.server>127.0.0.1:8848</nacos.server>
<logstash.address>127.0.0.1:4560</logstash.address>
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
<nacos.username>nacos</nacos.username>
<nacos.password>nacos</nacos.password>
</properties>
</profile>
</profiles>
@@ -357,6 +381,18 @@
<version>${mapstruct-plus.version}</version>
</dependency>
<dependency>
<groupId>com.hik</groupId>
<artifactId>examples</artifactId>
<version>${hik-sdk.version}</version>
</dependency>
<dependency>
<groupId>com.hik</groupId>
<artifactId>jna</artifactId>
<version>${hik-sdk.version}</version>
</dependency>
<!--消息队列-->
<dependency>
<groupId>org.apache.rocketmq</groupId>

View File

@@ -13,6 +13,8 @@
<module>ruoyi-api-system</module>
<module>ruoyi-api-resource</module>
<module>ruoyi-api-workflow</module>
<module>property-api</module>
<module>sis-api</module>
</modules>
<artifactId>ruoyi-api</artifactId>

View File

@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-api</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>property-api</artifactId>
<description>
物业api模块
</description>
<dependencies>
<!-- RuoYi Common Core-->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-core</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-dubbo</artifactId>
</dependency>
</dependencies>
</project>

View File

@@ -0,0 +1,32 @@
package org.dromara.property.api;
import org.dromara.property.api.domain.vo.RemoteAttendanceUserGroupVo;
import java.util.Date;
import java.util.List;
/**
* 排班远程服务调用
*
* @author lxj
*/
public interface RemoteAttendanceService {
/**
* 查询指定天数的排班信息
*
* @param date 查询时间
* @return 返回排班人员信息
*/
List<RemoteAttendanceUserGroupVo> queryAttendPersonInfo(Date date);
/**
* 根据时间和设备ip查询当前设备所处区域的排班人员信息
*
* @param date 查询时间
* @param deviceIp 设备ip
* @return 返回排班人员信息
*/
List<RemoteAttendanceUserGroupVo> queryAttendByCurrDateAndDeviceIp(Date date, String deviceIp);
}

View File

@@ -0,0 +1,13 @@
package org.dromara.property.api;
import org.dromara.property.api.domain.vo.RemoteBuildingVo;
/**
* 物业楼层远程服务
* @author lxj
*/
public interface RemoteBuildingService {
RemoteBuildingVo queryBuildingById(Long id);
}

View File

@@ -0,0 +1,30 @@
package org.dromara.property.api;
import org.dromara.common.core.domain.TreeNode;
import org.dromara.property.api.domain.vo.RemoteFloorVo;
import java.util.List;
/**
* 楼层的远程服务调用
*
* @author lxj
*/
public interface RemoteFloorService {
RemoteFloorVo queryByFloorId(Long floorId);
/**
* 获取 社区/楼栋/单元/楼栋 集合
*/
List<TreeNode<Long>> queryTreeList();
/**
* 根据楼层id查询楼层
*
* @param buildingId 单元ID
* @return 楼层
*/
List<RemoteFloorVo> queryByBuildingId(Long buildingId);
}

View File

@@ -0,0 +1,19 @@
package org.dromara.property.api;
import org.dromara.property.api.domain.vo.RemoteResidentPersonVo;
import java.util.List;
/**
* @author lsm
* @apiNote RemoteResidentPersonService
* @since 2025/7/26
*/
public interface RemoteResidentPersonService {
// 查询已上传图片,未授权人员
List<RemoteResidentPersonVo> queryUnAuthPerson();
// 更新E8平台id
Boolean updateE8Id(Long personId, Long e8Id);
}

View File

@@ -0,0 +1,5 @@
package org.dromara.property.api;
public interface RemoteVisitoreGetCodeInfoService {
String getCodeInfo(String code);
}

View File

@@ -0,0 +1,52 @@
package org.dromara.property.api.domain.vo;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDate;
/**
* 排班人员信息
*
* @author lxj
* @since 2025-08-17
*/
@Data
public class RemoteAttendanceUserGroupVo implements Serializable {
/**
* 排班ID
*/
private Long scheduleId;
/**
* 员工ID
*/
private Long employeeId;
/**
* 员工姓名
*/
private String employeeName;
/**
* 部门ID
*/
private Long deptId;
/**
* 部门名称
*/
private String deptName;
/**
* 开始日期
*/
private LocalDate startDate;
/**
* 结束日期(仅date_type=3时有效)
*/
private LocalDate endDate;
}

View File

@@ -0,0 +1,39 @@
package org.dromara.property.api.domain.vo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 单元信息
*
* @author lxj
*/
@Data
public class RemoteBuildingVo implements Serializable {
@Serial
private static final long serialVersionUID = -11L;
/**
* 主键id
*/
private Long id;
/**
* 园区id
*/
private Long communityId;
/**
* 建筑名称
*/
private String buildingName;
/**
* 总层数
*/
private Long floorCount;
}

View File

@@ -0,0 +1,57 @@
package org.dromara.property.api.domain.vo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
@Data
public class RemoteFloorVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
private Long id;
/**
* 社区id
*/
private Long communityId;
/**
* 建筑名称
*/
private Long buildingId;
/**
* 单元编码
*/
private Long unitId;
/**
* 楼层数名称
*/
private String floorName;
/**
* 楼层号
*/
private Long floorNumber;
/**
* 楼层类型
*/
private Integer floorType;
/**
* 房间数量
*/
private Integer roomCount;
/**
* 层高
*/
private Integer floorHeight;
}

View File

@@ -0,0 +1,39 @@
package org.dromara.property.api.domain.vo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* @author lsm
* @apiNote RemoteResidentPersonVo
* @since 2025/7/26
*/
@Data
public class RemoteResidentPersonVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
private Long id;
private String ossId;
private String name;
private Long gender;
private String phone;
private String idCard;
private Long authGroupId;
private Date authBegDate;
private Date authEndDate;
private Integer rosterType;
}

View File

@@ -41,6 +41,13 @@
<version>${revision}</version>
</dependency>
<!-- 物业模块接口 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>property-api</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>

View File

@@ -3,6 +3,7 @@ package org.dromara.resource.api;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.resource.api.domain.RemoteFile;
import java.io.IOException;
import java.util.List;
/**
@@ -20,6 +21,14 @@ public interface RemoteFileService {
*/
RemoteFile upload(String name, String originalFilename, String contentType, byte[] file) throws ServiceException;
/**
* 文件上传
* @param file 文件信息
* @return 结果
* @throws ServiceException
*/
RemoteFile uploadImg(byte[] file) throws ServiceException;
/**
* 通过ossId查询对应的url
*
@@ -35,4 +44,12 @@ public interface RemoteFileService {
* @return 列表
*/
List<RemoteFile> selectByIds(String ossIds);
/**
* 文件下载方法,支持一次性下载完整文件
*
* @param ossId OSS对象ID
* @return byte[] 返回下载的字节数组
*/
byte[] downloadToByteArray(Long ossId) throws IOException;
}

View File

@@ -1,9 +1,12 @@
package org.dromara.resource.api;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.resource.api.domain.RemoteFile;
import java.io.IOException;
import java.util.List;
/**
@@ -26,6 +29,18 @@ public class RemoteFileServiceMock implements RemoteFileService {
return null;
}
/**
* 文件上传
*
* @param file 文件信息
* @return 结果
*/
@Override
public RemoteFile uploadImg(byte[] file) {
log.warn("服务调用异常 -> 降级处理");
return null;
}
/**
* 通过ossId查询对应的url
*
@@ -50,4 +65,14 @@ public class RemoteFileServiceMock implements RemoteFileService {
return List.of();
}
/**
* 文件下载方法,支持一次性下载完整文件
*
* @param ossId OSS对象ID
* @return byte[] 返回下载的字节数组
*/
public byte[] downloadToByteArray(Long ossId) throws IOException {
log.warn("服务调用异常 -> 降级处理");
return new byte[0];
}
}

View File

@@ -14,4 +14,5 @@ public interface RemoteConfigService {
*/
boolean selectRegisterEnabled(String tenantId);
String selectQrTimeOut();
}

View File

@@ -34,4 +34,10 @@ public interface RemoteDeptService {
*/
List<RemoteDeptVo> selectDeptsByList();
/**
* 根据部门id查询部门信息
* @param deptId 部门id
* @return 返回部门信息
*/
RemoteDeptVo selectDeptVoById(Long deptId);
}

View File

@@ -26,6 +26,14 @@ public interface RemoteUserService {
*/
LoginUser getUserInfo(String username, String tenantId) throws UserException;
/**
* 通过用户id查询用户信息
*
* @param userId 用户id
* @return 结果
*/
RemoteUserVo getUserInfoById(Long userId) throws UserException;
/**
* 通过用户id查询用户信息
*
@@ -189,4 +197,10 @@ public interface RemoteUserService {
*/
Map<Long, String> selectPostNamesByIds(List<Long> postIds);
Map<String, Integer> seelectOrgcount();
/**
* 查询用户列表
*/
List<RemoteUserVo> selectUserList(List<Long> userIds);
}

View File

@@ -25,6 +25,11 @@ public class RemoteUserVo implements Serializable {
*/
private Long userId;
/**
* 租户ID
*/
private String tenantId;
/**
* 部门ID
*/

29
ruoyi-api/sis-api/pom.xml Normal file
View File

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-api</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>sis-api</artifactId>
<description>
安防api模块
</description>
<dependencies>
<!-- RuoYi Common Core-->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-core</artifactId>
</dependency>
</dependencies>
</project>

Some files were not shown because too many files have changed in this diff Show More