1
0
Commit Graph

149 Commits

Author SHA1 Message Date
c8dff1a082 位置信息 2025-08-01 17:02:27 +08:00
99355e05b8 Merge branch 'main' into dyf-device 2025-08-01 16:27:53 +08:00
0ad100a7a5 如果经纬度不变就不去调用地图api 2025-08-01 16:27:17 +08:00
8770c217ae 设备日志 2025-08-01 15:19:41 +08:00
6fb8e73535 经纬度bug修复 2025-08-01 14:24:03 +08:00
51d9d7319a app设备列表查询,新增纬度经度 2025-08-01 11:11:36 +08:00
4271085e78 用户注销 2025-08-01 09:58:33 +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
74be5321ec 代码优化2 2025-07-31 19:03:04 +08:00
370783b457 代码优化 2025-07-31 18:09:20 +08:00
f2c7549d6e Merge branch 'main' into fys-prod 2025-07-31 09:24:23 +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
ac353b1078 设备mqtt收发数据 2025-07-30 08:50:44 +08:00
2b2edf096d 设备下发指令控制 2025-07-28 18:26:02 +08:00
f1806fa482 app用户登录 2025-07-24 14:49:40 +08:00
17ed75f54a Merge branch 'main' into fys-prod 2025-07-23 19:26:46 +08:00
0abc5d48c0 Merge remote-tracking branch 'upstream/main' 2025-07-23 19:26:12 +08:00
f80debbf2b 登录问题修复 2025-07-23 15:51:25 +08:00
e7c8e245ba Merge remote-tracking branch 'upstream/main' 2025-07-23 11:01:01 +08:00
80b944cbf0 Merge remote-tracking branch 'upstream/main' into fys-prod
# Conflicts:
#	fys-admin/pom.xml
2025-07-23 10:57:03 +08:00
e4dbee15dd 设备分享功能开发 2025-07-22 18:37:02 +08:00
9338b0d24b 设备详情功能开发 2025-07-21 15:24:26 +08:00
537cc0b2d7 Merge branch 'main' into fys-prod
# Conflicts:
#	pom.xml
2025-07-21 08:45:53 +08:00
8750bc8e10 Merge remote-tracking branch 'upstream/main' 2025-07-21 08:43:34 +08:00
6dde6c3a3b 去掉demo 2025-07-21 08:42:21 +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
f1d1528c40 Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/GlobalConstants.java
2025-07-19 10:26:52 +08:00
13986bb493 APP设备分享功能开发 2025-07-19 09:36:35 +08:00
6ed1241a6d Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	fys-modules/fys-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml
2025-07-17 17:03:25 +08:00
1cf7c47ef9 正式环境配置提交 2025-07-14 16:28:54 +08:00
082f890009 登录查询用户新增用户类型查询条件 2025-07-14 09:02:13 +08:00
800b825892 登录查询用户新增用户类型查询条件 2025-07-14 08:53:53 +08:00
fys
3ca6b69709 merge upstream 2025-07-12 14:04:03 +08:00
cfafbc54f7 Merge branch 'dyf-device' 2025-07-12 14:01:00 +08:00
fdb64b1dcc 小程序:相关接口 2025-07-12 13:57:31 +08:00
eb1552d982 绑定蓝牙问题修复 2025-07-12 09:56:26 +08:00
c73a700210 app登录配置修改 2025-07-11 17:39:53 +08:00
3ed2f97752 app接口功能实现 2025-07-11 16:40:20 +08:00
dyf
1eb2502a21 revert 2815e27240
revert 晶全代码同步,app接口开发
2025-07-11 16:20:24 +08:00
2815e27240 晶全代码同步,app接口开发 2025-07-11 16:03:36 +08:00
f119dd158b 操作视频信息 2025-07-11 14:06:25 +08:00