|
|
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 |
|
|
|
74cefe9cc3
|
设备详情
|
2025-08-25 13:42:24 +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 |
|
|
|
d05e046112
|
Merge branch 'main' into dyf-device
|
2025-08-22 18:28:40 +08:00 |
|
|
|
e86eff48ee
|
Merge pull request 'jingquan' (#8) from liwenlong/fys-Multi-tenant:jingquan into main
Reviewed-on: dyf/fys-Multi-tenant#8
|
2025-08-22 18:26:44 +08:00 |
|
|
|
aef16cf6b4
|
Merge remote-tracking branch 'liwenlong-fys/jingquan' into jingquan
|
2025-08-22 18:10:10 +08:00 |
|
|
|
95aa01e1c2
|
feat(device): 新增星汉设备控制功能
- 添加星汉设备控制器 AppDeviceXinghanController- 实现星汉设备业务逻辑 DeviceXinghanBizService
- 增加开机 LOGO 下发规则 XinghanBootLogoRule
- 添加设备发送消息规则 XinghanSendMsgRule
- 更新 MQTT 命令类型常量 XingHanCommandTypeConstants
- 修改设备状态 JSON 结构 MqttXinghanJson
|
2025-08-22 18:09:08 +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 |
|
|
|
e9542c70e9
|
Merge pull request 'jingquan' (#7) from liwenlong/fys-Multi-tenant:jingquan into dyf-device
Reviewed-on: dyf/fys-Multi-tenant#7
|
2025-08-21 17:54:48 +08:00 |
|
|
|
51297f269d
|
Merge branch 'dyf-device' into jingquan
|
2025-08-21 17:54:39 +08:00 |
|
|
|
4077fd303f
|
merge upstream
|
2025-08-21 17:44:57 +08:00 |
|
|
|
f1a19f95f5
|
feat(mqtt): 新增星汉设备数据处理规则和解析逻辑- 添加 MqttXinghanCommandType 枚举类，用于识别和处理星汉设备的命令类型
- 新增 MqttXinghanJson 类，用于解析星汉设备的 JSON 数据
- 在 ReceiverMessageHandler 中集成星汉设备数据的处理逻辑
- 添加 XingHanCommandTypeConstants 常量类，定义星汉设备的命令类型常量
- 实现 XinghanDeviceDataRule 类，处理星汉设备主动上报的数据命令
|
2025-08-21 17:44:06 +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 |
|
|
|
b08d23eef4
|
Merge branch 'main' into fys-prod
# Conflicts:
# fys-admin/src/main/resources/application-prod.yml
|
2025-08-21 09:59:23 +08:00 |
|
|
|
add0738b28
|
Merge remote-tracking branch 'origin/main'
|
2025-08-21 09:55:26 +08:00 |
|
|
|
b61c9c7a06
|
配置文件提交
|
2025-08-21 09:54:42 +08:00 |
|
|
|
8106d09e67
|
生产配置
|
2025-08-20 16:53:27 +08:00 |
|
|
|
425ea306e3
|
Merge branch 'main' into fys-prod
|
2025-08-20 16:48:48 +08:00 |
|
|
|
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 |
|
|
|
285abaedfb
|
Merge branch 'main' into fys-prod
|
2025-08-15 14:37:23 +08:00 |
|
|
|
adc3834ddc
|
Merge branch 'main' into 6170
|
2025-08-15 10:15:56 +08:00 |
|
