Commit 81111d0a by 周田

fix:修复 assert 的问题

parent ba58221c
...@@ -18,7 +18,8 @@ def get_protocol_names(request): ...@@ -18,7 +18,8 @@ def get_protocol_names(request):
@api_view(['POST']) @api_view(['POST'])
def get_protocol_field_names(request): def get_protocol_field_names(request):
protocol_name = request.data.get('protocol_name') protocol_name = request.data.get('protocol_name')
assert protocol_name is not None or protocol_name != '', Response(status=status.HTTP_400_BAD_REQUEST) if protocol_name is None or protocol_name == '':
return Response(status=status.HTTP_400_BAD_REQUEST)
# 获取该协议下的指令集合 # 获取该协议下的指令集合
cmds = AllProtocolDefinAndVersion.objects.filter(protocol_name=protocol_name, cmd_type='RX').all() cmds = AllProtocolDefinAndVersion.objects.filter(protocol_name=protocol_name, cmd_type='RX').all()
......
...@@ -24,7 +24,8 @@ def init(request): ...@@ -24,7 +24,8 @@ def init(request):
初始化协议版本信息(用的很少,大概) 初始化协议版本信息(用的很少,大概)
""" """
protocol_name = request.data.get('protocol_name') protocol_name = request.data.get('protocol_name')
assert protocol_name is not None, Response(status=status.HTTP_400_BAD_REQUEST) if protocol_name is None:
return Response(status=status.HTTP_400_BAD_REQUEST)
all_protocol_version = AllProtocolVersion.objects.filter(protocol_name=protocol_name).first() all_protocol_version = AllProtocolVersion.objects.filter(protocol_name=protocol_name).first()
try: try:
...@@ -49,7 +50,8 @@ def init(request): ...@@ -49,7 +50,8 @@ def init(request):
def change_protocol_version(request): def change_protocol_version(request):
version = request.data.get('version') version = request.data.get('version')
protocol_name = request.data.get('protocol_name') protocol_name = request.data.get('protocol_name')
assert protocol_name is not None and version is not None, Response(status=status.HTTP_400_BAD_REQUEST) if protocol_name is None or version is None:
return Response(status=status.HTTP_400_BAD_REQUEST)
return update_device_protocol_and_cmds(protocol_name, version) return update_device_protocol_and_cmds(protocol_name, version)
...@@ -59,9 +61,10 @@ def add_protocol_version(request): ...@@ -59,9 +61,10 @@ def add_protocol_version(request):
version = request.data.get('version') version = request.data.get('version')
protocol_name = request.data.get('protocol_name') protocol_name = request.data.get('protocol_name')
cmds = request.data.get('cmds') cmds = request.data.get('cmds')
assert (protocol_name is not None and if (protocol_name is None or
cmds is not None and cmds is None or
version is not None), Response(status=status.HTTP_400_BAD_REQUEST) version is None):
return Response(status=status.HTTP_400_BAD_REQUEST)
return add_protocol_version_manage(protocol_name, version, cmds) return add_protocol_version_manage(protocol_name, version, cmds)
...@@ -70,9 +73,10 @@ def update_protocol_version(request): ...@@ -70,9 +73,10 @@ def update_protocol_version(request):
version = request.data.get('version') version = request.data.get('version')
protocol_name = request.data.get('protocol_name') protocol_name = request.data.get('protocol_name')
cmds = request.data.get('cmds') cmds = request.data.get('cmds')
assert (protocol_name is not None and if (protocol_name is None or
version is not None and version is None or
cmds is not None), Response(status=status.HTTP_400_BAD_REQUEST) cmds is None):
return Response(status=status.HTTP_400_BAD_REQUEST)
return update_protocol_version_manage(protocol_name, version, cmds) return update_protocol_version_manage(protocol_name, version, cmds)
...@@ -87,7 +91,8 @@ def raw_file_upload(request): ...@@ -87,7 +91,8 @@ def raw_file_upload(request):
file_obj = request.FILES.get('file') file_obj = request.FILES.get('file')
protocol_name = request.data.get('protocol_name') protocol_name = request.data.get('protocol_name')
version = request.data.get('version') version = request.data.get('version')
assert protocol_name is not None and version is not None, Response(status=status.HTTP_400_BAD_REQUEST) if protocol_name is None or version is None:
return Response(status=status.HTTP_400_BAD_REQUEST)
# 构建文件夹路径和文件路径 # 构建文件夹路径和文件路径
folder_path = os.path.join(settings.BASE_DIR, 'protocol_raw_files', protocol_name, version) folder_path = os.path.join(settings.BASE_DIR, 'protocol_raw_files', protocol_name, version)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment