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:
zty 2024-12-13 17:32:59 +08:00
parent cdc70177bb 005b5c1057
commit 15950dacf9
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/enm/models.py
View File

@ -156,6 +156,7 @@ class EnStat(BaseModel):
shut_sec = models.PositiveIntegerField("停机时长", default=0, help_text="s") shut_sec = models.PositiveIntegerField("停机时长", default=0, help_text="s")
run_rate = models.FloatField("运转率", default=0, help_text="%") run_rate = models.FloatField("运转率", default=0, help_text="%")
ammonia_consume = models.FloatField("氨水消耗", default=0, help_text="t") ammonia_consume = models.FloatField("氨水消耗", default=0, help_text="t")
note = models.TextField("备注", default="", blank=True)
class EnStat2(BaseModel): class EnStat2(BaseModel):

4
apps/enm/serializers.py
View File

@ -132,6 +132,10 @@ class MpointStatSerializer(CustomModelSerializer):
ret[key] = "{:.2f}".format(round(ret_one_val, 2)) ret[key] = "{:.2f}".format(round(ret_one_val, 2))
return ret return ret
class EnStatUpdateSerializer(CustomModelSerializer):
class Meta:
model = EnStat
fields = ["id", "note"]
class EnStatSerializer(CustomModelSerializer): class EnStatSerializer(CustomModelSerializer):
mgroup_name = serializers.CharField(source="mgroup.name", read_only=True) mgroup_name = serializers.CharField(source="mgroup.name", read_only=True)

4
apps/enm/views.py
View File

@ -1,7 +1,7 @@
from django.conf import settings from django.conf import settings
from apps.enm.models import Mpoint, MpointStat, EnStat, EnStat2, MpLogx, Xscript from apps.enm.models import Mpoint, MpointStat, EnStat, EnStat2, MpLogx, Xscript
from apps.utils.viewsets import CustomModelViewSet, CustomGenericViewSet from apps.utils.viewsets import CustomModelViewSet, CustomGenericViewSet
from apps.utils.mixins import BulkCreateModelMixin, BulkDestroyModelMixin, CustomListModelMixin from apps.utils.mixins import BulkCreateModelMixin, BulkDestroyModelMixin, CustomListModelMixin, BulkUpdateModelMixin
from apps.enm.serializers import (MpointSerializer, MpLogxSerializer, MpointStatSerializer, from apps.enm.serializers import (MpointSerializer, MpLogxSerializer, MpointStatSerializer,
EnStatSerializer, EnStat2Serializer, ReCalSerializer, EnStatSerializer, EnStat2Serializer, ReCalSerializer,
MpointStatCorrectSerializer, EnStatAnaSerializer, XscriptSerializer, XscriptDetailSerializer) MpointStatCorrectSerializer, EnStatAnaSerializer, XscriptSerializer, XscriptDetailSerializer)
@ -229,7 +229,7 @@ class MpointStatViewSet(BulkCreateModelMixin, BulkDestroyModelMixin, CustomListM
return Response(result) return Response(result)
class EnStatViewSet(CustomListModelMixin, CustomGenericViewSet): class EnStatViewSet(CustomListModelMixin, BulkUpdateModelMixin, CustomGenericViewSet):
""" """
list:能耗统计记录 list:能耗统计记录