6075 mqtt

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/AppDeviceBo.java

@@ -12,6 +12,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 public class AppDeviceBo {
+
     /**
      * 设备IMEI
      */
@@ -25,10 +26,11 @@ public class AppDeviceBo {
     /**
      * 通讯方式 0:4G;1:蓝牙,2 4G&蓝牙
      */
-    @NotNull(message = "通讯方式不能为空", groups = { EditGroup.class })
+    @NotNull(message = "通讯方式不能为空", groups = {EditGroup.class})
     private Integer communicationMode;
 
     private String sendMsg;
 
     private Long deviceId;
+
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java

@@ -86,4 +86,5 @@ public class AppDeviceVo implements Serializable {
      * 设备详情页面
      */
     private String detailPageUrl;
+
 }

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

@@ -227,6 +227,7 @@
         FROM device
         WHERE original_device_id = #{originalDeviceId}
     </select>
+
     <select id="getDeviceInfo" resultType="com.fuyuanshen.equipment.domain.vo.AppDeviceVo">
         select d.id,
                d.device_name,
@@ -244,6 +245,7 @@
                  inner join device_type dt on d.device_type = dt.id
         where d.device_mac = #{deviceMac}
     </select>
+
     <select id="queryWebDeviceList" resultType="com.fuyuanshen.equipment.domain.vo.WebDeviceVo">
         select * from (select  d.id, d.device_name,
         d.device_mac,