获取国家城市列表

AdminController/VersionManagementController.py

@@ -15,7 +15,7 @@ from Ansjer.config import BASE_DIR, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
 from Object.TokenObject import TokenObject
 from Object.ResponseObject import ResponseObject
 from Service.CommonService import CommonService
-from Model.models import Equipment_Version, App_Info, AppSetModel, App_Colophon, Pc_Info
+from Model.models import Equipment_Version, App_Info, AppSetModel, App_Colophon, Pc_Info, CountryModel, CNRegion
 
 
 class VersionManagement(View):
@@ -72,6 +72,10 @@ class VersionManagement(View):
                 return self.editPcVersion(request_dict, response)
             elif operation == 'deletePcInfo':
                 return self.deletePcInfo(request_dict, response)
+            elif operation == 'getCountryList':
+                return self.getCountryList(request_dict, response)
+            elif operation == 'getCityList':
+                return self.getCityList(request_dict, response)
             else:
                 return response.json(404)
 
@@ -116,6 +120,8 @@ class VersionManagement(View):
         Description = request_dict.get('Description', '')
         status = request_dict.get('status', 0)
         isPopup = request_dict.get('isPopup', 0)
+        auto_update = request_dict.get('autoUpdate', 0)
+        data_json = request_dict.get('dataJson', None)
 
         if not all([file, mci, lang, ESN, max_ver, channel, resolutionRatio]):
             return response.json(444)
@@ -152,7 +158,8 @@ class VersionManagement(View):
                              'resolutionRatio': resolutionRatio, 'Description': Description, 'status': status,
                              'is_popup': isPopup, 'version': version, 'softwareVersion': softwareVersion, 'code': code,
                              'chipModelList2Code': chipModelList2Code, 'type': type, 'companyCode': companyCode,
-                             'fileSize': fileSize, 'filePath': filePath, 'fileMd5': fileMd5, 'update_time': nowTime}
+                             'fileSize': fileSize, 'filePath': filePath, 'fileMd5': fileMd5, 'update_time': nowTime,
+                             'data_json': data_json, 'auto_update': auto_update}
                 # Equipment_Version表创建或更新数据
                 equipment_version_qs = Equipment_Version.objects.filter(code=code, lang=lang)
                 if not equipment_version_qs.exists():
@@ -175,7 +182,8 @@ class VersionManagement(View):
                 LOGGER.info('versionManagement/upLoadFile成功上传{}'.format(file_name))
                 return response.json(0)
         except Exception as e:
-            LOGGER.info('versionManagement/upLoadFile接口异常,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
+            LOGGER.info(
+                'versionManagement/upLoadFile接口异常,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def editVersionInformation(self, request_dict, response):
@@ -644,3 +652,19 @@ class VersionManagement(View):
         except Exception as e:
             print(e)
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
+
+    def getCountryList(self, request_dict, response):
+        try:
+            country_qs = CountryModel.objects.all().values_list('country_name', flat=True)
+            return response.json(0, list(country_qs))
+        except Exception as e:
+            print(e)
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
+
+    def getCityList(self, request_dict, response):
+        try:
+            city_qs = CNRegion.objects.filter(level=2).values_list('name', flat=True)
+            return response.json(0, list(city_qs))
+        except Exception as e:
+            print(e)
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))