修改更新tb_city_information_id逻辑

Controller/ShadowController.py

@@ -48,11 +48,6 @@ def update_device_shadow(request):
                                       voice_start_x=0, voice_start_y=18, voice_end_x=44, voice_end_y=18,
                                       voice_direction=0)
 
-            # 购买云存套餐的设备isExist置为2
-            # uid_bucket = UID_Bucket.objects.filter(uid=uid, endTime__gte=nowTime).values('id', 'has_unused').order_by(
-            #     'addTime')
-            # if not uid_bucket.exists():
-            #     Device_Info.objects.filter(UID=uid).update(isExist=2, vodPrimaryUserID='', vodPrimaryMaster='')
             # 删除预览图
             uid_pre_qs = UID_Preview.objects.filter(uid=uid)
             if uid_pre_qs.exists():
@@ -71,16 +66,16 @@ def update_device_shadow(request):
             AiService.objects.filter(uid=uid, use_status=1).update(detect_status=0, detect_group='')
             LOGGER.info('{}v2重置成功'.format(uid))
 
-            # ip变化更新tb_city_information_id
-            uid_set_qs = UidSetModel.objects.filter(uid=uid).values('ip')
+            # 和新ip的city_id不一致,更新tb_city_information_id
+            uid_set_qs = UidSetModel.objects.filter(uid=uid).values('ip', 'tb_city_information_id')
             if uid_set_qs.exists():
-                if ip != uid_set_qs[0]['ip']:
-                    # 查询ip区级信息
-                    district = get_district(ip)
+                # 查询ip区级信息
+                district = get_district(ip)
 
-                    city_information_qs = CityInformation.objects.filter(district=district).values('city_id')
-                    if city_information_qs.exists():
-                        city_id = city_information_qs[0]['city_id']
+                city_information_qs = CityInformation.objects.filter(district=district).values('city_id')
+                if city_information_qs.exists():
+                    city_id = city_information_qs[0]['city_id']
+                    if uid_set_qs[0]['tb_city_information_id'] != city_id:
                         uid_set_qs.update(tb_city_information_id=city_id)
 
         ucode = request_dict.get('ucode', None)