瑞都连油看板返回每秒数据

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

@@ -480,7 +480,26 @@ public class IotStaticController {
             return success(deviceVOS);
         }
     }
-
+    @GetMapping("/td/chart/ly/{deviceName}/{identifier}")
+    public CommonResult<List<DeviceVO>> getLyTdChart(@PathVariable("deviceName") String deviceName, @PathVariable("identifier") String identifier, @RequestParam("beginTime") String beginTime, @RequestParam("endTime") String endTime) {
+        if (StringUtils.isBlank(identifier)) {
+            return null;
+        }
+        Timestamp start1 = generateTimestamp(beginTime);
+        Timestamp end1 = generateTimestamp(endTime);
+        Integer i = deviceMapper.tableIfExist(deviceName.toLowerCase());
+        if (i==1) {
+            List<DeviceVO> deviceVOS = tdDeviceMapper.selectAllBtTimeAndIdentifierNoInterval(deviceName.toLowerCase(), identifier, start1, end1);
+            deviceVOS.forEach(deviceVO->{
+                deviceVO.setTimestamp(deviceVO.getTs().getTime());
+                deviceVO.setValue(Objects.nonNull(deviceVO.getLogValue())?Double.valueOf(deviceVO.getLogValue()):null);
+            });
+            return success(deviceVOS.stream().sorted(Comparator.comparing(DeviceVO::getTimestamp).reversed()).collect(Collectors.toList()));
+        } else {
+            List<DeviceVO> deviceVOS = new ArrayList<>();
+            return success(deviceVOS);
+        }
+    }
 
     @Autowired
     private IotTdParamsMapper iotTdParamsMapper;

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

@@ -133,6 +133,13 @@ public interface TDDeviceMapper extends BaseMapperX<TDDeviceDO> {
     @InterceptorIgnore(tenantLine = "true")
     List<DeviceVO> selectAllBtTimeAndIdentifier(@Param("deviceName") String tableName, @Param("identifier") String identifier,@Param("start") Timestamp start,@Param("end") Timestamp end);
 
+    @Select("SELECT ts, CAST(log_value AS FLOAT) as log_value   FROM iot_log.device_${deviceName} " +
+            "WHERE ts between #{start} and #{end} and identity = #{identifier} " )
+    @DS("tdengine")
+    @TenantIgnore
+    @InterceptorIgnore(tenantLine = "true")
+    List<DeviceVO> selectAllBtTimeAndIdentifierNoInterval(@Param("deviceName") String tableName, @Param("identifier") String identifier,@Param("start") Timestamp start,@Param("end") Timestamp end);
+
     @Select("SELECT   ts, CAST(log_value AS FLOAT) as log_value,identity   FROM iot_log.device_${deviceName} " +
             "WHERE ts between #{start} and #{end} and identity not in ('online','todayoil','totaloil','distance','vehicle_name','oil1','lng','lat','today_distance','oil4','oil3','oil2')  ORDER BY ts DESC LIMIT #{pageSize} " )
     @DS("tdengine")