Merge branch 'dev' into lang

Ansjer/config.py

@@ -81,6 +81,8 @@ elif SERVER_TYPE == 'Ansjer.test_settings':
     from Ansjer.config_test import *
 elif SERVER_TYPE == 'Ansjer.formal_settings':
     from Ansjer.config_formal import *
+else:
+    from Ansjer.config_local import *
 # type =2
 JPUSH_CONFIG = {
     'com.ansjer.accloud_ab': {

Controller/AppSetController.py

@@ -65,7 +65,8 @@ class AppSetView(View):
             key_id= "www"+appBundleId
         else:
             key_id = "test" + appBundleId
-        redis_value = redis.get_data(key=key_id)
+        #redis_value = redis.get_data(key=key_id)  去除到缓存中找
+        redis_value = False
         if redis_value == False:
             print('添加到缓存')
             # 查数据库
@@ -76,11 +77,16 @@ class AppSetView(View):
                 sm_qs = sm_qs.values("content")
                 # 添加到缓存，缓存时间为3600秒------指的是一个钟后再次访问，就会刷新缓存一次
                 dict_json = json.loads(sm_qs[0]['content'])
-                if 'editionUpgrading' in dict_json and dict_json['editionUpgrading'] == 1:
-                    if lang !='cn':
-                        dict_json['editionUpgrading'] = 'Upgrading, please sign in later'
+                if 'editionUpgrading' in dict_json :
+                    if  dict_json['editionUpgrading'] == 1:
+                        if lang !='cn':
+                            dict_json['editionUpgrading'] = 'Upgrading, please sign in later'
+                        else:
+                            dict_json['editionUpgrading'] = '正在升级，请稍后登录'
                     else:
-                        dict_json['editionUpgrading'] = '正在升级，请稍后登录'
+                        dict_json['editionUpgrading'] = ''
+
+
 
                 content_json_str = dict_json
 

Controller/EquipmentManager.py

@@ -18,6 +18,7 @@ from Object.ETkObject import ETkObject
 import oss2
 from django.http import JsonResponse
 from Object.RedisObject import RedisObject
+from Controller.DetectController import DetectControllerView
 
 
 #     查询用户设备
@@ -753,6 +754,7 @@ def deleteInterface(request):
                 dv_qs.delete()
                 # 删除设备影子信息uid_set   外键关联删除设备推送配置信息 uid_push
                 up_qs = UidPushModel.objects.filter(uid_set__uid=uid)
+                DetectControllerView().do_delete_redis(uid)
                 if up_qs.count() > 1:
                     UidPushModel.objects.filter(uid_set__uid=uid, userID_id=userID).delete()
                     redisObj = RedisObject(db=6, SERVER_HOST='push.dvema.com')

Controller/SerialNumberController.py

@@ -8,7 +8,7 @@ from django.db import transaction
 from django.views import View
 
 from Model.models import SerialNumberModel, CompanySerialModel, UIDCompanySerialModel, CompanyModel, RegionModel, \
-    CountryModel, UIDModel
+    CountryModel, UIDModel, RegionCountryModel
 from Object.RedisObject import RedisObject
 from Object.uidManageResponseObject import uidManageResponseObject
 from Object.TokenObject import TokenObject
@@ -127,8 +127,8 @@ class SerialNumberView(View):
                 value = redisObject.lpop(key)
                 count += 1
 
-            if count == 5 and value is False:
-                return response.json(5)
+            # if count == 5 and value is False:    暂时注释
+            #     return response.json(5)
 
             quantity = int(quantity)
 
@@ -140,12 +140,12 @@ class SerialNumberView(View):
             # 存在对应的企业
             company_serial_qs = company_serial_qs[0:quantity]
 
-            company_serial_qs = company_serial_qs.values('id', 'serial_number__serial_number', 'company__mark')
+            #company_serial_qs = company_serial_qs.values('id', 'serial_number__serial_number', 'company__mark')
             data = []
             ids = []
             for serial in company_serial_qs:
-                ids.append(serial['id'])
-                data.append(serial['serial_number__serial_number'] + serial['company__mark'])
+                ids.append(serial.id)
+                data.append(serial.serial_number.serial_number + serial.company.mark)
             CompanySerialModel.objects.filter(id__in=ids).update(status=1)
             redisObject.rpush(key, value)
             return response.json(0, data)
@@ -203,22 +203,22 @@ class SerialNumberView(View):
             try:
                 try:
 
-                    # 判断序列号是否已和UID关联
+                    # 判断序列号是否已和企业关联
                     company_serial_qs = CompanySerialModel.objects.filter(company__secret=company_id,
                                                                           serial_number__serial_number=serial)
                     if not company_serial_qs.exists():
-                        uid_company_serial_qs = UIDCompanySerialModel.objects.filter(company_serial__company__mark=mark,
-                                                                                     company_serial__serial_number__serial_number=serial)
-
-                        uid = uid_company_serial_qs.values('uid__uid', 'uid__mac', 'uid__uid_extra')[0]
-
-                        res = {
-                            'uid': CommonService.encode_data(uid['uid__uid']),
-                            'mac': CommonService.encode_data(uid['uid__mac']),
-                            'extra': uid['uid__uid_extra']
-                        }
-                        return response.json(0, res)
+                        return response.json(173)
 
+                    region_country_qs = RegionCountryModel.objects.filter(number=country_id)
+                    endpoint = 'a2rqy12o004ad8-ats.iot.us-east-1.amazonaws.com'
+                    if region_country_qs.exists():
+                        user_region = region_country_qs[0]
+                        if user_region.region_id == 1:
+                            endpoint = 'a250bbr0p9u7as-ats.iot.cn-northwest-1.amazonaws.com.cn'
+                        elif user_region.region_id == 2:
+                            endpoint = 'a2rqy12o004ad8-ats.iot.ap-southeast-1.amazonaws.com'
+                        elif user_region.region_id == 3:
+                            endpoint = 'a2rqy12o004ad8-ats.iot.eu-west-1.amazonaws.com'
 
                     # 当序列号已关联UID
                     company_serial = company_serial_qs[0]
@@ -262,7 +262,8 @@ class SerialNumberView(View):
                                 res = {
                                     'uid': CommonService.encode_data(uid.uid),
                                     'mac': CommonService.encode_data(uid.mac),
-                                    'extra': uid.uid_extra
+                                    'extra': uid.uid_extra,
+                                    'endpoint': endpoint
                                 }
                                 return response.json(0, res)
                             else:
@@ -276,7 +277,8 @@ class SerialNumberView(View):
                             res = {
                                 'uid': CommonService.encode_data(uid['uid__uid']),
                                 'mac': CommonService.encode_data(uid['uid__mac']),
-                                'extra': uid['uid__uid_extra']
+                                'extra': uid['uid__uid_extra'],
+                                'endpoint': endpoint
                             }
                             return response.json(0, res)
                         else:

Object/RedisObject.py

@@ -70,6 +70,13 @@ class RedisObject:
     def rpush(self, name, val):
         self.CONN.rpush(name, val)
 
+    def lpop(self, key):
+        val = self.CONN.lpop(key)
+        if val:
+            return val.decode('utf-8')
+        else:
+            return False
+
     # 获取列表长度
     def llen(self, name):
         return self.CONN.llen(name=name)