dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into dyf-device

Browse Source
This commit is contained in:
daiyongfei
2025-07-10 10:11:03 +08:00
parent f0bfc4aa35 2a6b9eafb3
commit 1dc00f0431
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java
View File

@ -32,7 +32,7 @@ public class AppDeviceController extends BaseController {
private final APPDeviceService appDeviceService; private final APPDeviceService appDeviceService;
/** /**
* 查询文件列表 * 查询设备列表
*/ */
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<AppDeviceVo> list(DeviceQueryCriteria bo, PageQuery pageQuery) { public TableDataInfo<AppDeviceVo> list(DeviceQueryCriteria bo, PageQuery pageQuery) {

5
fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
View File

@ -5,7 +5,7 @@
<id column="id" property="id"/> <id column="id" property="id"/>
<result column="device_type" property="deviceType"/> <result column="device_type" property="deviceType"/>
<result column="customer_id" property="customerId"/> <result column="customer_id" property="customerId"/>
<!--<result column="device_no" property="deviceNo"/>--> <result column="device_no" property="deviceNo"/>
<result column="device_name" property="deviceName"/> <result column="device_name" property="deviceName"/>
<result column="device_pic" property="devicePic"/> <result column="device_pic" property="devicePic"/>
<result column="device_mac" property="deviceMac"/> <result column="device_mac" property="deviceMac"/>
@ -176,6 +176,9 @@
from device d from device d
inner join device_type dt on d.device_type = dt.id inner join device_type dt on d.device_type = dt.id
where d.binding_user_id = #{criteria.bindingUserId} where d.binding_user_id = #{criteria.bindingUserId}
<if test="criteria.deviceType != null">
and d.device_type = #{criteria.deviceType}
</if>
</select> </select>
<!-- 获取分配设备的客户 --> <!-- 获取分配设备的客户 -->

3
fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mqtt/config/MqttConfiguration.java
View File

@ -26,6 +26,9 @@ public class MqttConfiguration {
options.setUserName(mqttPropertiesConfig.getUsername()); options.setUserName(mqttPropertiesConfig.getUsername());
options.setPassword(mqttPropertiesConfig.getPassword().toCharArray()); options.setPassword(mqttPropertiesConfig.getPassword().toCharArray());
options.setServerURIs(new String[]{mqttPropertiesConfig.getUrl()}); options.setServerURIs(new String[]{mqttPropertiesConfig.getUrl()});
options.setAutomaticReconnect(true); // 启用自动重连
options.setConnectionTimeout(10); // 设置连接超时时间
options.setKeepAliveInterval(60); // 设置心跳间隔
factory.setConnectionOptions(options); factory.setConnectionOptions(options);
return factory; return factory;
} }