|
@@ -60,26 +60,26 @@ class EquipmentOTA(View):
|
|
|
|
|
|
def delete(self, request_dict, userID, response):
|
|
|
eid = request_dict.get('eid', None)
|
|
|
- param_flag = CommonService.get_param_flag(data=[eid])
|
|
|
- if param_flag is True:
|
|
|
- own_permission = ModelService.check_perm(userID=userID, permID=230)
|
|
|
- if own_permission is True:
|
|
|
- ev = Equipment_Version.objects.filter(eid=eid)
|
|
|
- if ev.exists():
|
|
|
- try:
|
|
|
- has_ev = Equipment_Version.objects.filter(filePath=ev[0].filePath)
|
|
|
- if has_ev.exists():
|
|
|
- pass
|
|
|
- else:
|
|
|
- filepath = os.path.join(BASE_DIR, ev[0].filePath)
|
|
|
- os.remove(filepath)
|
|
|
- except Exception as e:
|
|
|
- pass
|
|
|
- ev.delete()
|
|
|
- return response.json(0)
|
|
|
+ if not eid:
|
|
|
+ return response.json(444,'eid')
|
|
|
+ own_perm = ModelService.check_perm(userID=userID, permID=230)
|
|
|
+ if not own_perm:
|
|
|
+ return response.json(404)
|
|
|
+ ev = Equipment_Version.objects.filter(eid=eid)
|
|
|
+ if not ev.exists():
|
|
|
+ return response.json(173)
|
|
|
+ try:
|
|
|
+ has_ev = Equipment_Version.objects.filter(filePath=ev[0].filePath)
|
|
|
+ if has_ev.exists():
|
|
|
+ pass
|
|
|
else:
|
|
|
- return response.json(404)
|
|
|
- return response.json(444)
|
|
|
+ filepath = os.path.join(BASE_DIR, ev[0].filePath)
|
|
|
+ os.remove(filepath)
|
|
|
+ ev.delete()
|
|
|
+ except Exception as e:
|
|
|
+ return response.json(176,repr(e))
|
|
|
+ else:
|
|
|
+ return response.json(0)
|
|
|
|
|
|
def query(self, request_dict, userID, response):
|
|
|
page = int(request_dict.get('page', None))
|
|
@@ -196,6 +196,8 @@ class EquipmentVersionView(View):
|
|
|
url = SERVER_DOMAIN + 'OTA/downloads/' + path + '?time=' + str(time.time())
|
|
|
elif file_path.find('static/otapack') != -1:
|
|
|
url = SERVER_DOMAIN + 'OTA/downloadsPack/' + file_path + '?time=' + str(time.time())
|
|
|
+ else:
|
|
|
+ return response.json(900, '2')
|
|
|
res = {
|
|
|
"url": url,
|
|
|
"fileSize": eqs[0].fileSize,
|
|
@@ -237,53 +239,3 @@ class EquipmentVersionView(View):
|
|
|
'count': count
|
|
|
}
|
|
|
return response.json(0, res)
|
|
|
-
|
|
|
- # def do_query(self, request_dict, response):
|
|
|
- # mci = request_dict.get('mci', None)
|
|
|
- # page = request_dict.get('page', None)
|
|
|
- # line = request_dict.get('line', None)
|
|
|
- # if not page or not line:
|
|
|
- # return response.json(444, 'page,line')
|
|
|
- # else:
|
|
|
- # page = int(page)
|
|
|
- # line = int(line)
|
|
|
- # datas = {}
|
|
|
- # if mci is not None:
|
|
|
- # cv_qs = Equipment_Version.objects.order_by('code').filter(mci=mci).values('code', 'lang').distinct()
|
|
|
- # count = cv_qs.count()
|
|
|
- # cv_qs = cv_qs[(page - 1) * line:page * line]
|
|
|
- # code_list = []
|
|
|
- # for cv in cv_qs:
|
|
|
- # code_list.append(cv['code'])
|
|
|
- # ev_qs = Equipment_Version.objects.filter(code__in=code_list).values()
|
|
|
- # datas = {}
|
|
|
- # # 组装数据
|
|
|
- # for ev in ev_qs:
|
|
|
- # for code in cv_qs:
|
|
|
- # if code not in datas.keys():
|
|
|
- # datas[code] = []
|
|
|
- # if code == ev['code']:
|
|
|
- # datas[code].append(ev)
|
|
|
- # for cv in cv_qs:
|
|
|
- # ev_qs = Equipment_Version.objects.filter(code=cv['code'], lang=cv['lang'])
|
|
|
- # if cv['code'] not in datas.keys():
|
|
|
- # datas[cv['code']] = []
|
|
|
- # else:
|
|
|
- # ev_qs
|
|
|
- # if code not in datas.keys():
|
|
|
- # datas[code] = []
|
|
|
- # if code == ev['code']:
|
|
|
- # datas[code].append(ev)
|
|
|
- # else:
|
|
|
- # pass
|
|
|
- # # return response.json(0, cv_qs)
|
|
|
- # ev_qs = Equipment_Version.objects.filter(code__in=list(cv_qs)).values()
|
|
|
- # ev_list = CommonService.qs_to_list(ev_qs)
|
|
|
- # datas = {}
|
|
|
- # # 组装数据
|
|
|
- #
|
|
|
- # res = {
|
|
|
- # 'datas': datas,
|
|
|
- # 'count': count
|
|
|
- # }
|
|
|
- # return response.json(0, res)
|