瀏覽代碼

代码规范

yf_fyh 3 年之前
父節點
當前提交
7bd611f5db

+ 6 - 3
apps/Equipment/models.py

@@ -1,5 +1,7 @@
 from django.db import models
 from apps.UserApp.models import MyUser
+
+
 # Create your models here.
 
 class Device(models.Model):
@@ -8,7 +10,7 @@ class Device(models.Model):
     }
     device_id = models.CharField(u'设备id', max_length=30, primary_key=True)
     owner = models.ForeignKey(
-        MyUser, blank=True, null=True, on_delete = models.DO_NOTHING, verbose_name=u'设备所属用户')
+        MyUser, blank=True, null=True, on_delete=models.DO_NOTHING, verbose_name=u'设备所属用户')
     device_type = models.SmallIntegerField(u'设备类型', default=1, choices=TYPE_CHOICES.items())
     lng = models.CharField(u'经度', max_length=10, default="")
     lat = models.CharField(u'纬度', max_length=10, default="")
@@ -18,6 +20,7 @@ class Device(models.Model):
     version = models.CharField(u'设备版本号', max_length=50, default="")
     is_online = models.SmallIntegerField(u'是否在线', default=1)
     upl_time = models.IntegerField(default=0)
+
     class Meta:
         db_table = "device"
         verbose_name = u'设备列表'
@@ -25,11 +28,11 @@ class Device(models.Model):
 
 
 class QXZData(models.Model):
-    device_id = models.ForeignKey(Device, on_delete = models.CASCADE)
+    device_id = models.ForeignKey(Device, on_delete=models.CASCADE)
     device_data = models.TextField()
     add_time = models.IntegerField(default=0)
 
     class Meta:
         db_table = "qxz_data"
         verbose_name = u'气象站数据'
-        verbose_name_plural = verbose_name
+        verbose_name_plural = verbose_name

+ 2 - 3
apps/Equipment/serializers.py

@@ -16,15 +16,14 @@ class SearchEquipSerializer(serializers.Serializer):
 
 
 class DeviceListSerializer(serializers.ModelSerializer):
-
     class Meta:
         model = Device
-        exclude = ('owner','device_type')
+        exclude = ('owner', 'device_type')
 
 
 class DeviceDetailSerializer(serializers.Serializer):
     def to_representation(self, instance):
         value = ast.literal_eval(instance.device_data)
         addtime = instance.add_time
-        data = {"value":value,"time":addtime}
+        data = {"value": value, "time": addtime}
         return data

+ 0 - 1
apps/Equipment/urls.py

@@ -2,7 +2,6 @@ from django.conf.urls import url
 
 from . import views
 
-
 urlpatterns = [
     url(r'^search/$', views.SearchEquip.as_view(), name='equip_search'),
     url(r'^qxz/$', views.ReceiveQXZ.as_view(), name='equip_search'),

+ 11 - 10
apps/Equipment/views.py

@@ -3,14 +3,15 @@ from rest_framework.generics import GenericAPIView
 from rest_framework.response import Response
 import time
 
-from .serializers import SearchEquipSerializer,DeviceListSerializer,DeviceDetailSerializer
+from .serializers import SearchEquipSerializer, DeviceListSerializer, DeviceDetailSerializer
 from utils.utils import get_equip_list
 from utils.JWTAuthentication_diy import MyJWTAuthentication
 from utils.permissions import ModulePermission, DeviceDetailPermission
-from utils.MyRateThrottle import DeviceListRateThrottle,DeviceDetailRateThrottle
+from utils.MyRateThrottle import DeviceListRateThrottle, DeviceDetailRateThrottle
 
 from .models import Device, QXZData
 
+
 # Create your views here.
 
 class SearchEquip(APIView):
@@ -26,7 +27,7 @@ class SearchEquip(APIView):
 
 
 class ReceiveQXZ(APIView):
-    def post(self,request):
+    def post(self, request):
         data = request.data
         if data.get("cmd") == "offline":
             imei = data["ext"]["imei"]
@@ -36,7 +37,7 @@ class ReceiveQXZ(APIView):
                 device.is_online = 0
                 device.save()
             except Exception as e:
-                print("离线数据保存异常",e)
+                print("离线数据保存异常", e)
         elif "terminalStatus" in data:
             imei = data["StationID"]
             status_data = data["terminalStatus"]
@@ -62,7 +63,7 @@ class ReceiveQXZ(APIView):
             device.is_online = 1
             device.upl_time = int(time.time())
             device.save()
-            
+
         elif 'data' in data:
             imei = data["StationID"]
             save_data = data["data"]
@@ -83,7 +84,7 @@ class ReceiveQXZ(APIView):
                 add_time=int(time.time())
             )
         return Response("已接收保存")
