|
|
@@ -77,10 +77,13 @@ class SmartSocketView(View):
|
|
|
|
|
|
@classmethod
|
|
|
def save_power_statistics(cls, request_dict, response):
|
|
|
+ """
|
|
|
+ 保存设备上报电量统计
|
|
|
+ """
|
|
|
try:
|
|
|
serial_number = request_dict.get('serialNumber', None)
|
|
|
electricity = request_dict.get('electricity', 0.00)
|
|
|
- power = request_dict.get('power', None)
|
|
|
+ power = request_dict.get('power', 0.00)
|
|
|
accumulated_time = request_dict.get('accumulatedTime', None)
|
|
|
device_time = request_dict.get('deviceTime', None)
|
|
|
LOGGER.info('{}上报电量统计data：{}'.format(serial_number, request_dict))
|
|
|
@@ -88,11 +91,11 @@ class SmartSocketView(View):
|
|
|
return response.json(444)
|
|
|
device_time = int(device_time)
|
|
|
electricity = Decimal(electricity).quantize(Decimal("0.00"))
|
|
|
- power = int(power)
|
|
|
+ power = Decimal(power).quantize(Decimal("0.00"))
|
|
|
accumulated_time = int(accumulated_time)
|
|
|
now_time = int(time.time())
|
|
|
start_time, end_time = LocalDateTimeUtil.get_today_date(True)
|
|
|
- # 设备当前统计时间，查询电量统计记录 设备时间大于创建记录时间、并且创建记录时间小于当天结束时间
|
|
|
+ # 查询当前序列号当天是否有上传过电量统计
|
|
|
power_qs = SocketPowerStatistics.objects.filter(serial_number=serial_number,
|
|
|
created_time__gt=start_time,
|
|
|
created_time__lte=end_time)
|
