mqtt指令发布

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -134,14 +134,14 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     @ApiOperation("分页查询")
     public R<PageBean<DeviceInfoDto.Vo2>> page(@RequestBody DeviceInfoDto.Page page) {
         //数据鉴权
-        boolean authByData = AuthorizeUtils.authByData(AuthorizeUtils.getSysId(), AuthorizeUtils.getUri());
+        /*boolean authByData = AuthorizeUtils.authByData(AuthorizeUtils.getSysId(), AuthorizeUtils.getUri());
         if (!authByData) {
             //todo 授权处理
             boolean deviceAuth = true;
             if (deviceAuth) {
                 page.setMerc(String.valueOf(AuthorizeUtils.getLoginId(Long.class)));
             }
-        }
+        }*/
         return queryPage(page);
     }
 

device-api-service/src/main/resources/mapper/DeviceInfoMapper.xml

@@ -35,7 +35,7 @@
         from device_info info
         join device_sysinfo sysinfo on(info.device_id = sysinfo.device_id)
         join device_status status on(info.device_id = status.device_id)
-        left join merc mr on(info.merc_id = mr.merc_id)
+        left join merc mr on(info.merc_id = mr.id)
         where
         info.show_status = #{queryPage.showStatus}
         <if test="queryPage.no != null and queryPage.no != ''">