zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server

This commit is contained in:
caoqianming 2024-08-15 11:17:51 +08:00
parent cb46d9bfc6 71dd916dbf
commit 3976e3834e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/enm/services.py
View File

@ -15,6 +15,7 @@ from server.settings import get_sysconfig
from apps.enm.models import EnStat from apps.enm.models import EnStat
from django.db.models import Sum from django.db.models import Sum
from typing import Dict, Any from typing import Dict, Any
from decimal import Decimal
myLogger = logging.getLogger("log") myLogger = logging.getLogger("log")
@ -176,7 +177,10 @@ class MpointCache:
current_cache_val = self.data current_cache_val = self.data
cache_key = self.cache_key cache_key = self.cache_key
last_data = current_cache_val["last_data"] last_data = current_cache_val["last_data"]
last_data["last_val"] = last_val*current_cache_val.get('coefficient', 1) if last_val:
last_data["last_val"] = last_val*current_cache_val.get('coefficient', 1.0)
else:
last_data["last_val"] = last_val
last_data["last_timex"] = last_timex last_data["last_timex"] = last_timex
last_mrs = None # 设备状态信号 last_mrs = None # 设备状态信号
mpoint_is_rep_ep_running_state = current_cache_val["is_rep_ep_running_state"] mpoint_is_rep_ep_running_state = current_cache_val["is_rep_ep_running_state"]