|
|
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 |
|
|
|
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 |
|
|
|
d962c6ead5
|
查询分享用户数
|
2025-08-25 10:19:57 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
