liwenlong/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

Merge branch 'dyf-device' into 6170

Browse Source 
# Conflicts:
#	fys-admin/src/main/resources/application-prod.yml
This commit is contained in:
daiyongfei
2025-11-11 14:34:19 +08:00
parent dce043f63d 56dbfbde71
commit 88b54a49f4
2 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fys-admin/src/main/java/com/fuyuanshen/app/controller/device/AppDeviceHBYController.java
View File

@ -28,6 +28,7 @@ public class AppDeviceHBYController extends BaseController {
private final DeviceBJQBizService appDeviceService; private final DeviceBJQBizService appDeviceService;
/** /**
* 获取设备详细信息 * 获取设备详细信息
* *

4
fys-admin/src/main/resources/application-prod.yml
View File

@ -283,8 +283,8 @@ mqtt:
password: #YtvpSfCNG password: #YtvpSfCNG
url: tcp://47.120.79.150:3883 url: tcp://47.120.79.150:3883
subClientId: fys_subClient subClientId: fys_subClient
subTopic: A/# subTopic: A/#,status/tenantCode/#,report/tenantCode/#
pubTopic: B/# pubTopic: B/#,command/tenantCode/#
pubClientId: fys_pubClient pubClientId: fys_pubClient
# TTS语音交互配置 # TTS语音交互配置