mirror of
https://github.com/farmOS/farmOS.git
synced 2024-02-23 11:37:38 +01:00
Remove DataStreamSqlStorage trait.
This commit is contained in:
paul121
Michael Stenta
parent
e742293386
commit
219d11ccdb
2 changed files with 130 additions and 151 deletions
|
|
@ -7,8 +7,8 @@ use Drupal\Core\Database\Connection;
|
|||
use Drupal\data_stream\DataStreamApiInterface;
|
||||
use Drupal\data_stream\DataStreamStorageInterface;
|
||||
use Drupal\data_stream\Entity\DataStreamInterface;
|
||||
use Drupal\data_stream\Traits\DataStreamSqlStorage;
|
||||
use Drupal\data_stream\Traits\DataStreamPrivateKeyAccess;
|
||||
use Drupal\fraction\Fraction;
|
||||
use Drupal\jsonapi\Exception\UnprocessableHttpEntityException;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||
|
|
@ -28,7 +28,6 @@ use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
|
|||
*/
|
||||
class Basic extends DataStreamTypeBase implements DataStreamStorageInterface, DataStreamApiInterface {
|
||||
|
||||
use DataStreamSqlStorage;
|
||||
use DataStreamPrivateKeyAccess;
|
||||
|
||||
/**
|
||||
|
|
@ -285,4 +284,133 @@ class Basic extends DataStreamTypeBase implements DataStreamStorageInterface, Da
|
|||
return Response::create('', Response::HTTP_CREATED);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function storageGet(DataStreamInterface $stream, array $params) {
|
||||
|
||||
$query = $this->connection->select($this->tableName, 'd');
|
||||
$query->fields('d', ['timestamp', 'value_numerator', 'value_denominator']);
|
||||
$query->condition('d.id', $stream->id());
|
||||
|
||||
if (isset($params['start']) && is_numeric($params['start'])) {
|
||||
$query->condition('d.timestamp', $params['start'], '>=');
|
||||
}
|
||||
|
||||
if (isset($params['end']) && is_numeric($params['end'])) {
|
||||
$query->condition('d.timestamp', $params['end'], '<=');
|
||||
}
|
||||
|
||||
$query->orderBy('d.timestamp', 'DESC');
|
||||
|
||||
$offset = 0;
|
||||
if (isset($params['offset']) && is_numeric($params['offset'])) {
|
||||
$offset = $params['offset'];
|
||||
}
|
||||
|
||||
if (isset($params['limit']) && is_numeric($params['limit'])) {
|
||||
$query->range($offset, $params['limit']);
|
||||
}
|
||||
|
||||
$result = $query->execute();
|
||||
|
||||
// Build an array of data.
|
||||
$name = $stream->label();
|
||||
$data = [];
|
||||
foreach ($result as $row) {
|
||||
|
||||
// If name or timestamp are empty, skip.
|
||||
if (empty($row->timestamp)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Convert the value numerator and denominator to a decimal.
|
||||
$fraction = new Fraction($row->value_numerator, $row->value_denominator);
|
||||
$value = $fraction->toDecimal(0, TRUE);
|
||||
|
||||
// Create a data object for the sensor value.
|
||||
$point = new \stdClass();
|
||||
$point->timestamp = $row->timestamp;
|
||||
$point->{$name} = $value;
|
||||
$data[] = $point;
|
||||
}
|
||||
|
||||
// Return the data.
|
||||
return $data;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function storageSave(DataStreamInterface $stream, array $data) {
|
||||
|
||||
// If the data is an array of multiple data points, iterate over each and
|
||||
// recursively process.
|
||||
if (is_array(reset($data))) {
|
||||
foreach ($data as $point) {
|
||||
$this->storageSave($stream, $point);
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
// Save a timestamp.
|
||||
$timestamp = NULL;
|
||||
|
||||
// If a timestamp is provided, ensure that it is in UNIX timestamp format.
|
||||
if (!empty($data['timestamp'])) {
|
||||
|
||||
// If the timestamp is numeric, we're good!
|
||||
if (is_numeric($data['timestamp'])) {
|
||||
$timestamp = $data['timestamp'];
|
||||
}
|
||||
|
||||
// Otherwise, try converting it from a string. If that doesn't work, we
|
||||
// throw it out and fall back on REQUEST_TIME set above.
|
||||
else {
|
||||
$strtotime = strtotime($data['timestamp']);
|
||||
if (!empty($strtotime)) {
|
||||
$timestamp = $strtotime;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Generate a timestamp from the request time. This will only be used if a
|
||||
// timestamp is not provided in the JSON data.
|
||||
if (empty($timestamp)) {
|
||||
$timestamp = \Drupal::time()->getRequestTime();
|
||||
}
|
||||
|
||||
// Iterate over the JSON properties.
|
||||
foreach ($data as $key => $value) {
|
||||
|
||||
// If the key does not match the data stream name, skip it.
|
||||
if ($key !== $stream->label()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// If the value is not numeric, skip it.
|
||||
if (!is_numeric($value)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Create a row to store in the database;.
|
||||
$row = [
|
||||
'id' => $stream->id(),
|
||||
'timestamp' => $timestamp,
|
||||
];
|
||||
|
||||
// Convert the value to a fraction.
|
||||
$fraction = Fraction::createFromDecimal($value);
|
||||
$row['value_numerator'] = $fraction->getNumerator();
|
||||
$row['value_denominator'] = $fraction->getDenominator();
|
||||
|
||||
// Enter the reading into the database.
|
||||
$this->connection->insert($this->tableName)
|
||||
->fields($row)
|
||||
->execute();
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,149 +0,0 @@
|
|||
<?php
|
||||
|
||||
namespace Drupal\data_stream\Traits;
|
||||
|
||||
use Drupal\data_stream\Entity\DataStreamInterface;
|
||||
use Drupal\fraction\Fraction;
|
||||
|
||||
/**
|
||||
* A trait for using the DataStreamSimpleData storage.
|
||||
*
|
||||
* Classes using this trait must define two properties:
|
||||
* A $connection property that is an instance of
|
||||
* \Drupal\Core\Database\Connection.
|
||||
* A $tableName property that defines the table name used to save data.
|
||||
*
|
||||
* @see DataStreamStorageInterface
|
||||
*/
|
||||
trait DataStreamSqlStorage {
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function storageGet(DataStreamInterface $stream, array $params) {
|
||||
|
||||
$query = $this->connection->select($this->tableName, 'd');
|
||||
$query->fields('d', ['timestamp', 'value_numerator', 'value_denominator']);
|
||||
$query->condition('d.id', $stream->id());
|
||||
|
||||
if (isset($params['start']) && is_numeric($params['start'])) {
|
||||
$query->condition('d.timestamp', $params['start'], '>=');
|
||||
}
|
||||
|
||||
if (isset($params['end']) && is_numeric($params['end'])) {
|
||||
$query->condition('d.timestamp', $params['end'], '<=');
|
||||
}
|
||||
|
||||
$query->orderBy('d.timestamp', 'DESC');
|
||||
|
||||
$offset = 0;
|
||||
if (isset($params['offset']) && is_numeric($params['offset'])) {
|
||||
$offset = $params['offset'];
|
||||
}
|
||||
|
||||
if (isset($params['limit']) && is_numeric($params['limit'])) {
|
||||
$query->range($offset, $params['limit']);
|
||||
}
|
||||
|
||||
$result = $query->execute();
|
||||
|
||||
// Build an array of data.
|
||||
$name = $stream->label();
|
||||
$data = [];
|
||||
foreach ($result as $row) {
|
||||
|
||||
// If name or timestamp are empty, skip.
|
||||
if (empty($row->timestamp)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Convert the value numerator and denominator to a decimal.
|
||||
$fraction = new Fraction($row->value_numerator, $row->value_denominator);
|
||||
$value = $fraction->toDecimal(0, TRUE);
|
||||
|
||||
// Create a data object for the sensor value.
|
||||
$point = new \stdClass();
|
||||
$point->timestamp = $row->timestamp;
|
||||
$point->{$name} = $value;
|
||||
$data[] = $point;
|
||||
}
|
||||
|
||||
// Return the data.
|
||||
return $data;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function storageSave(DataStreamInterface $stream, array $data) {
|
||||
|
||||
// If the data is an array of multiple data points, iterate over each and
|
||||
// recursively process.
|
||||
if (is_array(reset($data))) {
|
||||
foreach ($data as $point) {
|
||||
$this->storageSave($stream, $point);
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
// Save a timestamp.
|
||||
$timestamp = NULL;
|
||||
|
||||
// If a timestamp is provided, ensure that it is in UNIX timestamp format.
|
||||
if (!empty($data['timestamp'])) {
|
||||
|
||||
// If the timestamp is numeric, we're good!
|
||||
if (is_numeric($data['timestamp'])) {
|
||||
$timestamp = $data['timestamp'];
|
||||
}
|
||||
|
||||
// Otherwise, try converting it from a string. If that doesn't work, we
|
||||
// throw it out and fall back on REQUEST_TIME set above.
|
||||
else {
|
||||
$strtotime = strtotime($data['timestamp']);
|
||||
if (!empty($strtotime)) {
|
||||
$timestamp = $strtotime;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Generate a timestamp from the request time. This will only be used if a
|
||||
// timestamp is not provided in the JSON data.
|
||||
if (empty($timestamp)) {
|
||||
$timestamp = \Drupal::time()->getRequestTime();
|
||||
}
|
||||
|
||||
// Iterate over the JSON properties.
|
||||
foreach ($data as $key => $value) {
|
||||
|
||||
// If the key does not match the data stream name, skip it.
|
||||
if ($key !== $stream->label()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// If the value is not numeric, skip it.
|
||||
if (!is_numeric($value)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Create a row to store in the database;.
|
||||
$row = [
|
||||
'id' => $stream->id(),
|
||||
'timestamp' => $timestamp,
|
||||
];
|
||||
|
||||
// Convert the value to a fraction.
|
||||
$fraction = Fraction::createFromDecimal($value);
|
||||
$row['value_numerator'] = $fraction->getNumerator();
|
||||
$row['value_denominator'] = $fraction->getDenominator();
|
||||
|
||||
// Enter the reading into the database.
|
||||
$this->connection->insert($this->tableName)
|
||||
->fields($row)
|
||||
->execute();
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in a new issue