-        
+
 
 class DeviceList(GenericAPIView):
     authentication_classes = [MyJWTAuthentication]
@@ -91,13 +92,13 @@ class DeviceList(GenericAPIView):
     throttle_classes = [DeviceListRateThrottle]
     serializer_class = DeviceListSerializer
     queryset = Device.objects.all()
-    def post(self,request):
+
+    def post(self, request):
         uid = int(request.user.get("uid"))
         device_queryset = self.get_queryset().filter(owner=uid)
         serializer = self.get_serializer(instance=device_queryset, many=True)
         return Response(serializer.data)
 
-        
 
 class DeviceDetail(GenericAPIView):
     authentication_classes = [MyJWTAuthentication]
@@ -105,10 +106,10 @@ class DeviceDetail(GenericAPIView):
     throttle_classes = [DeviceDetailRateThrottle]
     serializer_class = DeviceDetailSerializer
     queryset = QXZData.objects.all().order_by("-id")
+
     def post(self, request):
         deviceId = request.data.get("deviceId")
         start_time = int(request.data.get("start_time"))
-        device_queryset = self.get_queryset().filter(device_id_id=deviceId,add_time__gt=start_time)
+        device_queryset = self.get_queryset().filter(device_id_id=deviceId, add_time__gt=start_time)
         serializer = self.get_serializer(instance=device_queryset, many=True)
         return Response(serializer.data)
-

+ 3 - 1
apps/IOTCard/serializers.py

@@ -12,13 +12,15 @@ class PlatSimInfoSerializer(serializers.ModelSerializer):
         data.update(input_type=instance.get_input_type_display())
         data.update(platform=instance.get_platform_display())
         return data
+
     def update(self, instance, validated_data):
         validated_data["upl_time"] = datetime.datetime.now()
         return super().update(instance, validated_data)
+
     class Meta:
         model = PlatSimInfo
         fields = '__all__'
