From ff81b791fcb04cde01029629459504bb11443fb5 Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Thu, 10 Jul 2025 08:57:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fuyuanshen/app/controller/AppDeviceController.java | 2 +- .../src/main/resources/mapper/equipment/DeviceMapper.xml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java index 945c30f..1344160 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java @@ -32,7 +32,7 @@ public class AppDeviceController extends BaseController { private final APPDeviceService appDeviceService; /** - * 查询文件列表 + * 查询设备列表 */ @GetMapping("/list") public TableDataInfo list(DeviceQueryCriteria bo, PageQuery pageQuery) { diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml index 5af643a..44aea49 100644 --- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml @@ -5,7 +5,7 @@ - + @@ -176,6 +176,9 @@ from device d inner join device_type dt on d.device_type = dt.id where d.binding_user_id = #{criteria.bindingUserId} + + and d.device_type = #{criteria.deviceType} + From 2a6b9eafb3b2e2de2d8574390f987b2019876d62 Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Thu, 10 Jul 2025 09:43:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?mqtt=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fuyuanshen/system/mqtt/config/MqttConfiguration.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mqtt/config/MqttConfiguration.java b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mqtt/config/MqttConfiguration.java index 30ffadf..002b6b5 100644 --- a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mqtt/config/MqttConfiguration.java +++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/mqtt/config/MqttConfiguration.java @@ -26,6 +26,9 @@ public class MqttConfiguration { options.setUserName(mqttPropertiesConfig.getUsername()); options.setPassword(mqttPropertiesConfig.getPassword().toCharArray()); options.setServerURIs(new String[]{mqttPropertiesConfig.getUrl()}); + options.setAutomaticReconnect(true); // 启用自动重连 + options.setConnectionTimeout(10); // 设置连接超时时间 + options.setKeepAliveInterval(60); // 设置心跳间隔 factory.setConnectionOptions(options); return factory; }