PDU
/
Mosqkiller-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

# 完善电量逻辑

This commit is contained in:
xianfuxing 2020-06-05 12:04:09 +08:00
parent 420607619a
commit 263c336c04
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
apps/counter/api/serializers.py
View File

@ -1,4 +1,4 @@
from django.db.models import Q from django.db.models import Q, Min, Max
from django.core.cache import cache from django.core.cache import cache
from rest_framework import serializers from rest_framework import serializers
from counter.models import DeviceCount, DeviceInfo from counter.models import DeviceCount, DeviceInfo
@ -6,6 +6,22 @@ from mosquito.models import DeviceInfo as CelexDeviceInfo
from mosquito.models import MosqPostStatistic, DevicePostStatistic from mosquito.models import MosqPostStatistic, DevicePostStatistic
def get_vol(device_id, cur_vol):
vol_min_key = '{}_vol_min'.format(device_id)
vol_max_key = '{}_vol_max'.format(device_id)
vol_min = cache.get(vol_min_key)
vol_max = cache.get(vol_max_key)
if not vol_min:
vol_min = DeviceCount.objects.filter(device_id=device_id).aggregate(vol_min=Min('vol'))['vol_min']
cache.set(vol_min_key, vol_min, 60 * 5)
if not vol_max:
vol_max = DeviceCount.objects.filter(device_id=device_id).aggregate(vol_max=Max('vol'))['vol_max']
cache.set(vol_max_key, vol_max, 60 * 5)
vol = 100 * (int(cur_vol) - int(vol_min)) / (int(vol_max) - int(vol_min))
return '{}{}'.format(round(vol, 1), '%')
class DeviceCountSerializer(serializers.ModelSerializer): class DeviceCountSerializer(serializers.ModelSerializer):
device_name = serializers.SerializerMethodField() device_name = serializers.SerializerMethodField()
mosq_count = serializers.SerializerMethodField() mosq_count = serializers.SerializerMethodField()
@ -34,16 +50,16 @@ class DeviceCountSerializer(serializers.ModelSerializer):
return obj.csq return obj.csq
def get_energy(self, obj): def get_energy(self, obj):
return obj.vol return get_vol(obj.device_id, obj.vol)
def get_calc_time(self, obj): def get_calc_time(self, obj):
return obj.data_time.strftime('%Y-%m-%d %H:%M:%S') return obj.data_time.strftime('%Y-%m-%d %H:%M:%S')
def get_device_name(self, obj): def get_device_name(self, obj):
device_id = obj.device_id device_id = obj.device_id
cache_content = cache.get(device_id) device_name = cache.get(device_id)
if cache_content: if device_name:
return cache_content return device_name
qs = CelexDeviceInfo.objects.filter(device_id=device_id) qs = CelexDeviceInfo.objects.filter(device_id=device_id)
if qs.count() > 0: if qs.count() > 0:
device = qs[0] device = qs[0]
@ -105,7 +121,7 @@ class DeviceInfoSerializer(serializers.ModelSerializer):
def get_energy(self, obj): def get_energy(self, obj):
if self.latest: if self.latest:
return self.latest.vol return get_vol(obj.device_id, self.latest.vol)
return 0 return 0
def get_coordinate(self, obj): def get_coordinate(self, obj):