by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
779 Commits 3 Branches 0 Tags
0233dad442b881f0dfe333904f1c6b723728d310
Commit Graph

779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
15683799673
0233dad442 修改sis模块时区问题
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m9s
Details
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
Details 
# 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
zcxlsm
c773aed9c7 Merge remote-tracking branch 'origin/master' 2025-08-28 19:52:22 +08:00
zcxlsm
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
Details 
放开黑名单上报
 2025-08-28 19:34:20 +08:00
bichangxiong
f3591e7ff1 Merge pull request 'master' (#2) from master into prod
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 17m15s
Details 
Reviewed-on: #2
 2025-08-28 17:28:27 +08:00
15683799673
57e9ac1079 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-08-28 16:06:29 +08:00
zcxlsm
d6623bb9da Merge remote-tracking branch 'origin/master' 2025-08-28 15:28:38 +08:00
zcxlsm
efeafd5e13 refactor(sis): 替换图片URL 2025-08-28 15:28:05 +08:00
yuyongle
130e3aeb04 修改了物业排序 2025-08-28 15:18:46 +08:00
zcxlsm
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
Details
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
zcxlsm
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
Details
2025-08-27 19:42:33 +08:00
zcxlsm
e61b56b05e feat(property): 添加自动抄表功能 2025-08-27 19:28:24 +08:00
zcxlsm
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
zcxlsm
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
Details
2025-08-27 19:18:46 +08:00
lxj
1eb95bf6f6 修复打包失败
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m8s
Details
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
Details
2025-08-27 18:22:20 +08:00
yuyongle
368eea91e8 修改了水电抄表bug 2025-08-27 18:14:14 +08:00
lxj
19e259a15e 修复配置文件 2025-08-27 18:10:11 +08:00
yuyongle
816b90e9e1 修改了水电抄表bug 2025-08-27 18:07:27 +08:00
yuyongle
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
yuyongle
3c480d92f0 修改了水电抄表bug 2025-08-27 17:58:28 +08:00
zcxlsm
78d97e14ee refactor(rocketmq): 1 2025-08-27 15:46:17 +08:00
zcxlsm
c2c1818ba6 refactor(rocketmq): 1 2025-08-27 15:43:27 +08:00
zcxlsm
3ebc58f5e3 refactor(rocketmq): 手动装配rocketMQ 2025-08-26 21:02:38 +08:00
zcxlsm
07b9e8b722 Merge remote-tracking branch 'origin/master' 2025-08-26 20:33:13 +08:00
zcxlsm
b20828a800 feat(rocketmq): 添加仪表记录消费者和生产者服务 2025-08-26 20:32:51 +08:00
yuyongle
9c0b0bad03 修改工单bug 2025-08-26 17:28:16 +08:00
bichangxiong
c4495d2cf2 Merge pull request '修改了车辆收费bug' (#1) from master into prod
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 11m47s
Details 
Reviewed-on: #1
 2025-08-26 13:57:40 +08:00
yuyongle
a16c333759 修改了车辆收费bug 2025-08-26 13:12:50 +08:00
mocheng
6e84a1c646 发布
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 16m48s
Details
2025-08-26 10:52:59 +08:00
dev_ljl
a6b0277ff6 fix:绿植租赁方案删除 2025-08-26 10:26:47 +08:00
yuyongle
ef0976c621 Merge remote-tracking branch 'origin/master' 2025-08-26 09:50:12 +08:00
yuyongle
e949122b37 修改了车辆收费bug 2025-08-26 09:47:32 +08:00
zcxlsm
638a98a4c6 Merge remote-tracking branch 'origin/master' 2025-08-25 18:35:32 +08:00
bichangxiong
360f87ea0d 更新 .gitea/workflows/master.yml 2025-08-25 18:35:30 +08:00
zcxlsm
555de9f5aa refactor(property): 1 2025-08-25 18:34:30 +08:00
yuyongle
da131cda5c 修改了物业一些bug
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Failing after 12m36s
Details
2025-08-25 17:31:33 +08:00
bichangxiong
c86f887d3e 更新 .gitea/workflows/master.yml
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 17m20s
Details
2025-08-25 16:31:56 +08:00
bichangxiong
2c127576a0 删除 .gitea/workflows/dev.yml
Some checks failed
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Has been cancelled
Details
2025-08-25 16:31:11 +08:00
bichangxiong
15a0f3f884 更新 ruoyi-modules/Property/Dockerfile
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m25s
Details
2025-08-24 17:51:22 +08:00