diff --git a/apps/ecm/service.py b/apps/ecm/service.py index f78b0934..2d73cff3 100644 --- a/apps/ecm/service.py +++ b/apps/ecm/service.py @@ -5,10 +5,14 @@ class EcmService: """ @staticmethod - def dispatch_dahua_alarm(data:dict): - """分发大华报警进行处理 - - Args: - data (dict): 信息 + def dispatch_dahua_event(data:dict): + """分发大华事件进行处理 """ pass + + + @staticmethod + def dispatch_xunxi_event(data:dict): + """分发寻息事件进行处理 + """ + pass \ No newline at end of file diff --git a/apps/opm/serializers.py b/apps/opm/serializers.py index d96e3d55..2a9d10a9 100644 --- a/apps/opm/serializers.py +++ b/apps/opm/serializers.py @@ -115,10 +115,11 @@ class GasCheckSerializer(CustomModelSerializer): class OplCreateUpdateSerializer(CustomModelSerializer): + id = serializers.CharField(read_only=True) class Meta: model = Opl - fields = ['operation', 'level', 'cate', 'start_time', 'end_time', + fields = ['id', 'operation', 'level', 'cate', 'start_time', 'end_time', 'dept_do', 'charger', 'monitor', 'work_time', 'work_type', 'accept_time', 'power', 'power_to', 'power_from', 'power_end_time', 'power_start_time', 'power_days', diff --git a/apps/third/views.py b/apps/third/views.py index 038671bb..8b29c4fc 100755 --- a/apps/third/views.py +++ b/apps/third/views.py @@ -75,6 +75,7 @@ class XxListener(stomp.ConnectionListener): def on_message(self, frame): data = json.loads(frame.body) + print('received a message "%s"' % frame.body) @@ -232,5 +233,5 @@ class DhCommonViewSet(CreateModelMixin, CustomGenericViewSet): """ 视频报警 """ - EcmService.dispatch_dahua_alarm(data=data) + EcmService.dispatch_dahua_event(data=data) return Response()