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

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<AppDeviceVo> list(DeviceQueryCriteria bo, PageQuery pageQuery) {

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

@@ -5,7 +5,7 @@
         <id column="id" property="id"/>
         <result column="device_type" property="deviceType"/>
         <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_pic" property="devicePic"/>
         <result column="device_mac" property="deviceMac"/>
@@ -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}
+        <if test="criteria.deviceType != null">
+            and d.device_type = #{criteria.deviceType}
+        </if>
     </select>
 
     <!-- 获取分配设备的客户 -->

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;
     }