diff --git a/app/urls.py b/app/urls.py index 545a02a..4c910a8 100644 --- a/app/urls.py +++ b/app/urls.py @@ -28,6 +28,7 @@ urlpatterns = [ views.EnterpriseBusiModelNodeDeviceModelViewSet.as_view({'post': 'create', "get": "list"})), path('warning_statistics/', views.WarningStatisticsModelViewSet.as_view({'post': 'create', "get": "list"})), + path('get_warning_names/', views.WarningStatisticsModelViewSet.as_view({"get": "get_warning_names"})), path('compute_config/', views.ComputeConfigModelViewSet.as_view({'post': 'create', "get": "list"})), path('files/', views.FilesModelViewSet.as_view({'post': 'create', "get": "list", "delete": "destroy"})), diff --git a/app/user_views.py b/app/user_views.py index 2908072..a583a8c 100644 --- a/app/user_views.py +++ b/app/user_views.py @@ -29,11 +29,12 @@ class UserViewSet(ModelViewSet): password = data.get('password') # 验证是否过期 - enterprise_obj = EnterpriseModel.objects.filter(account=username, pwd=password).last() + # enterprise_obj = EnterpriseModel.objects.filter(account=username, pwd=password).last() + enterprise_obj = EnterpriseModel.objects.last() if not enterprise_obj: response = { 'success': False, - 'msg': "该账号不存在", + 'msg': "企业不存在", 'data': { 'username': None, 'roles': [], @@ -65,7 +66,7 @@ class UserViewSet(ModelViewSet): except Exception as e: response = { 'success': False, - 'msg': str(e), + 'msg': "用户登录失败,请查证用户名及密码", 'data': { 'username': None, 'roles': [], diff --git a/app/views.py b/app/views.py index 36c5e38..10b8367 100644 --- a/app/views.py +++ b/app/views.py @@ -1073,6 +1073,16 @@ class WarningStatisticsModelViewSet(ModelViewSet): "status": 200 }) + def get_warning_names(self, request, *args, **kwargs): + warning_names = self.queryset.values("warning_name").distinct() + + return Response({ + "data": [tmp.get("warning_name") for tmp in warning_names], + "msg": None, + "success": True, + "status": 200 + }) + class EnterpriseNodeModelViewSet(ModelViewSet): # 查询类