|
|
285abaedfb
|
Merge branch 'main' into fys-prod
|
2025-08-15 14:37:23 +08:00 |
|
|
|
07bc831f1a
|
登录测试
|
2025-08-13 19:21:57 +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 |
|
|
|
41c6cb935d
|
Merge branch 'dyf-device'
|
2025-08-07 18:08:12 +08:00 |
|
|
|
9de55857bc
|
晶全日志配置
|
2025-08-07 18:07:04 +08:00 |
|
|
|
efed6f3683
|
修改包名
|
2025-08-07 15:56:12 +08:00 |
|
|
|
f67e848256
|
晶全6710
|
2025-08-07 15:41:57 +08:00 |
|
|
|
825e9b329c
|
Merge remote-tracking branch 'origin/main'
|
2025-08-06 10:39:01 +08:00 |
|
|
|
67764a733e
|
设备列表电量显示问题，打印日志优化
|
2025-08-06 10:38:21 +08:00 |
|
|
|
c2eb5ba524
|
日志配置
|
2025-08-06 09:12:47 +08:00 |
|
|
|
57f074995e
|
发送设备信息代码实现
|
2025-08-04 15:35:59 +08:00 |
|
|
|
0b0cc84eea
|
Merge branch 'main' into fys-prod
|
2025-08-04 09:39:08 +08:00 |
|
|
|
38caba1fad
|
修改用户状态-强制下线
|
2025-08-04 09:35:59 +08:00 |
|
|
|
6626a1a35e
|
设备行为
|
2025-08-04 09:34:16 +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 |
|
|
|
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 |
|
