user post create bug
This commit is contained in:
parent
dac1063b81
commit
168b933945
|
@ -6,7 +6,7 @@ class EcmService:
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def dispatch_dahua_alarm(data:dict):
|
def dispatch_dahua_alarm(data:dict):
|
||||||
"""分发大华事件
|
"""分发大华报警进行处理
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
data (dict): 信息
|
data (dict): 信息
|
||||||
|
|
|
@ -353,18 +353,18 @@ class UserPostViewSet(CreateModelMixin, DestroyModelMixin, ListModelMixin, Custo
|
||||||
def perform_create(self, serializer):
|
def perform_create(self, serializer):
|
||||||
instance = serializer.save()
|
instance = serializer.save()
|
||||||
user = instance.user
|
user = instance.user
|
||||||
adept = UserPost.objects.filter(user=user).order_by('sort', 'create_time').first()
|
up = UserPost.objects.filter(user=user).order_by('sort', 'create_time').first()
|
||||||
if adept:
|
if up:
|
||||||
user.belong_dept = adept
|
user.belong_dept = up.dept
|
||||||
user.update_by = self.request.user
|
user.update_by = self.request.user
|
||||||
user.save()
|
user.save()
|
||||||
|
|
||||||
def perform_destroy(self, instance):
|
def perform_destroy(self, instance):
|
||||||
user = instance.user
|
user = instance.user
|
||||||
instance.delete(update_by=self.request.user)
|
instance.delete(update_by=self.request.user)
|
||||||
fdept = UserPost.objects.filter(user=user).order_by('sort', 'create_time').first()
|
up = UserPost.objects.filter(user=user).order_by('sort', 'create_time').first()
|
||||||
if fdept:
|
if up:
|
||||||
user.belong_dept = fdept
|
user.belong_dept = up.dept
|
||||||
else:
|
else:
|
||||||
user.belong_dept = None
|
user.belong_dept = None
|
||||||
user.update_by = self.request.user
|
user.update_by = self.request.user
|
||||||
|
|
|
@ -73,6 +73,7 @@ class XxListener(stomp.ConnectionListener):
|
||||||
print('received an error "%s"' % frame.body)
|
print('received an error "%s"' % frame.body)
|
||||||
|
|
||||||
def on_message(self, frame):
|
def on_message(self, frame):
|
||||||
|
data=frame.body
|
||||||
print('received a message "%s"' % frame.body)
|
print('received a message "%s"' % frame.body)
|
||||||
|
|
||||||
|
|
||||||
|
@ -183,8 +184,8 @@ class DhCommonViewSet(CreateModelMixin, CustomGenericViewSet):
|
||||||
],
|
],
|
||||||
"subsystem": {
|
"subsystem": {
|
||||||
"subsystemType": 0,
|
"subsystemType": 0,
|
||||||
"name": "10.21.25.158_8000",
|
"name": "10.0.11.101_8000",
|
||||||
"magic": "10.21.25.158_8000"
|
"magic": "10.0.11.101_8000"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -200,7 +201,7 @@ class DhCommonViewSet(CreateModelMixin, CustomGenericViewSet):
|
||||||
取消事件订阅
|
取消事件订阅
|
||||||
"""
|
"""
|
||||||
dhClient.request(**dhapis['mq_unsubscribe'],
|
dhClient.request(**dhapis['mq_unsubscribe'],
|
||||||
params={'name': '10.21.25.158_8000'})
|
params={'name': '10.0.11.101_8000'})
|
||||||
return Response()
|
return Response()
|
||||||
|
|
||||||
@action(methods=['post'], detail=False,
|
@action(methods=['post'], detail=False,
|
||||||
|
@ -228,6 +229,6 @@ class DhCommonViewSet(CreateModelMixin, CustomGenericViewSet):
|
||||||
elif category == 'alarm' and subsystem == 'admin':
|
elif category == 'alarm' and subsystem == 'admin':
|
||||||
"""
|
"""
|
||||||
视频报警
|
视频报警
|
||||||
"""
|
"""
|
||||||
EcmService.dispatch_dahua_alarm(data=data)
|
EcmService.dispatch_dahua_alarm(data=data)
|
||||||
return Response()
|
return Response()
|
||||||
|
|
Loading…
Reference in New Issue