|
|
@@ -15,7 +15,7 @@ from django.views.generic.base import View
|
|
|
from Ansjer.config import BASE_DIR, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
|
|
|
from Ansjer.config import LOGGER, CONFIG_TEST, SERVER_DOMAIN, CONFIG_CN, CONFIG_INFO
|
|
|
from Model.models import Equipment_Version, App_Info, AppSetModel, App_Colophon, Pc_Info, CountryModel, CNRegion, \
|
|
|
- Device_Info, UidSetModel, Device_User, IPAddr
|
|
|
+ Device_Info, UidSetModel, Device_User, IPAddr, DeviceVersionInfo
|
|
|
from Object.RedisObject import RedisObject
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.TokenObject import TokenObject
|
|
|
@@ -113,6 +113,16 @@ class VersionManagement(View):
|
|
|
total = equipment_version_qs.count()
|
|
|
equipment_version_qs = equipment_version_qs.values()[(page - 1) * line:page * line]
|
|
|
equipment_version_list = CommonService.qs_to_list(equipment_version_qs)
|
|
|
+
|
|
|
+ for equipment_version in equipment_version_list:
|
|
|
+ new_equipment_version = equipment_version['version'][1:]
|
|
|
+ d_code = new_equipment_version.rsplit('.', 1)[1]
|
|
|
+ software_ver = new_equipment_version.rsplit('.', 1)[0].replace('V', '')
|
|
|
+ device_ver_info_qs = DeviceVersionInfo.objects.filter(d_code=d_code, software_ver=software_ver)
|
|
|
+ if device_ver_info_qs.exists():
|
|
|
+ equipment_version['is_hav_dev_ver_info'] = 1
|
|
|
+ else:
|
|
|
+ equipment_version['is_hav_dev_ver_info'] = 0
|
|
|
return response.json(0, {'list': equipment_version_list, 'total': total})
|
|
|
except Exception as e:
|
|
|
print(e)
|
