Commit Graph

927 Commits

Author SHA1 Message Date
09abd65526 Merge remote-tracking branch 'origin/master' 2025-09-15 22:38:43 +08:00
1f92aadfb6 refactor(Property): 重构收费计算逻辑并优化工单和计量记录功能 2025-09-15 22:37:52 +08:00
dy
7d65b2528c Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-09-15 22:31:28 +08:00
dy
5457d52f95 业主id不能为空bug修改 2025-09-15 22:31:13 +08:00
lxj
9b16456e97 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-09-15 20:55:10 +08:00
lxj
65900c1068 处理推送消息为null的情况 2025-09-15 20:55:02 +08:00
lxj
2b5557c28d 处理推送消息为null的情况 2025-09-15 20:54:16 +08:00
083cbf6149 fix(property): 修复水表能耗预警逻辑 2025-09-15 20:15:54 +08:00
lxj
398b55c0e0 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-09-15 19:47:32 +08:00
lxj
59b663c654 设备状态同步更改 2025-09-15 19:47:23 +08:00
dy
a87020ef4d Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-09-15 19:46:39 +08:00
dy
fafc4fdda1 bug修改 2025-09-15 19:46:14 +08:00
345a0a6e84 Merge remote-tracking branch 'origin/master' 2025-09-15 19:42:31 +08:00
b53f977e0b feat(Property): 新增水电气费用计算功能 2025-09-15 19:42:22 +08:00
lxj
8eb47ddb11 增加事件查询排序 2025-09-15 17:20:54 +08:00
899b90fde8 feat(property): 1 2025-09-15 17:03:33 +08:00
2a4579eb4d feat(property): 1 2025-09-15 17:03:08 +08:00
094d49ab66 feat(property): 1 2025-09-15 16:14:07 +08:00
0fb33c0de9 Merge remote-tracking branch 'origin/master' 2025-09-15 15:59:30 +08:00
3f52dd9091 feat(property):
- 添加仪表类型枚举并实现能耗异常自动上报工单功能
- 更新 XResidentPersonController,为用户信息添加租户ID
2025-09-15 15:58:13 +08:00
lxj
d25c87da64 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-09-15 15:31:56 +08:00
lxj
c1ad311c73 处理图片无法内外网同时访问的问题 2025-09-15 15:31:47 +08:00
df8c588ac3 refactor(Property): 1 2025-09-15 11:36:59 +08:00
lxj
660d966acb 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 12m2s
2025-09-14 22:13:54 +08:00
lxj
6fa6c5bf99 指派人员增加部门信息 2025-09-14 22:13:13 +08:00
30383e16e2 refactor(Property): 1 2025-09-14 21:45:56 +08:00
dy
cd2be61255 单位收费业务逻辑修改 2025-09-14 16:36:53 +08:00
15683799673
cdbe1a8a96 Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-09-13 16:47:57 +08:00
15683799673
07a64e5395 增加移动端推送title content 2025-09-13 16:47:44 +08:00
85b6ed2fae feat(Property): 仪表记录按楼层筛选并优化查询功能 2025-09-13 15:00:49 +08:00
15683799673
791195e2c6 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 13m35s
2025-09-13 13:46:14 +08:00
15683799673
53feebeec0 推送二维码被扫信息 消息格式修改 2025-09-13 13:46:06 +08:00
15683799673
26e31014b5 推送二维码被扫信息 消息格式修改 2025-09-13 13:43:26 +08:00
9690523e49 refactor(Property): 1 2025-09-13 13:43:01 +08:00
65a579eb2a refactor(Property): 1 2025-09-13 13:42:45 +08:00
lxj
66ac68b632 修改websocket配置
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m52s
2025-09-13 10:00:38 +08:00
lxj
727c8e06ce 修改websocket配置 2025-09-13 09:59:36 +08:00
15683799673
d2799a280c 增加报警数据websocket 消息推送 2025-09-13 09:01:39 +08:00
15683799673
7a6557ab3d 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 12m58s
2025-09-13 07:20:48 +08:00
65a01f15c6 修改了收费接口 2025-09-13 00:09:58 +08:00
lsm
aed8679dd1 Merge pull request '- 新增 EnergyConsumptionController,提供能耗数据接口' (#7) from master into prod
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m53s
Reviewed-on: #7
2025-09-12 21:27:19 +08:00
5115c9ec85 - 新增 EnergyConsumptionController,提供能耗数据接口
- 新增 FlowController,提供人行流量数据接口
- 优化 TbMeterRecordServiceImpl,改进上次读数处理逻辑
2025-09-12 21:21:55 +08:00
9d23fd9341 1
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 12m21s
2025-09-12 19:23:46 +08:00
714b7905fb feat(property):
- 数字孪生接口
- xcx活动接口权限
2025-09-12 14:52:43 +08:00
lxj
8a80f96f0c Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks 2025-09-12 14:03:02 +08:00
lxj
db80fab091 增加数字孪生设备接口 2025-09-12 14:02:32 +08:00
fed423f13f 1 2025-09-12 10:06:15 +08:00
55001c02a1 feat(Property): 小程序热门活动接口 2025-09-11 21:41:20 +08:00
1421189257 feat(Property): 小程序热门活动接口 2025-09-11 21:40:54 +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