|
|
@@ -30,7 +30,8 @@ class LangWordView(TemplateView):
|
|
|
def post(self, request, *args, **kwargs):
|
|
|
request.encoding = 'utf-8'
|
|
|
operation = kwargs.get('operation', None)
|
|
|
- request_dict = json.loads(request.body.decode('utf-8'))
|
|
|
+ # request_dict = json.loads(request.body.decode('utf-8'))
|
|
|
+ request_dict = request.POST
|
|
|
return self.validate(request, request_dict, operation)
|
|
|
|
|
|
def get(self, request, *args, **kwargs):
|
|
|
@@ -311,24 +312,24 @@ class LangWordView(TemplateView):
|
|
|
data = file.read()
|
|
|
workbook = xlrd.open_workbook(file_contents=data)
|
|
|
worksheet = workbook.sheet_by_index(0)
|
|
|
- ar_list = worksheet.col_values(1)
|
|
|
- en_list = worksheet.col_values(2, 1)
|
|
|
+ ar_list = worksheet.col_values(1, 1)
|
|
|
+ en_list = worksheet.col_values(0, 1)
|
|
|
lang_key_qs = LangKeyModel.objects.filter(type__in=(1, 3, 5, 7)).values('id', 'word_key')
|
|
|
now_time = int(time.time())
|
|
|
ar_result = []
|
|
|
err_key = []
|
|
|
for item in lang_key_qs:
|
|
|
try:
|
|
|
- ar = ar_list[en_list.index(item['word_key'])+1]
|
|
|
+ ar = ar_list[en_list.index(item['word_key'])]
|
|
|
ar_result.append(ar)
|
|
|
except ValueError:
|
|
|
err_key.append(item['word_key'])
|
|
|
continue
|
|
|
- lang_val = LangValModel.objects.filter(la__id=27, lk__id=item['id'])
|
|
|
+ lang_val = LangValModel.objects.filter(la__id=36, lk__id=item['id'])
|
|
|
if lang_val.exists():
|
|
|
lang_val.update(word_val=ar, updTime=now_time)
|
|
|
else:
|
|
|
- LangValModel.objects.create(lk_id=item['id'], la_id=27, word_val=ar, addTime=now_time, updTime=now_time)
|
|
|
+ LangValModel.objects.create(lk_id=item['id'], la_id=36, word_val=ar, addTime=now_time, updTime=now_time)
|
|
|
print(ar_result)
|
|
|
print(err_key)
|
|
|
return response.json(0)
|
peng