-        read_only_fields  = ["id", "upl_time"]
+        read_only_fields = ["id", "upl_time"]
         extra_kwargs = {
             "upl_time": {
                 "format": "%Y-%m-%d %H:%M:%S"

+ 0 - 1
apps/IOTCard/urls.py

@@ -2,7 +2,6 @@ from rest_framework import routers
 
 from . import views
 
-
 router = routers.SimpleRouter()
 router.register('platsimview', views.PlatformIOTCardViewSet)
 rest_urlpatterns = router.urls

+ 61 - 57
apps/IOTCard/views.py

@@ -24,8 +24,8 @@ from utils.utils import get_equip_list, Get_SIM_info
 def time_dif(checkdatetime):
     # 获取传入时间和当前时间差
     nowdatetime = datetime.datetime.now()
-    checkdatetime = datetime.datetime.strptime(checkdatetime,"%Y-%m-%d %H:%M:%S")
-    
+    checkdatetime = datetime.datetime.strptime(checkdatetime, "%Y-%m-%d %H:%M:%S")
+
     timedif = nowdatetime - checkdatetime
     return timedif.days
 
@@ -89,9 +89,9 @@ class PlatformIOTCardViewSet(viewsets.ModelViewSet):
             platformid = 2
         else:
             raise ValidationError("平台不存在该设备ID,请核查!")
-        requests.post(url="http://www.yfzhwlw.com/equip_simiccid", data={"e_id": device_id, "iccid": simId},timeout=5)
+        requests.post(url="http://www.yfzhwlw.com/equip_simiccid", data={"e_id": device_id, "iccid": simId}, timeout=5)
         requests.post(url="http://8.136.98.49:8002/api/api_gateway?method=forecast.send_control.device_sim",
-                                data={"device_id": device_id, "iccid": simId, "type": "change"},timeout=5)
+                      data={"device_id": device_id, "iccid": simId, "type": "change"}, timeout=5)
         sim_operators, account_status, active_date, data_plan, data_usage, data_balance, expiry_date = Get_SIM_info(
             simId).get_sim_info()
         request_data = {
@@ -119,15 +119,16 @@ class PlatformIOTCardViewSet(viewsets.ModelViewSet):
         instance = self.get_object()
         if req == "upgrade":
             iccid = instance.simId
-            sim_operators,account_status,active_date,data_plan,data_usage,data_balance,expiry_date = Get_SIM_info(iccid).get_sim_info()
+            sim_operators, account_status, active_date, data_plan, data_usage, data_balance, expiry_date = Get_SIM_info(
+                iccid).get_sim_info()
             update_data = {
-                "sim_operators" : sim_operators,
-                "account_status" : account_status,
-                "active_date" : active_date,
-                "data_plan" : data_plan,
-                "data_usage" : data_usage,
-                "data_balance" : data_balance,
-                "expiry_date" : expiry_date
+                "sim_operators": sim_operators,
+                "account_status": account_status,
+                "active_date": active_date,
+                "data_plan": data_plan,
+                "data_usage": data_usage,
+                "data_balance": data_balance,
+                "expiry_date": expiry_date
             }
         elif req == "change":
             deviceId = instance.deviceId
@@ -139,21 +140,23 @@ class PlatformIOTCardViewSet(viewsets.ModelViewSet):
             if self.get_queryset().filter(simId=simId).exists():
                 raise ValidationError("预更改卡号已存在,请核对!")
             try:
-                requests.post(url="http://www.yfzhwlw.com/equip_simiccid",data={"e_id":deviceId,"iccid":simId},timeout=5)
+                requests.post(url="http://www.yfzhwlw.com/equip_simiccid", data={"e_id": deviceId, "iccid": simId},
+                              timeout=5)
                 requests.post(url="http://8.136.98.49:8002/api/api_gateway?method=forecast.send_control.device_sim",
-                              data={"device_id": deviceId,"iccid": simId,"type": "change"},timeout=5)
+                              data={"device_id": deviceId, "iccid": simId, "type": "change"}, timeout=5)
             except:
                 pass
-            sim_operators,account_status,active_date,data_plan,data_usage,data_balance,expiry_date = Get_SIM_info(simId).get_sim_info()
+            sim_operators, account_status, active_date, data_plan, data_usage, data_balance, expiry_date = Get_SIM_info(
+                simId).get_sim_info()
             update_data = {
                 "simId": simId,
-                "sim_operators" : sim_operators,
-                "account_status" : account_status,
-                "active_date" : active_date,
-                "data_plan" : data_plan,
-                "data_usage" : data_usage,
-                "data_balance" : data_balance,
-                "expiry_date" : expiry_date
+                "sim_operators": sim_operators,
+                "account_status": account_status,
+                "active_date": active_date,
+                "data_plan": data_plan,
+                "data_usage": data_usage,
+                "data_balance": data_balance,
+                "expiry_date": expiry_date
             }
         else:
             raise ValidationError("未识别req参数")
@@ -169,20 +172,20 @@ class PlatformIOTCardViewSet(viewsets.ModelViewSet):
         for i in queryset:
             data.append(i.device_type)
         return Response(data)
-    
+
     @action(methods=['get'], detail=False, url_path='down_excel', url_name='down_excel')
     def down_excel(self, request, *args, **kwargs):
         filename = request.query_params.get("filename")
         if filename == "发货表示例模板.xlsx":
             save_data = dict(设备ID=[])
         elif filename == "合宙续存流量卡筛选模板.xlsx":
-            save_data = dict(ICCID=[],续费价格=[],当月消耗流量=[])
+            save_data = dict(ICCID=[], 续费价格=[], 当月消耗流量=[])
         elif filename == "SIMBoss续存流量卡筛选模板.xlsx":
-            save_data = dict(ICCID=[],筛查月份1=[],筛查月份2=[],筛查月份3=[],筛查月份4=[],筛查月份5=[],
-            筛查月份6=[],筛查月份7=[],筛查月份8=[],筛查月份9=[])
+            save_data = dict(ICCID=[], 筛查月份1=[], 筛查月份2=[], 筛查月份3=[], 筛查月份4=[], 筛查月份5=[],
+                             筛查月份6=[], 筛查月份7=[], 筛查月份8=[], 筛查月份9=[])
         else:
             now_dir = os.path.dirname(__file__)
-            file_path = os.path.join(now_dir,"excel_folder",filename)
+            file_path = os.path.join(now_dir, "excel_folder", filename)
             if os.path.exists(file_path) == False:
                 raise ValidationError("文件不存在,请确认文件名")
             else:
@@ -205,14 +208,14 @@ class PlatformIOTCardViewSet(viewsets.ModelViewSet):
     def card_delivery_filter(self, request, *args, **kwargs):
         file = request.FILES.get('file')
         file_dataframe = pd.read_excel(file)
-        save_data = dict(deviceid=[],fulldeviceid=[],device_type=[],is_recharge=[],backword=[])
+        save_data = dict(deviceid=[], fulldeviceid=[], device_type=[], is_recharge=[], backword=[])
 
         for deviceId in file_dataframe["设备ID"]:
-            if isinstance(deviceId,int):
+            if isinstance(deviceId, int):
                 deviceId = str(int(deviceId))
             else:
                 deviceId = deviceId.strip()
-            sim_queryset = self.get_queryset().filter(deviceId__endswith=deviceId,input_type=1)
+            sim_queryset = self.get_queryset().filter(deviceId__endswith=deviceId, input_type=1)
             if sim_queryset.count() == 0:
                 fulldeviceid = "未知"
                 device_type = "未知"
@@ -231,8 +234,8 @@ class PlatformIOTCardViewSet(viewsets.ModelViewSet):
                     else:
                         is_recharge = "否"
                 backword = "{}".format(sim_obj.simId)
-                if sim_obj.device_type=="孢子仪" or sim_obj.device_type=="测报灯":
-                    sim2_queryset = self.get_queryset().filter(deviceId=fulldeviceid,input_type=2).order_by("-id")
+                if sim_obj.device_type == "孢子仪" or sim_obj.device_type == "测报灯":
+                    sim2_queryset = self.get_queryset().filter(deviceId=fulldeviceid, input_type=2).order_by("-id")
                     if sim2_queryset:
                         sim2_obj = sim2_queryset[0]
                         if sim2_obj.expiry_date == "未知":
@@ -243,10 +246,10 @@ class PlatformIOTCardViewSet(viewsets.ModelViewSet):
                                 is_recharge = "卡1" + is_recharge + ",卡2是"
                             else:
                                 is_recharge = "卡1" + is_recharge + ",卡2否"
-                        backword = "卡1:{};卡2:{}".format(sim_obj.simId,sim2_obj.simId)
+                        backword = "卡1:{};卡2:{}".format(sim_obj.simId, sim2_obj.simId)
                     else:
                         print("卡二不存在")
-                
+
             else:
                 fulldeviceid = "未知"
                 device_type = "未知"
@@ -257,21 +260,21 @@ class PlatformIOTCardViewSet(viewsets.ModelViewSet):
             save_data["is_recharge"].append(is_recharge)
             save_data["device_type"].append(device_type)
             save_data["backword"].append(backword)
-            
+
         df = pd.DataFrame(data=save_data)
-        save_filename = str(uuid.uuid4())+".xlsx"
+        save_filename = str(uuid.uuid4()) + ".xlsx"
         now_dir = os.path.dirname(__file__)
-        save_path = os.path.join(now_dir,"excel_folder",save_filename)
-        df.to_excel(save_path,index=False,header=["设备ID","完整设备号(自行判断)","设备类型","是否需要充值","说明备注"])
+        save_path = os.path.join(now_dir, "excel_folder", save_filename)
+        df.to_excel(save_path, index=False, header=["设备ID", "完整设备号(自行判断)", "设备类型", "是否需要充值", "说明备注"])
         return Response(save_filename)
-        
+
     @action(methods=['post'], detail=False, url_path='xucun_card_filter', url_name='xucun_card_filter')
     def xucun_card_filter(self, request, *args, **kwargs):
         simtype = request.data.get("simtype")
         renew_file = request.FILES.get("file")
         file_dataframe = pd.read_excel(renew_file)
         if simtype == "1":  # 合宙卡
-            save_data = dict(ICCID=[], 续费价格=[], 是否需要充值=[],备注=[])
+            save_data = dict(ICCID=[], 续费价格=[], 是否需要充值=[], 备注=[])
             sim_list = list(file_dataframe["ICCID"])
             price_list = list(file_dataframe["续费价格"])
             usage_list = list(file_dataframe["当月消耗流量"])
@@ -287,7 +290,7 @@ class PlatformIOTCardViewSet(viewsets.ModelViewSet):
                     if card_queryset.exists():
                         card_obj = card_queryset.first()
                         deviceId = card_obj.deviceId
-                        device_info_list = get_equip_list(d_id=deviceId,isfullId=1)
+                        device_info_list = get_equip_list(d_id=deviceId, isfullId=1)
                         if device_info_list:
                             device_info = device_info_list[0]
                             uptime = device_info["uptime"]
@@ -306,13 +309,13 @@ class PlatformIOTCardViewSet(viewsets.ModelViewSet):
                 else:
                     save_data["是否需要充值"].append("是")
                     save_data["备注"].append("当月存在流量使用")
-        else:   # SIMboss
-            save_data = dict(ICCID=[],是否需要充值=[])
+        else:  # SIMboss
+            save_data = dict(ICCID=[], 是否需要充值=[])
             for index, sim in enumerate(file_dataframe["ICCID"]):
                 save_data["ICCID"].append(str(sim))
                 status = 0
                 for i in range(9):
-                    if float(file_dataframe["筛查月份{}".format(str(i+1))][index]) > 1:
+                    if float(file_dataframe["筛查月份{}".format(str(i + 1))][index]) > 1:
                         status = 1
                         break
                 if status == 1:
@@ -321,27 +324,28 @@ class PlatformIOTCardViewSet(viewsets.ModelViewSet):
                     save_data["是否需要充值"].append("否")
 
         df = pd.DataFrame(data=save_data)
-        save_filename = str(uuid.uuid4())+".xlsx"
+        save_filename = str(uuid.uuid4()) + ".xlsx"
         now_dir = os.path.dirname(__file__)
-        save_path = os.path.join(now_dir,"excel_folder",save_filename)
-        df.to_excel(save_path,index=False)
+        save_path = os.path.join(now_dir, "excel_folder", save_filename)
+        df.to_excel(save_path, index=False)
         return Response(save_filename)
 
     @action(methods=['post'], detail=False, url_path='inquiries', url_name='inquiries')
-    def inquiries(self,request):
+    def inquiries(self, request):
         iccid = request.data.get("iccid")
         if iccid:
-            sim_operators,account_status,active_date,data_plan,data_usage,data_balance,expiry_date = Get_SIM_info(iccid).get_sim_info()
+            sim_operators, account_status, active_date, data_plan, data_usage, data_balance, expiry_date = Get_SIM_info(
+                iccid).get_sim_info()
             data = {
                 "simId": iccid,
-                "sim_operators" : "合宙" if sim_operators==1 else "SIMBoss" if sim_operators==2 else "未知",
-                "account_status" : account_status,
-                "active_date" : active_date,
-                "data_plan" : data_plan,
-                "data_usage" : data_usage,
-                "data_balance" : data_balance,
-                "expiry_date" : expiry_date
+                "sim_operators": "合宙" if sim_operators == 1 else "SIMBoss" if sim_operators == 2 else "未知",
+                "account_status": account_status,
+                "active_date": active_date,
+                "data_plan": data_plan,
+                "data_usage": data_usage,
+                "data_balance": data_balance,
+                "expiry_date": expiry_date
             }
             return Response(data)
         else:
-            raise ValidationError("iccid参数缺失")
+            raise ValidationError("iccid参数缺失")

+ 2 - 1
apps/UserApp/models.py

@@ -1,6 +1,7 @@
 from django.db import models
 from django.contrib.auth.models import AbstractUser
 
+
 # Create your models here.
 
 class MyUser(AbstractUser):
@@ -18,4 +19,4 @@ class MyUser(AbstractUser):
         verbose_name = u'用户列表'
         verbose_name_plural = verbose_name
         ordering = ['-date_joined']
-        get_latest_by = 'date_joined'
+        get_latest_by = 'date_joined'

+ 1 - 1
apps/UserApp/serializers.py

@@ -12,4 +12,4 @@ class RegisterViewSerializer(serializers.Serializer):
             user = MyUser.objects.create_user(**validated_data)
         except Exception as e:
             raise ValueError("用户创建失败,已存在用户名")
-        return user
+        return user

+ 0 - 1
apps/UserApp/urls.py

@@ -2,7 +2,6 @@ from django.conf.urls import url
 
 from . import views
 
-
 urlpatterns = [
     url(r'^login/$', views.LoginView.as_view(), name='login'),
     url(r'^register/$', views.RegisterView.as_view(), name='login'),

+ 8 - 6
apps/UserApp/views.py

@@ -8,33 +8,35 @@ from utils.permissions import RegisterViewPermission
 from utils.MyRateThrottle import LoginRateThrottle
 from .serializers import RegisterViewSerializer
 
+
 # Create your views here.
 
 
 class LoginView(APIView):
-    throttle_classes = [LoginRateThrottle,]
-    def post(self,request):
+    throttle_classes = [LoginRateThrottle, ]
+
+    def post(self, request):
         username = request.data.get('username')
         password = request.data.get('password')
-        user = authenticate(username = username,password = password)
+        user = authenticate(username=username, password=password)
         if user is not None and user.is_active:
             token = get_token(user)
             return Response(token)
         else:
-            return Response(data = {"msg":"登录验证失败","data":""},status=status.HTTP_401_UNAUTHORIZED)
+            return Response(data={"msg": "登录验证失败", "data": ""}, status=status.HTTP_401_UNAUTHORIZED)
 
 
 class RegisterView(GenericAPIView):
     authentication_classes = [MyJWTAuthentication]
     serializer_class = RegisterViewSerializer
     permission_classes = [RegisterViewPermission]
-    def post(self,request):
+
+    def post(self, request):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid()
         serializer.save()
         return Response(serializer.data)
 
-
 # class UserShowView(APIView):
 #     #局部配置
 #     authentication_classes = [MyJWTAuthentication]

+ 6 - 14
bigdataAPI/settings.py

@@ -16,7 +16,6 @@ import datetime
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/2.1/howto/deployment/checklist/
 
@@ -28,7 +27,6 @@ DEBUG = True
 
 ALLOWED_HOSTS = ['*']
 
-
 # Application definition
 
 INSTALLED_APPS = [
@@ -38,7 +36,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    
+
     'rest_framework',
     'rest_framework_jwt',
     'apps.UserApp',
@@ -77,7 +75,6 @@ TEMPLATES = [
 
 WSGI_APPLICATION = 'bigdataAPI.wsgi.application'
 
-
 # Database
 # https://docs.djangoproject.com/en/2.1/ref/settings/#databases
 
@@ -93,7 +90,6 @@ DATABASES = {
     }
 }
 
-
 # Password validation
 # https://docs.djangoproject.com/en/2.1/ref/settings/#auth-password-validators
 
@@ -112,7 +108,6 @@ AUTH_PASSWORD_VALIDATORS = [
     },
 ]
 
-
 # Internationalization
 # https://docs.djangoproject.com/en/2.1/topics/i18n/
 
@@ -126,13 +121,11 @@ USE_L10N = True
 
 USE_TZ = False
 
-
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/2.1/howto/static-files/
 
 STATIC_URL = '/static/'
 
-
 AUTH_USER_MODEL = 'UserApp.MyUser'
 
 REST_FRAMEWORK = {
@@ -143,13 +136,12 @@ REST_FRAMEWORK = {
         'utils.rendererresponse.CustomRender',
     ),
     'DEFAULT_THROTTLE_RATES': {
-        'login':'10/m',
-        'devicelist':'10/h',
-        'devicedetail':'10/h'
+        'login': '10/m',
+        'devicelist': '10/h',
+        'devicedetail': '10/h'
     }
 }
 
-
 JWT_AUTH = {
-    'JWT_EXPIRATION_DELTA':datetime.timedelta(days=1),
-}
+    'JWT_EXPIRATION_DELTA': datetime.timedelta(days=1),
+}

+ 0 - 1
utils/AESencipher.py

@@ -29,4 +29,3 @@ class aescrypt():
         text = base64.decodebytes(text.encode(self.encode_))
         self.decrypt_text = self.aes.decrypt(text)
         return self.decrypt_text.decode(self.encode_).strip('\0')
-

+ 8 - 10
utils/JWTAuthentication_diy.py

@@ -1,18 +1,17 @@
-from rest_framework_jwt.serializers import jwt_encode_handler,jwt_decode_handler
+from rest_framework_jwt.serializers import jwt_encode_handler, jwt_decode_handler
 from rest_framework.authentication import BaseAuthentication
 from rest_framework.exceptions import AuthenticationFailed
 import jwt
-import json
-
 from .AESencipher import aescrypt
 
 PrAes = aescrypt('yf7232275', 'ECB', '', 'gbk')
 
+
 def get_token(user):
     data = str(user.id) + "," + user.username + "," + str(user.user_modules)
     data = PrAes.aesencrypt(data)
-    payload = {"token":data}
-    
+    payload = {"token": data}
+
     token = jwt_encode_handler(payload)
     return token
 
@@ -25,11 +24,11 @@ class MyJWTAuthentication(BaseAuthentication):
                 payload = jwt_decode_handler(token)
                 data = payload["token"]
                 if '%2B' in data or " " in data:
-                    data = str(data).replace("%2B","+").replace(" ","+")
+                    data = str(data).replace("%2B", "+").replace(" ", "+")
                 data = PrAes.aesdecrypt(data)
                 data_list = data.split(",")
-                user = {"uid":data_list[0],"username":data_list[1],"user_modules":data_list[2]}
-                return (user,token)
+                user = {"uid": data_list[0], "username": data_list[1], "user_modules": data_list[2]}
+                return (user, token)
             except jwt.ExpiredSignature:
                 msg = 'token过期'
                 raise AuthenticationFailed(msg)
@@ -40,7 +39,6 @@ class MyJWTAuthentication(BaseAuthentication):
                 msg = '用户非法'
                 raise AuthenticationFailed(msg)
             except Exception as e:
-                msg=str(e)
+                msg = str(e)
                 raise AuthenticationFailed(msg)
         raise AuthenticationFailed('token为空')
-

+ 6 - 0
utils/MyRateThrottle.py

@@ -1,19 +1,25 @@
 from rest_framework.throttling import SimpleRateThrottle
 
+
 class LoginRateThrottle(SimpleRateThrottle):
     scope = "login"
+
     def get_cache_key(self, request, view):
         return self.get_ident(request)
 
+
 class DeviceListRateThrottle(SimpleRateThrottle):
     scope = "devicelist"
+
     def get_cache_key(self, request, view):
         user = request.user
         uid = user["uid"]
         return uid
 
+
 class DeviceDetailRateThrottle(SimpleRateThrottle):
     scope = "devicedetail"
+
     def get_cache_key(self, request, view):
         user = request.user
         uid = user["uid"]

+ 1 - 1
utils/exception.py

@@ -22,4 +22,4 @@ def custom_exception_handler(exc, context):
             'code': response.status_code,
             'msg': '{exc}'.format(exc=exc),
             'data': ''
-        }, status=200, exception=True)
+        }, status=200, exception=True)

