|
|
0b5514d814
|
Merge branch 'main' into fys-main
|
2025-08-04 09:37:07 +08:00 |
|
|
|
ae393e8155
|
校验设备类型名称
|
2025-08-04 09:36:17 +08:00 |
|
|
|
38caba1fad
|
修改用户状态-强制下线
|
2025-08-04 09:35:59 +08:00 |
|
|
|
6626a1a35e
|
设备行为
|
2025-08-04 09:34:16 +08:00 |
|
|
|
a4d2f548d3
|
Merge branch 'main' into fys-main
|
2025-08-04 09:11:07 +08:00 |
|
|
|
4271085e78
|
用户注销
|
2025-08-01 09:58:33 +08:00 |
|
|
|
2cb4f5b83e
|
设备绑定优化2
|
2025-08-01 09:07:27 +08:00 |
|
|
|
a3a1d43dde
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
# fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppDeviceBindRecord.java
|
2025-08-01 09:06:03 +08:00 |
|
|
|
5f4b12a320
|
设备绑定优化
|
2025-08-01 09:00:32 +08:00 |
|
|
|
fc3626e1a1
|
Merge branch 'main' into fys-main
|
2025-07-31 09:25:09 +08:00 |
|
|
|
7bd652f9b8
|
Merge remote-tracking branch 'upstream/main'
|
2025-07-31 09:23:34 +08:00 |
|
|
|
94ac8454ec
|
LngLonUtil
|
2025-07-31 09:19:06 +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 |
|
|
|
5a23359112
|
WEB端解绑设备
|
2025-07-31 09:08:17 +08:00 |
|
|
|
ceeda046ea
|
WEB端解绑设备
|
2025-07-30 18:39:12 +08:00 |
|
|
|
6827ff0a3c
|
设备mqtt收发数据2
|
2025-07-30 17:14:48 +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 |
|
|
|
ac353b1078
|
设备mqtt收发数据
|
2025-07-30 08:50:44 +08:00 |
|
|
|
abd6d3aa3c
|
设备日志
|
2025-07-29 15:22:09 +08:00 |
|
|
|
3450b025b4
|
设备报警记录
|
2025-07-29 15:21:27 +08:00 |
|
|
|
984081ac98
|
设备日志
|
2025-07-29 11:10:03 +08:00 |
|
|
|
5b3ea9faf5
|
设备报警记录
|
2025-07-29 11:02:09 +08:00 |
|
|
|
2b2edf096d
|
设备下发指令控制
|
2025-07-28 18:26:02 +08:00 |
|
|
|
9ffdcace53
|
LngLonUtil.java
|
2025-07-28 10:41:09 +08:00 |
|
|
|
8cc969bbe6
|
Merge remote-tracking branch 'upstream/main'
|
2025-07-28 10:40:31 +08:00 |
|
|
|
6a900335ef
|
LngLonUtil.java
|
2025-07-28 10:40:13 +08:00 |
|
|
|
ef39eb7286
|
地图坐标转换
|
2025-07-26 16:35:45 +08:00 |
|
|
|
730e9c0bb7
|
地图坐标转换
|
2025-07-26 16:33:28 +08:00 |
|
|
|
5657c73867
|
新增设备:蓝牙名称 必填校验
|
2025-07-26 09:17:21 +08:00 |
|
|
|
f1806fa482
|
app用户登录
|
2025-07-24 14:49:40 +08:00 |
|
|
|
0abc5d48c0
|
Merge remote-tracking branch 'upstream/main'
|
2025-07-23 19:26:12 +08:00 |
|
|
|
f70c3fa399
|
Merge branch 'dyf-device'
|
2025-07-23 19:23:57 +08:00 |
|
|
|
d849be68ed
|
删除设备:分配记录
|
2025-07-23 19:22:25 +08:00 |
|
|
|
f80debbf2b
|
登录问题修复
|
2025-07-23 15:51:25 +08:00 |
|
|
|
ad59eea2a9
|
删除设备:分配记录
|
2025-07-23 14:27:08 +08:00 |
|
|
|
e7c8e245ba
|
Merge remote-tracking branch 'upstream/main'
|
2025-07-23 11:01:01 +08:00 |
|
|
|
da6b888934
|
Merge branch 'dyf-device'
|
2025-07-23 10:54:20 +08:00 |
|
|
|
619356209b
|
删除设备
|
2025-07-23 10:53:26 +08:00 |
|
|
|
d84a7cde3b
|
帐号状态（0正常 1停用）status
|
2025-07-23 09:52:28 +08:00 |
|
|
|
e4dbee15dd
|
设备分享功能开发
|
2025-07-22 18:37:02 +08:00 |
|
|
|
33e53de5a1
|
设备主题
|
2025-07-22 16:13:39 +08:00 |
|
|
|
3bce279d7b
|
修改客户-用户名重复校验
|
2025-07-22 09:58:49 +08:00 |
|
|
|
9338b0d24b
|
设备详情功能开发
|
2025-07-21 15:24:26 +08:00 |
|
|
|
8750bc8e10
|
Merge remote-tracking branch 'upstream/main'
|
2025-07-21 08:43:34 +08:00 |
|
|
|
879e485056
|
Merge branch 'dyf-device'
|
2025-07-21 08:39:55 +08:00 |
|
|
|
bb096f53cd
|
去除demo模块
|
2025-07-19 16:16:22 +08:00 |
|
|
|
69c4cc2004
|
APP设备分享功能开发2
|
2025-07-19 14:28:07 +08:00 |
|
|
|
e9227dea89
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# fys-admin/src/main/java/com/fuyuanshen/web/controller/CaptchaController.java
|
2025-07-19 14:24:21 +08:00 |
|
|
|
b369b28949
|
新增忘记密码手机短信验证码
|
2025-07-19 14:23:29 +08:00 |
|
