by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
780 Commits 3 Branches 0 Tags
6d2741a8a5ff430c70c9ec8200ce9bbe1ec554c1
Commit Graph

263 Commits

Author SHA1 Message Date
15683799673
6d2741a8a5 增加事件类型判断
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 11m56s
Details
2025-08-28 20:40:49 +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
efeafd5e13 refactor(sis): 替换图片URL 2025-08-28 15:28:05 +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
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
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
b20828a800 feat(rocketmq): 添加仪表记录消费者和生产者服务 2025-08-26 20:32:51 +08:00
zcxlsm
0d4754eef9 Merge remote-tracking branch 'origin/master'
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m51s
Details
2025-08-24 16:58:14 +08:00
zcxlsm
dad6666107 feat(ImageUtil): 添加图片压缩方向处理功能 2025-08-24 16:58:03 +08:00
15683799673
c8475f818d 修复告警详情图片获取不对的问题 2025-08-23 19:53:46 +08:00
lxj
4a62ad17c3 修改详情逻辑 2025-08-22 18:14:17 +08:00
lxj
49401d42ba 增加事件处理详情 2025-08-22 17:44:33 +08:00
zcxlsm
2e314b2901 feat(sis): 添加图片压缩工具类并优化访客照片上传逻辑
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 7m17s
Details
2025-08-21 23:14:12 +08:00
zcxlsm
2103be1de5 refactor(sis): 1
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m19s
Details
2025-08-21 18:10:30 +08:00
zcxlsm
37966e73c1 refactor(sis): 1
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m26s
Details
2025-08-21 15:10:54 +08:00
15683799673
be3992c1dc 增加人脸抓拍，人脸上报消费者
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m20s
Details
2025-08-21 02:53:04 +08:00
lxj
62d9a21627 海康设备对接单独拆分 2025-08-20 17:57:09 +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
Details
2025-08-20 13:06:13 +08:00
15683799673
9e346ba882 屏蔽海康sdk 2025-08-20 13:06:06 +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
zcxlsm
8849b1d889 feat(property): 访客登记同步 E8 平台门禁 2025-08-18 16:54:10 +08:00
zcxlsm
be5d00040d refactor(sis): 将 remoteHWId 修改为 remoteHwId
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m13s
Details
2025-08-18 11:30:01 +08:00
15683799673
5e164ae2ac 事件处理逻辑完善 2025-08-18 09:07:17 +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