лет %!s(int64=4): %!d(string=назад) · 3c0227dab1
--- a/api/eqpt_views.py
+++ b/api/eqpt_views.py
@@ -18,6 +18,7 @@ from equipment.models import (IsolationPointInfo, IsolationPointUserInfo, Thermo
 
                 from utils.age import stamp2age
              
 
                 from utils.error.errno_utils import IsolationPointStatusCode, ThermometerEquipmentStatusCode
              
 
                 from utils.redis.rscreen import get_screen_info, set_screen_info
              
 
                +from utils.redis.rtemperature import get_old_temperature, set_old_temperature
              
 
                 
              
 
                 
              
 
                 @logit
              
@@ -213,13 +214,13 @@ def get_screen_data(point=None, point_id=None):
 
                     macids = eqpts.values_list('macid', flat=True)
              
 
                 
              
 
                     logs = ThermometerMeasureInfo.objects.filter(
              
 
                -        point_id=point_id,
              
 
                +        point_id=point.point_id,
              
 
                         point_measure_ymd=tc.local_string(format='%Y-%m-%d'),
              
 
                         point_measure_window=point.previous_measure_window,
              
 
                         macid__in=macids,
              
 
                         status=True,
              
 
                     ).values('macid', 'temperature')
              
 
                -    logs = {log.get('macid'): log.get('temperature') for log in logs}
              
 
                +    logs = {log.get('macid'): log.get('temperature') or get_old_temperature(point.point_id, log.get('macid')) for log in logs}
              
 
                 
              
 
                     infos = IsolationPointUserInfo.objects.filter(point_id=point.point_id, status=True).values('pk', 'fields')
              
 
                     infos = {info.get('pk'): info.get('fields') for info in infos}
              
@@ -403,4 +404,6 @@ def mqtt_upload_temperature(payload):
 
                             measure_info.temperature = temperature
              
 
                             measure_info.save()
              
 
                 
              
 
                +            set_old_temperature(eqpt.point_id, macid, temperature)
              
 
                +
              
 
                     set_screen_info(point.point_id, get_screen_data(point))
              
--- a/utils/redis/rkeys.py
+++ b/utils/redis/rkeys.py
@@ -1,5 +1,6 @@
 
                 # -*- coding: utf-8 -*-
              
 
                 
              
 
                -TWJC_QRCODE_URL_HASH = 'twjc:qrcode:url:hash'  # scene:qrcode_url
              
 
                -TWJC_POINT_INFO = 'twjc:point:info:%s'  # uuid:point_id
              
 
                -TWJC_SCREEN_INFO = 'twjc:screen:info:%s'  # point_id:screen_info
              
 
                +TWJC_QRCODE_URL_HASH = 'twjc:qrcode:url:hash'  # HASH, scene:qrcode_url
              
 
                +TWJC_OLD_TEMPERATURE_HASH = 'twjc:old:temperature:hash'  # HASH, point_id+macid:temperature
              
 
                +TWJC_POINT_INFO = 'twjc:point:info:%s'  # uuid, point_id
              
 
                +TWJC_SCREEN_INFO = 'twjc:screen:info:%s'  # point_id, screen_info
              
--- a/utils/redis/rtemperature.py
+++ b/utils/redis/rtemperature.py
@@ -0,0 +1,12 @@
 
                +# -*- coding: utf-8 -*-
              
 
                +
              
 
                +from utils.redis.connect import r
              
 
                +from utils.redis.rkeys import TWJC_OLD_TEMPERATURE_HASH
              
 
                +
              
 
                +
              
 
                +def set_old_temperature(point_id, macid, temperature):
              
 
                +    r.hset(TWJC_OLD_TEMPERATURE_HASH, f'{point_id}:{macid}', temperature)
              
 
                +
              
 
                +
              
 
                +def get_old_temperature(point_id, macid):
              
 
                +    return r.hgetfloat(TWJC_OLD_TEMPERATURE_HASH, f'{point_id}:{macid}')