|
|
@@ -2,6 +2,7 @@ from django.contrib.auth import authenticate
|
|
|
from rest_framework.views import APIView
|
|
|
from smartfarming.models.user import DeviceUser, MongoUserLoginLog, Role, HomeThemeModel
|
|
|
import time
|
|
|
+import logging
|
|
|
from kedong.utils import PrAes
|
|
|
from smartfarming.utils import get_perm_list, get_all_pers, get_captcha
|
|
|
from rest_framework.response import Response
|
|
|
@@ -11,6 +12,10 @@ from django.core.paginator import Paginator
|
|
|
from kedong import settings
|
|
|
from django.db.models import Q
|
|
|
from kedong.tools import RedisPool
|
|
|
+import logging
|
|
|
+
|
|
|
+
|
|
|
+logger = logging.getLogger("myapp")
|
|
|
|
|
|
|
|
|
class RoleAPIView(APIView):
|
|
|
@@ -269,27 +274,31 @@ class UserAddAPIView(APIView):
|
|
|
|
|
|
def post(self, request):
|
|
|
# 新增用户
|
|
|
- request_data = request.data
|
|
|
- username = request_data.get("username")
|
|
|
- password = request_data.get("password")
|
|
|
- real_name = request_data.get("real_name")
|
|
|
- mobile = request_data.get("mobile")
|
|
|
- role_id = request_data.get("role_id")
|
|
|
- state = request_data.get("state") # 1 正常
|
|
|
- user = User.objects.filter(username=username, is_active=1)
|
|
|
- if user:
|
|
|
- return Response({"code": 2, "msg": "该用户已存在"})
|
|
|
- user = User.objects.create_user(username=username, password=password)
|
|
|
- device_user = DeviceUser.objects.create(
|
|
|
- uid = user.id,
|
|
|
- real_name = real_name,
|
|
|
- mobile = mobile,
|
|
|
- role_id = role_id,
|
|
|
- state = state
|
|
|
- )
|
|
|
- if user and device_user:
|
|
|
- return Response({"code": 0, "msg": "success"})
|
|
|
- else:
|
|
|
+ try:
|
|
|
+ request_data = request.data
|
|
|
+ username = request_data.get("username")
|
|
|
+ password = request_data.get("password")
|
|
|
+ real_name = request_data.get("real_name")
|
|
|
+ mobile = request_data.get("mobile")
|
|
|
+ role_id = request_data.get("role_id")
|
|
|
+ state = request_data.get("state") # 1 正常
|
|
|
+ user = User.objects.filter(username=username, is_active=1)
|
|
|
+ if user:
|
|
|
+ return Response({"code": 2, "msg": "该用户已存在"})
|
|
|
+ user = User.objects.create_user(username=username, password=password)
|
|
|
+ device_user = DeviceUser.objects.create(
|
|
|
+ uid = user.id,
|
|
|
+ real_name = real_name,
|
|
|
+ mobile = mobile,
|
|
|
+ role_id = role_id,
|
|
|
+ state = state
|
|
|
+ )
|
|
|
+ if user and device_user:
|
|
|
+ return Response({"code": 0, "msg": "success"})
|
|
|
+ else:
|
|
|
+ return Response({"code": 2, "msg": "创建用户失败"})
|
|
|
+ except Exception as e:
|
|
|
+ logger.error(f"创建用户失败: {e}")
|
|
|
return Response({"code": 2, "msg": "创建用户失败"})
|
|
|
|
|
|
|