|
|
7773cae0ea
|
配置文件提交2
|
2025-09-05 10:52:53 +08:00 |
|
|
|
a8c9c631ad
|
Merge remote-tracking branch 'upstream/dyf-device' into main-dyf
|
2025-08-27 09:12:05 +08:00 |
|
|
|
8a7565459b
|
Merge branch '6170' of http://47.107.152.87:3000/dyf/fys-Multi-tenant into 6170
|
2025-08-27 09:09:20 +08:00 |
|
|
|
0bbac2b497
|
设备用户详情
|
2025-08-27 09:08:27 +08:00 |
|
|
|
364574eeae
|
web端控制中心3
|
2025-08-27 08:59:29 +08:00 |
|
|
|
f9d9dadf08
|
绑定设备分组
|
2025-08-26 10:00:35 +08:00 |
|
|
|
e4df695f5e
|
绑定设备分组
|
2025-08-26 09:26:33 +08:00 |
|
|
|
4663a5560f
|
Merge remote-tracking branch 'upstream/dyf-device' into main-dyf
|
2025-08-25 14:32:19 +08:00 |
|
|
|
9b476e98ba
|
型号字典用于PC页面跳转
|
2025-08-25 11:40:59 +08:00 |
|
|
|
d962c6ead5
|
查询分享用户数
|
2025-08-25 10:19:57 +08:00 |
|
|
|
1246ac5cf7
|
@Schema(title = "ID", hidden = true)
|
2025-08-23 17:33:35 +08:00 |
|
|
|
7607a0c9c0
|
Merge remote-tracking branch 'origin/6170' into 6170
# Conflicts:
# fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java
|
2025-08-23 16:40:42 +08:00 |
|
|
|
8811c30a97
|
web端控制中心2
|
2025-08-23 16:39:30 +08:00 |
|
|
|
816b3aa5ee
|
Merge remote-tracking branch 'upstream/dyf-device'
|
2025-08-22 16:41:23 +08:00 |
|
|
|
2965b454cf
|
web:设备分组 接口文档
|
2025-08-22 16:37:58 +08:00 |
|
|
|
b83be496b6
|
出厂日期
|
2025-08-22 09:58:27 +08:00 |
|
|
|
4965d78c51
|
设备所属分组
|
2025-08-22 09:40:52 +08:00 |
|
|
|
9dee7ad102
|
管理员
|
2025-08-21 17:55:59 +08:00 |
|
|
|
e6d0e883fb
|
管理员
|
2025-08-21 16:51:17 +08:00 |
|
|
|
5b6927729f
|
WebApp用户信息
|
2025-08-21 15:17:11 +08:00 |
|
|
|
8c883688bd
|
Merge remote-tracking branch 'origin/fys-prod'
|
2025-08-21 15:12:00 +08:00 |
|
|
|
c34a39a308
|
WebApp用户信息
|
2025-08-21 15:11:22 +08:00 |
|
|
|
7b842f5cc7
|
查询APP用户信息列表
|
2025-08-21 11:48:36 +08:00 |
|
|
|
fd7768acc9
|
Merge remote-tracking branch 'upstream/6170'
|
2025-08-20 16:45:49 +08:00 |
|
|
|
7f65ebedc2
|
数据字典信息
|
2025-08-20 13:31:54 +08:00 |
|
|
|
75756eb8ab
|
Merge remote-tracking branch 'upstream/6170'
# Conflicts:
# fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java
|
2025-08-19 14:11:02 +08:00 |
|
|
|
34ee4cceca
|
web端控制中心
|
2025-08-19 13:58:48 +08:00 |
|
|
|
9a6bf05c4b
|
根据mac地址查询设备详情
|
2025-08-18 11:04:23 +08:00 |
|
|
|
6d6db190b9
|
设备分享2
|
2025-08-16 11:30:06 +08:00 |
|
|
|
adc3834ddc
|
Merge branch 'main' into 6170
|
2025-08-15 10:15:56 +08:00 |
|
|
|
33f3cb5989
|
app增加字典
|
2025-08-15 10:14:35 +08:00 |
|
|
|
f65a8cdc8c
|
型号字典 modelDictionary
|
2025-08-15 09:40:33 +08:00 |
|
|
|
a21062b296
|
Merge branch 'main' into 6170
|
2025-08-15 09:34:17 +08:00 |
|
|
|
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 |
|
