Commit Graph

85 Commits

Author SHA1 Message Date
b703f80355 晶全日志配置 2025-08-06 09:44:52 +08:00
b3b249ea07 日志配置 2025-08-06 09:20:41 +08:00
c2eb5ba524 日志配置 2025-08-06 09:12:47 +08:00
57f074995e 发送设备信息代码实现 2025-08-04 15:35:59 +08:00
6413888a1c Merge branch 'dyf-device' 2025-08-04 09:07:34 +08:00
f4d5f950ce 设备行为 2025-08-04 09:05:10 +08:00
a74b697c0f 设备历史轨迹2 2025-08-02 14:51:06 +08:00
8435a5b0e6 设备行为 2025-08-02 09:18:31 +08:00
ce8f6c9a77 设备历史轨迹 2025-08-02 09:09:02 +08:00
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
74be5321ec 代码优化2 2025-07-31 19:03:04 +08:00
370783b457 代码优化 2025-07-31 18:09:20 +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
f80debbf2b 登录问题修复 2025-07-23 15:51:25 +08:00
e4dbee15dd 设备分享功能开发 2025-07-22 18:37:02 +08:00
9338b0d24b 设备详情功能开发 2025-07-21 15:24:26 +08:00
69c4cc2004 APP设备分享功能开发2 2025-07-19 14:28:07 +08:00
13986bb493 APP设备分享功能开发 2025-07-19 09:36:35 +08:00
082f890009 登录查询用户新增用户类型查询条件 2025-07-14 09:02:13 +08:00
800b825892 登录查询用户新增用户类型查询条件 2025-07-14 08:53:53 +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
f119dd158b 操作视频信息 2025-07-11 14:06:25 +08:00
c3b7849190 app支持上传多个文件 2025-07-10 18:45:43 +08:00
a708889117 app删除文件 2025-07-10 18:12:41 +08:00
1dc00f0431 Merge remote-tracking branch 'origin/main' into dyf-device 2025-07-10 10:11:03 +08:00
ff81b791fc 设备列表查询 2025-07-10 08:57:36 +08:00
87f2e3a8b5 web:prod 配置 2025-07-10 08:40:45 +08:00
d219105b73 Merge remote-tracking branch 'origin/dyf-device'
# Conflicts:
#	fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
#	fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
2025-07-09 13:45:27 +08:00
908ca6753e app设备类型查询 2025-07-09 13:41:08 +08:00
ca47160c92 Merge remote-tracking branch 'origin/main' into dyf-device 2025-07-08 14:46:35 +08:00
64daff1647 web:设备管理 2025-07-08 14:46:05 +08:00
f41bb097fd 添加设备编号 2025-07-08 14:43:28 +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
d301e9da3c 短信验证码 2025-07-07 15:34:02 +08:00
26cba479e2 Merge remote-tracking branch 'origin/main' into dyf-device 2025-07-07 11:41:04 +08:00