1
0
Commit Graph

51 Commits

Author SHA1 Message Date
d8686e3cbd Merge branch 'dyf-device' into 6170 2025-08-30 09:40:51 +08:00
c2ce9679c4 设备充放电记录 2025-08-30 09:39:41 +08:00
d66fb7d2c2 设备告警 2025-08-29 18:58:16 +08:00
400c53030a Merge remote-tracking branch 'origin/6170' into 6170 2025-08-29 16:49:44 +08:00
b5565da752 web端控制中心4 2025-08-29 16:49:16 +08:00
e17a64ad57 查询设备告警列表 2025-08-29 13:59:23 +08:00
2c565f5c2d 设备告警 2025-08-28 11:22:04 +08:00
837953bf3d 设备类型ID 2025-08-27 10:20:37 +08:00
364574eeae web端控制中心3 2025-08-27 08:59:29 +08:00
8811c30a97 web端控制中心2 2025-08-23 16:39:30 +08:00
e6d0e883fb 管理员 2025-08-21 16:51:17 +08:00
34ee4cceca web端控制中心 2025-08-19 13:58:48 +08:00
9a6bf05c4b 根据mac地址查询设备详情 2025-08-18 11:04:23 +08:00
33f3cb5989 app增加字典 2025-08-15 10:14:35 +08:00
9c9d18cddc 查询设备分组列表 2025-08-14 14:21:47 +08:00
9fb72e5ac0 设备分组 2025-08-08 09:49:08 +08:00
0dc896586d Merge branch 'dyf-device'
# Conflicts:
#	fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
#	fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/LocationDataRule.java
2025-07-31 09:16:52 +08:00
a119ccc8d6 设备mqtt收发数据 2025-07-30 17:13:57 +08:00
4fa4e5ec29 Merge branch 'main' into dyf-device 2025-07-30 17:07:29 +08:00
984081ac98 设备日志 2025-07-29 11:10:03 +08:00
2b2edf096d 设备下发指令控制 2025-07-28 18:26:02 +08:00
619356209b 删除设备 2025-07-23 10:53:26 +08:00
33e53de5a1 设备主题 2025-07-22 16:13:39 +08:00
a7340c744e APP客户设备绑定-绑定时间 2025-07-19 14:22:36 +08:00
bbf1c6cfd5 分页查询设备:设备类型自动更新 2025-07-14 09:13:30 +08:00
a423ac0f8b app设备解绑 2025-07-11 11:34:30 +08:00
3250dd3f83 WEB端查看APP客户设备绑定 2025-07-10 15:44:57 +08:00
4cc02e1040 Merge remote-tracking branch 'origin/main' into dyf-device
# Conflicts:
#	fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java
#	fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
2025-07-10 15:16:57 +08:00
185d521472 WEB端查看APP客户设备绑定 2025-07-10 15:14:18 +08:00
7e688e16b3 导出数据设备 2025-07-10 14:57:59 +08:00
b876d051d8 app设备列表添加蓝牙名称 2025-07-10 13:33:32 +08:00
ff81b791fc 设备列表查询 2025-07-10 08:57:36 +08:00
c075c09ee7 web:更新设备信息 2025-07-09 16:59:54 +08:00
3fb692e7fb web:撤回设备 2025-07-09 16:29:25 +08:00
8a66e5ca51 分配客户 2025-07-09 13:41:03 +08:00
64daff1647 web:设备管理 2025-07-08 14:46:05 +08:00
b5ae17c3e3 Merge remote-tracking branch 'origin/dyf-device' 2025-07-08 11:35:03 +08:00
08b1f73af1 设备类型管理 2025-07-08 11:09:14 +08:00
628cc1fa99 设备列表 2025-07-08 10:26:14 +08:00
b26cb873b5 Merge remote-tracking branch 'origin/main' into dyf-device
# Conflicts:
#	fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java
#	fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
2025-07-08 09:05:31 +08:00
43f6f2ca0b 设备绑定,解绑 2025-07-08 09:00:14 +08:00
f338ef47d1 修改APP用户信息 2025-07-07 11:40:46 +08:00
ad82ab5fca APP/小程序用户设备绑定 2025-07-05 15:55:46 +08:00
3947f9b6f0 WEB:分页查询设备列表 2025-07-04 15:42:10 +08:00
e8aee3039a WEB:导出数据设备 2025-07-03 17:53:10 +08:00
5917234ca8 新增客户 2025-07-02 17:53:53 +08:00
2a81385554 新增设备 2025-07-02 15:29:09 +08:00
a69aad227a 设备类型管理 2025-07-02 11:25:41 +08:00
440aec266b 设备类型管理接口 2025-07-01 09:32:22 +08:00
933e74235f 设备类型管理 2025-06-30 18:03:43 +08:00