Commit Graph

337 Commits

Author SHA1 Message Date
dy
c565114c4c 统计逻辑修改 2025-09-06 01:14:38 +08:00
dy
e70e245cdd 删除不必要的字段 2025-09-05 22:57:30 +08:00
6538635e6d 修改了巡检明细bug 2025-09-05 19:07:41 +08:00
87f5ee97fa feat(property): 新增入驻员工登录功能 2025-09-05 17:55:47 +08:00
1e1da7964f 修改了巡检明细bug 2025-09-04 17:25:00 +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
863366de7e feat(property): webSocket定时推送仪表状态功能
- 新增 HeartbeatTasks 类用于管理心跳任务
2025-09-01 18:07:33 +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
0b22169649 修改了自动派单bug 2025-08-29 21:22:59 +08:00
826684ed66 修改了自动派单排序 2025-08-29 20:43:58 +08:00
2200ef4880 修改了自动派单排序 2025-08-29 20:16:10 +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
fbc07ac629 refactor(property): 重构能源趋势接口
-分别返回今日和昨日、本月和上月、今年和去年的趋势数据
2025-08-29 15:50:00 +08:00
db29ef77fa refactor(sis): 1 2025-08-28 19:52:11 +08:00
130e3aeb04 修改了物业排序 2025-08-28 15:18:46 +08:00
cfff5df7d0 refactor(property): 优化能源趋势查询接口返回值类型 2025-08-28 15:05:01 +08:00
76c0aa74f1 feat(property): 添加用电/水/气趋势分析功能 2025-08-28 01:21:12 +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
3c480d92f0 修改了水电抄表bug 2025-08-27 17:58:28 +08:00
78d97e14ee refactor(rocketmq): 1 2025-08-27 15:46:17 +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
a16c333759 修改了车辆收费bug 2025-08-26 13:12:50 +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
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
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
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
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