zhaoyingbo/cherry_be
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix lesson number more than actual

Browse Source
This commit is contained in:
lijingwei 2020-02-10 09:01:18 +08:00
parent 2951a88fdf
commit 09c2791134
2 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/allFunction.py
View File

@ -19,8 +19,8 @@ def manageLogin(request):
if res['errcode'] == 200:
# 登录成功并进行查询
grade = getGrade(res['ip'], res['s'])
if grade['errcode'] == 200:
sendMail('起来搬砖啦！', '教务系统成绩信息已恢复查询，请查看', ['1144131090@qq.com','nayiyewosile@qq.com'])
#if grade['errcode'] == 200:
# sendMail('起来搬砖啦！', '教务系统成绩信息已恢复查询，请查看', ['1144131090@qq.com','nayiyewosile@qq.com'])
schedule = getSchedule(res['ip'], res['s'])
return {'errcode': '200', 'errmsg': 'ok', 'student_name':res['student_name'], 'student_id':res['student_id'], 'grade': grade, 'schedule': schedule}
else:

96
lib/crawler.py
View File

@ -69,32 +69,55 @@ def getGrade(Ip, S):
last_lesson_name = ''
last_lesson_kill = 0
for item in data['data']['GradeList']:
#如果学期改变
if last_term != item['KSXNXQ']:
#初始化所有变量
if last_term != '':
if last_lesson_kill > 0:
last_term_kill += 1
else:
last_term_dead += 1
last_term_GPA = last_term_total_c_x_g / last_term_total_credit
grade_list.append(
{
'term_time': last_term,
'term_GPA': last_term_GPA,
'term_kill': last_term_kill,
'term_dead': last_term_dead,
'term_credit': last_term_total_credit,
'term_grade': last_term_grade_list
}
)
last_term_grade_list = []
last_term_kill = 0
last_term_dead = 0
last_term_total_c_x_g = 0
last_term_total_credit = 0
last_term_GPA = 0
last_term = item['KSXNXQ']
if item['LessonInfo']['KCMC'] == last_lesson_name:
if item['YXCJ'] >= 60:
last_lesson_kill += 1
last_term_total_credit += item['XF']
grade = (item['YXCJ'] - (item['YXCJ'] % 10) - 50) // 10
grade += 0.5 if (item['YXCJ'] % 10 >= 5) else 0
last_term_total_c_x_g += item['XF'] * grade
else:
#如果学期改变
if last_term != item['KSXNXQ']:
#初始化所有变量
if last_term != '':
if last_lesson_kill > 0:
last_term_kill += 1
else:
last_term_dead += 1
last_term_GPA = last_term_total_c_x_g / last_term_total_credit
grade_list.append(
{
'term_time': last_term,
'term_GPA': last_term_GPA,
'term_kill': last_term_kill,
'term_dead': last_term_dead,
'term_credit': last_term_total_credit,
'term_grade': last_term_grade_list
}
)
last_term_grade_list = []
last_term_kill = 0
last_term_dead = 0
last_term_total_c_x_g = 0
last_term_total_credit = 0
last_term_GPA = 0
last_term = item['KSXNXQ']
else:
if last_lesson_name != '':
if last_lesson_kill > 0:
last_term_kill += 1
else:
last_term_dead += 1
last_lesson_kill = 0
if item['YXCJ'] >= 60:
last_lesson_kill += 1
last_term_total_credit += item['XF']
grade = (item['YXCJ'] - (item['YXCJ'] % 10) - 50) // 10
grade += 0.5 if (item['YXCJ'] % 10 >= 5) else 0
last_term_total_c_x_g += item['XF'] * grade
last_lesson_name = item['LessonInfo']['KCMC']
#新课程加入学期课程列表
last_term_grade_list.append(
{
'title': item['LessonInfo']['KCMC'],
@ -104,27 +127,6 @@ def getGrade(Ip, S):
'class': item['KSXZ']
}
)
if item['LessonInfo']['KCMC'] == last_lesson_name:
if item['YXCJ'] >= 60:
last_lesson_kill += 1
last_term_total_credit += item['XF']
grade = (item['YXCJ'] - (item['YXCJ'] % 10) - 50) // 10
grade += 0.5 if (item['YXCJ'] % 10 >= 5) else 0
last_term_total_c_x_g += item['XF'] * grade
else:
if last_lesson_name != '':
if last_lesson_kill > 0:
last_term_kill += 1
else:
last_term_dead += 1
last_lesson_kill = 0
if item['YXCJ'] >= 60:
last_lesson_kill += 1
last_term_total_credit += item['XF']
grade = (item['YXCJ'] - (item['YXCJ'] % 10) - 50) // 10
grade += 0.5 if (item['YXCJ'] % 10 >= 5) else 0
last_term_total_c_x_g += item['XF'] * grade
last_lesson_name = item['LessonInfo']['KCMC']
if last_lesson_kill > 0:
last_term_kill += 1
else: