|
|
fd7768acc9
|
Merge remote-tracking branch 'upstream/6170'
|
2025-08-20 16:45:49 +08:00 |
|
|
|
bb11bc4dfa
|
WEB端解绑设备
|
2025-08-20 15:13:43 +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 |
|
|
|
b51e88052f
|
设备分享3
|
2025-08-16 16:40:58 +08:00 |
|
|
|
6d9e75d4fa
|
Merge branch '6170' of http://47.107.152.87:3000/dyf/fys-Multi-tenant into 6170
|
2025-08-16 14:19:19 +08:00 |
|
|
|
58814fe312
|
Merge branch 'main' into 6170
|
2025-08-16 14:18:49 +08:00 |
|
|
|
6d6db190b9
|
设备分享2
|
2025-08-16 11:30:06 +08:00 |
|
|
|
f8c53451c0
|
修改灯光上报状态
|
2025-08-15 18:16:37 +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 |
|
|
|
77542f5e76
|
commit
|
2025-08-15 09:32:54 +08:00 |
|
|
|
c587ef7389
|
解绑优化
|
2025-08-14 18:57:50 +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 |
|
|
|
51741adc69
|
添加告警处理逻辑3
|
2025-08-14 16:25:14 +08:00 |
|
|
|
3145b494d9
|
添加告警处理逻辑2
|
2025-08-14 15:56:10 +08:00 |
|
|
|
a189d0d0f9
|
添加告警处理逻辑
|
2025-08-14 15:07:58 +08:00 |
|
|
|
447aa73ae9
|
Merge branch 'dyf-device'
|
2025-08-14 14:22:43 +08:00 |
|
|
|
9c9d18cddc
|
查询设备分组列表
|
2025-08-14 14:21:47 +08:00 |
|
|
|
8a6c196fb9
|
访问控制
|
2025-08-14 11:51:27 +08:00 |
|
|
|
1af4b165f2
|
新增设备分组
|
2025-08-13 19:29:04 +08:00 |
|
|
|
07bc831f1a
|
登录测试
|
2025-08-13 19:21:57 +08:00 |
|
|
|
a8efbb2768
|
全局控制
|
2025-08-13 10:40:10 +08:00 |
|
|
|
546433b3bc
|
提交2
|
2025-08-12 18:10:41 +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 |
|
|
|
0c932c686d
|
修改分享查看
|
2025-08-08 16:32:40 +08:00 |
|
|
|
47dbd33d56
|
修改在线上报状态
|
2025-08-08 15:09:59 +08:00 |
|
|
|
72cab138a7
|
设备控制中心
|
2025-08-08 10:44:49 +08:00 |
|
|
|
3abee42b07
|
设备控制中心
|
2025-08-08 10:43:53 +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 |
|
|
|
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 |
|
|
|
ae393e8155
|
校验设备类型名称
|
2025-08-04 09:36:17 +08:00 |
|
|
|
38caba1fad
|
修改用户状态-强制下线
|
2025-08-04 09:35:59 +08:00 |
|
