1
0

224 Commits

Author SHA1 Message Date
48e972166f 型号字典 2025-08-14 18:55:53 +08:00
f1a3a0325b 添加告警处理逻辑6 2025-08-14 18:28:55 +08:00
9e24e3daaf 添加告警处理逻辑4 2025-08-14 17:38:07 +08:00
447aa73ae9 Merge branch 'dyf-device' 2025-08-14 14:22:43 +08:00
9c9d18cddc 查询设备分组列表 2025-08-14 14:21:47 +08:00
1af4b165f2 新增设备分组 2025-08-13 19:29:04 +08:00
61ed9f0154 提交 2025-08-12 17:03:11 +08:00
bc165f5d60 分享管理 2025-08-09 17:09:26 +08:00
af64984623 修改分享功能 2025-08-09 08:49:37 +08:00
9fb72e5ac0 设备分组 2025-08-08 09:49:08 +08:00
65caea4a00 解决冲突 2025-08-07 18:17:49 +08:00
83458d0060 Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
#	fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java
#	fys-admin/src/main/java/com/fuyuanshen/web/handler/mqtt/DeviceReceiverMessageHandler.java
#	fys-admin/src/main/resources/application-prod.yml
#	fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppUserServiceImpl.java
2025-08-07 18:10:47 +08:00
f67e848256 晶全6710 2025-08-07 15:41:57 +08:00
57f074995e 发送设备信息代码实现 2025-08-04 15:35:59 +08:00
ae393e8155 校验设备类型名称 2025-08-04 09:36:17 +08:00
6626a1a35e 设备行为 2025-08-04 09:34:16 +08:00
f4d5f950ce 设备行为 2025-08-04 09:05:10 +08:00
99355e05b8 Merge branch 'main' into dyf-device 2025-08-01 16:27:53 +08:00
8770c217ae 设备日志 2025-08-01 15:19:41 +08:00
51d9d7319a app设备列表查询,新增纬度经度 2025-08-01 11:11:36 +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
74be5321ec 代码优化2 2025-07-31 19:03:04 +08:00
370783b457 代码优化 2025-07-31 18:09:20 +08:00
8ae15dcd9a 修改用户状态-强制下线 2025-07-31 15:29:37 +08:00
e07dbb01b7 校验设备类型名称 2025-07-31 10:27:02 +08:00
7bd652f9b8 Merge remote-tracking branch 'upstream/main' 2025-07-31 09:23:34 +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
ceeda046ea WEB端解绑设备 2025-07-30 18:39:12 +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
984081ac98 设备日志 2025-07-29 11:10:03 +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
0abc5d48c0 Merge remote-tracking branch 'upstream/main' 2025-07-23 19:26:12 +08:00
d849be68ed 删除设备:分配记录 2025-07-23 19:22: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