TD数据查询接口V3

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/DeviceController.java

@@ -9,6 +9,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.security.PermitAll;
 import javax.validation.Valid;
 
 import java.util.List;
@@ -18,7 +19,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "设备管理 ")
 @RestController
-@RequestMapping("/rq/deviceTest")
+@RequestMapping("/rq/deviceTD")
 public class DeviceController {
     @Autowired
     private IDeviceService deviceService;
@@ -29,6 +30,7 @@ public class DeviceController {
     ////@PreAuthorize("@ss.hasPermi('iot:device:query')")
     @GetMapping(value = "/runningSpanData")
     @Operation(summary = "获取一段时间内的设备数据")
+    @PermitAll
     public CommonResult<List<DeviceVO>> getRunningSpanDataInfo(@Valid DeviceVO device) {
         return success(deviceService.selectBySpan(device));
     }
@@ -39,6 +41,7 @@ public class DeviceController {
     ////@PreAuthorize("@ss.hasPermi('iot:device:query')")
     @GetMapping(value = "/runningTsData")
     @Operation(summary = "获取特定时间设备数据")
+    @PermitAll
     public CommonResult<List<DeviceVO>> getRunningTsDataInfo(@Valid DeviceVO device) {
         return success(deviceService.selectByTs(device));
     }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/TDDeviceMapper.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.pms.dal.mysql;
 
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.DeviceVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.TDDeviceDO;
 import com.baomidou.dynamic.datasource.annotation.DS;
@@ -21,9 +22,11 @@ import java.util.List;
 public interface TDDeviceMapper extends BaseMapperX<TDDeviceDO> {
     @Select("SELECT * FROM iot_log.device_${deviceName} WHERE ts between #{ts} and #{ts1}")
     @DS("tdengine")
+    @TenantIgnore
     List<DeviceVO> selectBySpan(@Param("deviceName") String tableName, @Param("ts") Timestamp ts);
 
     @Select("SELECT * FROM iot_log.device_${deviceName} WHERE ts = #{ts}")
     @DS("tdengine")
+    @TenantIgnore
     List<DeviceVO> selectByTs(@Param("deviceName") String tableName, @Param("ts") Timestamp ts);
 }

yudao-server/src/main/resources/application.yaml

@@ -288,7 +288,8 @@ yudao:
       - /admin-api/system/dict-data/page
       - /admin-api/rq/iot-tree/simple-list
       - /system/auth/social-login
-      - /admin-api/rq/deviceTest/runningStatus #查询时序数据库设备参数
+      - /admin-api/rq/deviceTD/runningTsData #查询时序数据库设备参数
+      - /admin-api/rq/deviceTD/runningSpanData #查询时序数据库设备参数
     ignore-tables:
       - system_tenant
       - system_tenant_package