+ 5 - 3
utils/permissions.py

@@ -3,6 +3,7 @@
 from rest_framework.permissions import BasePermission
 from apps.Equipment.models import Device
 
+
 class RegisterViewPermission(BasePermission):
     def has_permission(self, request, view):
         try:
@@ -14,8 +15,9 @@ class RegisterViewPermission(BasePermission):
         except:
             return False
 
+
 class ModulePermission(BasePermission):
-    def has_permission(self,request,view):
+    def has_permission(self, request, view):
         try:
             user = request.user
             user_modules = user.get("user_modules")
@@ -35,10 +37,10 @@ class DeviceDetailPermission(BasePermission):
             uid = user.get("uid")
             user_modules = user.get("user_modules")
             deviceId = request.data.get("deviceId")
-            device = Device.objects.filter(device_id=deviceId,owner=int(uid))
+            device = Device.objects.filter(device_id=deviceId, owner=int(uid))
             if user_modules == "1" and device.exists():
                 return True
             else:
                 return False
         except:
-            return False
+            return False

+ 6 - 4
utils/utils.py

@@ -13,11 +13,13 @@ def get_equip_list(d_id, isfullId=0):
     :return:列表数据,相同设备号放一起,并且最近更新数据靠前,最近更新数据可认为设备最后所在平台
     """
     if isfullId == 1:
-        bigdata_res = requests.post("http://8.136.98.49:8002/search/equip", data={"device_id": d_id, "isfullId": "1"},timeout=5)
-        siqing_res = requests.post("http://www.yfzhwlw.com/search/equip", data={"device_id": d_id, "isfullId": "1"},timeout=5)
+        bigdata_res = requests.post("http://8.136.98.49:8002/search/equip", data={"device_id": d_id, "isfullId": "1"},
+                                    timeout=5)
+        siqing_res = requests.post("http://www.yfzhwlw.com/search/equip", data={"device_id": d_id, "isfullId": "1"},
+                                   timeout=5)
     else:
-        bigdata_res = requests.post("http://8.136.98.49:8002/search/equip", data={"device_id": d_id},timeout=5)
-        siqing_res = requests.post("http://www.yfzhwlw.com/search/equip", data={"device_id": d_id},timeout=5)
+        bigdata_res = requests.post("http://8.136.98.49:8002/search/equip", data={"device_id": d_id}, timeout=5)
+        siqing_res = requests.post("http://www.yfzhwlw.com/search/equip", data={"device_id": d_id}, timeout=5)
 
     django_data = json.loads(bigdata_res.content.decode()).get("data", [])
     siqing_data = json.loads(siqing_res.content.decode()).get("data", [])