|
|
d8f5713a3d
|
Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m54s
|
2025-08-29 11:30:16 +08:00 |
|
|
|
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
|
增加事件类型判断
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 11m56s
|
2025-08-28 20:40:49 +08:00 |
|
15683799673
|
0233dad442
|
修改sis模块时区问题
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
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 |
|
|
|
fbcc6ec713
|
更新 ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/ZeroSensationPassageServiceImpl.java
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
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 17m15s
Reviewed-on: #2
|
2025-08-28 17:28:27 +08:00 |
|
|
|
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 |
|
|
|
1b138ab299
|
视频流适配内外网播放
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m27s
|
2025-08-28 09:09:33 +08:00 |
|
|
|
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 |
|
|
|
c2f0b64e6f
|
修复比对失败没写入事件表的问题
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 |
|
|
|
0330b023a3
|
修复打包失败
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m38s
|
2025-08-27 19:18:46 +08:00 |
|
|
|
1eb95bf6f6
|
修复打包失败
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m8s
|
2025-08-27 18:37:12 +08:00 |
|
|
|
df9adf700c
|
Merge branch 'prod' of http://47.109.37.87:3000/by2025/SmartParks
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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
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
|
发布
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 |
|
