app设备解绑

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

@@ -42,4 +42,11 @@ public class AppDeviceVo {
      *  蓝牙名称
      */
     private String bluetoothName;
+
+    /**
+     * 设备状态
+     * 0 失效
+     * 1 正常
+     */
+    private Integer deviceStatus;
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java

@@ -40,6 +40,15 @@ public interface DeviceMapper extends BaseMapper<Device> {
      */
     List<Device> findDevices(@Param("criteria") DeviceQueryCriteria criteria);
 
+    /**
+     * 查询APP绑定设备列表
+     *
+     * @param criteria
+     * @return
+     */
+    Page<AppDeviceVo> queryAppBindDeviceList(Page<AppDeviceVo> page, @Param("criteria") DeviceQueryCriteria criteria);
+
+
     Page<AppDeviceVo> queryAppDeviceList(Page<AppDeviceVo> page, @Param("criteria") DeviceQueryCriteria criteria);
 
     /**

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java

@@ -503,7 +503,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
             Long userId = AppLoginHelper.getUserId();
             bo.setBindingUserId(userId);
         }
-        Page<AppDeviceVo> result = baseMapper.queryAppDeviceList(pageQuery.build(), bo);
+        Page<AppDeviceVo> result = baseMapper.queryAppBindDeviceList(pageQuery.build(), bo);
         return TableDataInfo.build(result);
     }