|
@@ -64,7 +64,7 @@ public class JfcloudSensorDataService extends JfcloudFluxDataService<SensorData>
|
|
|
* @param roads 路数
|
|
|
* @param startTimeStr 查询开始时间
|
|
|
* @param endTimeStr 查询结束时间
|
|
|
- * @param field temperature/humidity/co2
|
|
|
+ * @param field temperature/humidity/co2
|
|
|
* @return 查询到的传感器数据列表
|
|
|
*/
|
|
|
|
|
@@ -98,7 +98,6 @@ public class JfcloudSensorDataService extends JfcloudFluxDataService<SensorData>
|
|
|
// return results.stream().flatMap(table -> table.getRecords().stream()).map(fluxRecord -> mapRecordToEntity(fluxRecord, getEntityClass())) // 转换为 SensorData 实体
|
|
|
// .collect(Collectors.toList());
|
|
|
// }
|
|
|
-
|
|
|
public List<SensorData> queryDataByDeviceIdAndRoads(String deviceId, Integer roads, String startTimeStr, String endTimeStr, String field, AggregationWindow aggregationWindow) {
|
|
|
Assert.notNull(deviceId, "deviceId cannot be null");
|
|
|
Assert.notNull(roads, "roads cannot be null");
|
|
@@ -120,7 +119,7 @@ public class JfcloudSensorDataService extends JfcloudFluxDataService<SensorData>
|
|
|
// 转换为ISO8601格式
|
|
|
String startTimeFormatted = convertToISO8601(startTimeStr);
|
|
|
String endTimeFormatted = convertToISO8601(endTimeStr);
|
|
|
- String aggregationWindowA =aggregationWindow.getCode(); //FluxAggregationUtils.determineAggregationWindow(startTimeFormatted, endTimeFormatted);
|
|
|
+ String aggregationWindowA = aggregationWindow.getCode(); //FluxAggregationUtils.determineAggregationWindow(startTimeFormatted, endTimeFormatted);
|
|
|
String measurement = "sensor_data"; // 数据表名称
|
|
|
Map<String, String> filters = Map.of(
|
|
|
"device_id", deviceId,
|