seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed start&end datetime formater for tariff from timestamp to strftime

pull/85/head
13621160019@163.com 2021-09-22 18:09:13 +08:00
parent 26000b5af7
commit 02caabc640
3 changed files with 54 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/app/controllers/settings/tariff/tariff.controller.js
View File

@ -163,7 +163,7 @@ app.controller('ModalAddTariffCtrl', function($scope, $timeout, $uibModalInstanc
}, },
timePicker: true, timePicker: true,
timePicker24Hour: true, timePicker24Hour: true,
timePickerIncrement: 15, timePickerIncrement: 1,
singleDatePicker: true, singleDatePicker: true,
}; };
$scope.showPeakType = function(type) { $scope.showPeakType = function(type) {
@ -244,7 +244,7 @@ app.controller('ModalEditTariffCtrl', function($scope, $timeout, $uibModalInstan
}, },
timePicker: true, timePicker: true,
timePicker24Hour: true, timePicker24Hour: true,
timePickerIncrement: 15, timePickerIncrement: 1,
singleDatePicker: true, singleDatePicker: true,
}; };
$scope.showPeakType = function(type) { $scope.showPeakType = function(type) {

4
admin/views/settings/tariff/tariff.html
View File

@ -28,8 +28,8 @@
<td class="text-center">{{ tariff.energy_category.name }}</td> <td class="text-center">{{ tariff.energy_category.name }}</td>
<td class="text-center">{{showTariffType(tariff.tariff_type) | translate}}</td> <td class="text-center">{{showTariffType(tariff.tariff_type) | translate}}</td>
<td class="text-center">{{ tariff.unit_of_price }}</td> <td class="text-center">{{ tariff.unit_of_price }}</td>
<td class="text-center">{{ tariff.valid_from | date:'yyyy-MM-ddTHH:mm:ss' }}</td> <td class="text-center">{{ tariff.valid_from }}</td>
<td class="text-center">{{ tariff.valid_through | date:'yyyy-MM-ddTHH:mm:ss' }}</td> <td class="text-center">{{ tariff.valid_through }}</td>
<td class="text-center"> <td class="text-center">
<a class="btn btn-primary btn-rounded btn-xs" ng-click="editTariff(tariff)" >{{'SETTING.EDIT' | translate}}</a> <a class="btn btn-primary btn-rounded btn-xs" ng-click="editTariff(tariff)" >{{'SETTING.EDIT' | translate}}</a>
<a ng-click="deleteTariff(tariff)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a> <a ng-click="deleteTariff(tariff)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a>

87
myems-api/core/tariff.py
View File

@ -20,7 +20,7 @@ class TariffCollection:
@staticmethod @staticmethod
def on_get(req, resp): def on_get(req, resp):
cnx = mysql.connector.connect(**config.myems_system_db) cnx = mysql.connector.connect(**config.myems_system_db)
cursor = cnx.cursor() cursor = cnx.cursor(dictionary=True)
query = (" SELECT t.id, t.name, t.uuid, " query = (" SELECT t.id, t.name, t.uuid, "
" ec.id AS energy_category_id, ec.name AS energy_category_name, " " ec.id AS energy_category_id, ec.name AS energy_category_name, "
@ -32,21 +32,26 @@ class TariffCollection:
cursor.execute(query) cursor.execute(query)
rows = cursor.fetchall() rows = cursor.fetchall()
timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
if config.utc_offset[0] == '-':
timezone_offset = -timezone_offset
result = list() result = list()
if rows is not None and len(rows) > 0: if rows is not None and len(rows) > 0:
for row in rows: for row in rows:
valid_from = row[7].replace(tzinfo=timezone.utc) valid_from = row['valid_from_datetime_utc'].replace(tzinfo=timezone.utc) + \
valid_through = row[8].replace(tzinfo=timezone.utc) timedelta(minutes=timezone_offset)
valid_through = row['valid_through_datetime_utc'].replace(tzinfo=timezone.utc) + \
meta_result = {"id": row[0], timedelta(minutes=timezone_offset)
"name": row[1], meta_result = {"id": row['id'],
"uuid": row[2], "name": row['name'],
"energy_category": {"id": row[3], "uuid": row['uuid'],
"name": row[4]}, "energy_category": {"id": row['energy_category_id'],
"tariff_type": row[5], "name": row['energy_category_name']},
"unit_of_price": row[6], "tariff_type": row['tariff_type'],
"valid_from": valid_from.timestamp() * 1000, "unit_of_price": row['unit_of_price'],
"valid_through": valid_through.timestamp() * 1000} "valid_from": valid_from.strftime('%Y-%m-%dT%H:%M:%S'),
"valid_through": valid_through.strftime('%Y-%m-%dT%H:%M:%S')}
if meta_result['tariff_type'] == 'block': if meta_result['tariff_type'] == 'block':
meta_result['block'] = list() meta_result['block'] = list()
@ -58,9 +63,9 @@ class TariffCollection:
rows_block = cursor.fetchall() rows_block = cursor.fetchall()
if rows_block is not None and len(rows_block) > 0: if rows_block is not None and len(rows_block) > 0:
for row_block in rows_block: for row_block in rows_block:
meta_data = {"start_amount": row_block[0], meta_data = {"start_amount": row_block['start_amount'],
"end_amount": row_block[1], "end_amount": row_block['end_amount'],
"price": row_block[2]} "price": row_block['price']}
meta_result['block'].append(meta_data) meta_result['block'].append(meta_data)
elif meta_result['tariff_type'] == 'timeofuse': elif meta_result['tariff_type'] == 'timeofuse':
@ -73,10 +78,10 @@ class TariffCollection:
rows_timeofuses = cursor.fetchall() rows_timeofuses = cursor.fetchall()
if rows_timeofuses is not None and len(rows_timeofuses) > 0: if rows_timeofuses is not None and len(rows_timeofuses) > 0:
for row_timeofuse in rows_timeofuses: for row_timeofuse in rows_timeofuses:
meta_data = {"start_time_of_day": str(row_timeofuse[0]), meta_data = {"start_time_of_day": str(row_timeofuse['start_time_of_day']),
"end_time_of_day": str(row_timeofuse[1]), "end_time_of_day": str(row_timeofuse['end_time_of_day']),
"peak_type": row_timeofuse[2], "peak_type": row_timeofuse['peak_type'],
"price": row_timeofuse[3]} "price": row_timeofuse['price']}
meta_result['timeofuse'].append(meta_data) meta_result['timeofuse'].append(meta_data)
else: else:
cursor.close() cursor.close()
@ -232,7 +237,7 @@ class TariffItem:
description='API.INVALID_TARIFF_ID') description='API.INVALID_TARIFF_ID')
cnx = mysql.connector.connect(**config.myems_system_db) cnx = mysql.connector.connect(**config.myems_system_db)
cursor = cnx.cursor() cursor = cnx.cursor(dictionary=True)
query = (" SELECT t.id, t.name, t.uuid, " query = (" SELECT t.id, t.name, t.uuid, "
" ec.id AS energy_category_id, ec.name AS energy_category_name, " " ec.id AS energy_category_id, ec.name AS energy_category_name, "
@ -249,18 +254,24 @@ class TariffItem:
raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND', raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND',
description='API.TARIFF_NOT_FOUND') description='API.TARIFF_NOT_FOUND')
valid_from = row[7].replace(tzinfo=timezone.utc) timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6])
valid_through = row[8].replace(tzinfo=timezone.utc) if config.utc_offset[0] == '-':
timezone_offset = -timezone_offset
result = {"id": row[0], valid_from = row['valid_from_datetime_utc'].replace(tzinfo=timezone.utc) + \
"name": row[1], timedelta(minutes=timezone_offset)
"uuid": row[2], valid_through = row['valid_through_datetime_utc'].replace(tzinfo=timezone.utc) + \
"energy_category": {"id": row[3], timedelta(minutes=timezone_offset)
"name": row[4]},
"tariff_type": row[5], result = {"id": row['id'],
"unit_of_price": row[6], "name": row['name'],
"valid_from": valid_from.timestamp() * 1000, "uuid": row['uuid'],
"valid_through": valid_through.timestamp() * 1000} "energy_category": {"id": row['energy_category_id'],
"name": row['energy_category_name']},
"tariff_type": row['tariff_type'],
"unit_of_price": row['unit_of_price'],
"valid_from": valid_from.strftime('%Y-%m-%dT%H:%M:%S'),
"valid_through": valid_through.strftime('%Y-%m-%dT%H:%M:%S')}
if result['tariff_type'] == 'block': if result['tariff_type'] == 'block':
result['block'] = list() result['block'] = list()
@ -272,7 +283,9 @@ class TariffItem:
rows_block = cursor.fetchall() rows_block = cursor.fetchall()
if rows_block is not None and len(rows_block) > 0: if rows_block is not None and len(rows_block) > 0:
for row_block in rows_block: for row_block in rows_block:
meta_data = {"start_amount": row_block[0], "end_amount": row_block[1], "price": row_block[2]} meta_data = {"start_amount": row_block['start_amount'],
"end_amount": row_block['end_amount'],
"price": row_block['price']}
result['block'].append(meta_data) result['block'].append(meta_data)
elif result['tariff_type'] == 'timeofuse': elif result['tariff_type'] == 'timeofuse':
@ -284,10 +297,10 @@ class TariffItem:
rows_timeofuses = cursor.fetchall() rows_timeofuses = cursor.fetchall()
if rows_timeofuses is not None and len(rows_timeofuses) > 0: if rows_timeofuses is not None and len(rows_timeofuses) > 0:
for row_timeofuse in rows_timeofuses: for row_timeofuse in rows_timeofuses:
meta_data = {"start_time_of_day": str(row_timeofuse[0]), meta_data = {"start_time_of_day": str(row_timeofuse['start_time_of_day']),
"end_time_of_day": str(row_timeofuse[1]), "end_time_of_day": str(row_timeofuse['end_time_of_day']),
"peak_type": row_timeofuse[2], "peak_type": row_timeofuse['peak_type'],
"price": row_timeofuse[3]} "price": row_timeofuse['price']}
result['timeofuse'].append(meta_data) result['timeofuse'].append(meta_data)
cursor.close() cursor.close()