Commit Graph

879 Commits

Author SHA1 Message Date
lxj
db80fab091 增加数字孪生设备接口 2025-09-12 14:02:32 +08:00
0389aa9d7b Merge remote-tracking branch 'origin/master'
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m34s
2025-09-11 17:54:30 +08:00
14901197cf - xcx修改密码
- 访客二维码展示问题
2025-09-11 17:54:19 +08:00
lxj
9ddff2d9ba Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-09-11 17:35:56 +08:00
lxj
8321cc6548 删除海康依赖 2025-09-11 17:35:29 +08:00
02f4fa6d93 Merge remote-tracking branch 'origin/master' 2025-09-11 17:19:14 +08:00
10610e91e5 修改楼层导出 2025-09-11 17:18:49 +08:00
lxj
6d3a47a0f8 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java
2025-09-11 17:17:55 +08:00
lxj
89b82149bd 告警待办、已办增加数据权限 2025-09-11 17:16:28 +08:00
53906a1ec3 refactor(meterRecord): 修正电表读数为零时的处理逻辑 2025-09-11 16:18:45 +08:00
f671fd51b2 refactor(meterRecord): 修正电表读数为零时的处理逻辑 2025-09-11 16:17:45 +08:00
b93be50a7a refactor(sis): 1 2025-09-11 11:54:38 +08:00
20d342903c Merge remote-tracking branch 'origin/master' 2025-09-10 20:24:45 +08:00
a3bd994fa3 refactor(sis):
- 第三方数据添加失败通过mq回写信息
refactor(property):
- 仪表sse推送,增加水表消息推送
2025-09-10 20:24:29 +08:00
0b087ba73b 修改工单类型bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m43s
2025-09-10 18:08:58 +08:00
e8d87d3556 修改工单类型bug 2025-09-10 17:32:58 +08:00
3317793834 修改工单类型bug
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m40s
2025-09-10 10:25:25 +08:00
15683799673
33523867aa 处理自动指派没有租户id的问题 2025-09-10 10:08:16 +08:00
15683799673
e0fc419476 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 12m45s
2025-09-10 09:45:33 +08:00
15683799673
f2edd58dff 处理无法自动生成指派的问题 2025-09-10 09:45:27 +08:00
81c95f124e 1 2025-09-09 20:56:04 +08:00
6fac063f61 Merge remote-tracking branch 'origin/master' 2025-09-09 18:17:10 +08:00
f91333de3a - 仪表、门禁、摄像头状态统计
- 仪表层级树显示每层仪表数
- 仪表概况调整排序
- 小程序端接口更改
2025-09-09 18:16:53 +08:00
1cc77bdedc 新增保洁订单功能 2025-09-09 18:15:40 +08:00
b5de50fb67 新增保洁订单功能 2025-09-09 18:02:07 +08:00
15683799673
2816c22a4d 设备通道增加通道状态
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m33s
2025-09-09 05:41:23 +08:00
lxj
c941443bca 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 12m29s
2025-09-09 05:04:14 +08:00
lxj
8a9d74bbd5 增加设备同步状态异步任务 2025-09-09 05:03:28 +08:00
a29e680bce feat(property): 小程序添加访客管理功能
- 新增访客管理相关的接口和服务实现
- 添加访客信息同步到 E8 平台的功能
- 实现访客二维码生成和获取功能
2025-09-08 22:35:40 +08:00
021a767677 Merge pull request 'master' (#6) from master into prod
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 18m25s
Reviewed-on: #6
2025-09-08 18:51:12 +08:00
64ec07d7b2 更新 pom.xml 2025-09-08 18:50:21 +08:00
lxj
ad36d4cfd5 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-09-08 17:50:16 +08:00
lxj
ba206c4d32 修复时间上报 2025-09-08 17:50:05 +08:00
d598409b28 Merge remote-tracking branch 'origin/master' 2025-09-08 17:48:18 +08:00
6a2898e0d7 feat(Property): 优化定时任务执行逻辑并添加时间限制 2025-09-08 17:48:10 +08:00
9a6bd54fba 新增客户服务活动功能 2025-09-08 16:41:32 +08:00
15683799673
71c82fa345 处理查询当前告警数量为0 2025-09-08 01:44:27 +08:00
15683799673
68abebc90f 修复设备同步状态异常 2025-09-07 09:07:57 +08:00
15683799673
2f70cd13ad 恢复任务模块服务器端配置
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 13m11s
2025-09-07 08:46:59 +08:00
15683799673
16b883fadc 恢复任务模块服务器端配置
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m30s
2025-09-07 08:07:48 +08:00
15683799673
ce53d02a63 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 12m43s
2025-09-07 07:40:26 +08:00
15683799673
3faafb9bd6 定时任务增加SaTokenContextMockUtil 操作 2025-09-07 07:40:12 +08:00
lxj
cbdd2532c1 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 13m11s
2025-09-07 02:18:54 +08:00
lxj
ae652e364e 修改snail配置 2025-09-07 02:17:40 +08:00
55c54d6e6b feat(Property): 添加小程序工单处理功能 2025-09-06 23:03:27 +08:00
d5504a1a23 Merge pull request 'master' (#5) from master into prod
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 16m16s
Reviewed-on: #5
2025-09-06 20:30:56 +08:00
7f813393c5 refactor(property): 优化智能水表抄表逻辑 2025-09-06 17:07:59 +08:00
4a3097e490 修改工单类型部门下的接单人 2025-09-06 16:07:13 +08:00
bc1301518c ref(Property): 优化仪表数据获取和列表展示 2025-09-06 14:57:37 +08:00
1e4eec8401 refactor(property):
- TbMeterInfoServiceImpl 中模拟 token 上下文
 - resident服务分包
2025-09-06 14:26:44 +08:00