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-19 08:59:26 +08:00
parent 808a1c825d c3b62f1831
commit c00f59f8d9
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/enm/filters.py
View File

@ -12,7 +12,7 @@ class MpointStatFilter(filters.FilterSet):
class Meta: class Meta:
model = MpointStat model = MpointStat
fields = { fields = {
"mpoint": ["exact"], "mpoint": ["exact", "in"],
"mgroup": ["exact"], "mgroup": ["exact"],
"mgroup__name": ["exact"], "mgroup__name": ["exact"],
"mpoint__mgroup": ["exact"], "mpoint__mgroup": ["exact"],

7
apps/enm/services.py
View File

@ -177,10 +177,9 @@ 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"]
if last_val: if isinstance(last_val, (int, float)):
last_data["last_val"] = last_val*current_cache_val.get('coefficient', 1.0) last_val = last_val*current_cache_val.get('coefficient', 1.0)
else: last_data["last_val"] = last_val
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"]

17
apps/enm/tasks.py
View File

@ -546,10 +546,15 @@ def cal_enstat(type, sflogId, mgroupId, year, month, day, hour, year_s, month_s,
enstat.save() enstat.save()
# 计算一些其他数据 # 计算一些其他数据
if type == "month_st" and "material" in this_cal_attrs: # 如果计算的是班月，把主要设备电耗数据拉过来, 方便查询 if type == "month_st" and "material" in this_cal_attrs: # 如果计算的是班月，把主要设备电耗数据拉过来, 方便查询
res = MpointStat.objects.filter(type="sflog", year_s=year_s, month_s=month_s, sflog__team=enstat.team, mpoint__ep_monitored__isnull=False).values( res = MpointStat.objects.filter(type='sflog', year_s=year_s, month_s=month_s, sflog__team=enstat.team, mpoint__material__code='elec', mpoint__ep_monitored__isnull=False).values(
"elec_consume_unit", equipment=F("mpoint__ep_monitored__id"), equipment_name=F("mpoint__ep_monitored__name") equipment=F('mpoint__ep_monitored__id'), equipment_name=F('mpoint__ep_monitored__name')).annotate(consume=Sum('val'))
) res = list(res)
enstat.equip_elec_data = list(res) for item in res:
try:
item['consume_unit'] = item['consume'] / enstat.total_production
except ZeroDivisionError:
item['consume_unit'] = None
enstat.equip_elec_data = res
enstat.save() enstat.save()
if enstat.mgroup.name == "回转窑": # 算单位产品(综合电耗/标煤耗/综合能耗) if enstat.mgroup.name == "回转窑": # 算单位产品(综合电耗/标煤耗/综合能耗)
# 综合电耗 # 综合电耗
@ -732,9 +737,9 @@ def cal_enstat2(type: str, year_s: int, month_s: int, day_s: int, cascade=True):
) )
if use_mpoint_elec_val: if use_mpoint_elec_val:
if type == 'day_s': if type == 'day_s':
enstat2.elec_consume = MpointStat.objects.filter(type='day', mpoint__in=mp_elecs, year=year_s, month=month_s, day=day_s).aggregate(sum=Sum("val"))['sum'] enstat2.elec_consume = MpointStat.objects.filter(type='day_s', mpoint__in=mp_elecs, year=year_s, month=month_s, day=day_s).aggregate(sum=Sum("val"))['sum']
elif type == 'month_s': elif type == 'month_s':
enstat2.elec_consume = MpointStat.objects.filter(type='month', mpoint__in=mp_elecs, year=year_s, month=month_s).aggregate(sum=Sum("val"))['sum'] enstat2.elec_consume = MpointStat.objects.filter(type='month_s', mpoint__in=mp_elecs, year=year_s, month=month_s).aggregate(sum=Sum("val"))['sum']
if enstat2.elec_consume is None: if enstat2.elec_consume is None:
enstat2.elec_consume = 0 enstat2.elec_consume = 0
else: else:

2
apps/wpm/serializers.py
View File

@ -136,7 +136,9 @@ class SfLogSerializer(CustomModelSerializer):
AttLog.objects.get_or_create(sflog=instance, user=item.user, defaults={ AttLog.objects.get_or_create(sflog=instance, user=item.user, defaults={
'sflog': instance, 'user': item.user, 'post': item.post, 'state': default_state, 'create_by': self.context['request'].user}) 'sflog': instance, 'user': item.user, 'post': item.post, 'state': default_state, 'create_by': self.context['request'].user})
if mgroup.need_enm: if mgroup.need_enm:
from apps.qm.tasks import cal_quastat_sflog
cal_enstat_when_team_change.delay(instance.id) cal_enstat_when_team_change.delay(instance.id)
cal_quastat_sflog.delay(instance.id)
return instance return instance
def to_representation(self, instance): def to_representation(self, instance):