fix(plugins/score): 修复了「均分绩点计算器」与「成绩信息查询」失效的 bug

教务系统接口更换，导致这两个功能，现已修复。

fix #43

Author: frederick-wang

src/plugins/score/GPACalculator.vue

@@ -41,7 +41,7 @@ import { getSelectedCourses } from '@/plugins/score/utils'
 import { convertCourseScoreInfoListToScoreRecords } from '@/helper/converter'
 import * as ueip from '@/plugins/user-experience-improvement-program'
 import {
-  requestAllTermsCourseScoreInfoList,
+  requestAllPassingScores,
   requestThisTermCourseScoreInfoList
 } from '@/store/actions/request'
 import { notifyError } from '@/helper/util'
@@ -102,7 +102,7 @@ export default class GPACalculator extends Vue {
               await requestThisTermCourseScoreInfoList()
             )
           : convertCourseScoreInfoListToScoreRecords(
-              await requestAllTermsCourseScoreInfoList()
+              await requestAllPassingScores()
             )
       this.records = records
       this.loadingIsDone = true

src/store/actions/request.ts

@@ -1,5 +1,4 @@
 import {
-  AllTermScoresDTO,
   CourseScoreInfo,
   CurrentSemesterStudentAcademicInfo,
   TrainingSchemeYearInfo,
@@ -17,6 +16,8 @@ import {
 import { pipe, map } from 'ramda'
 import state from '../state'
 import {
+  APIAllPassingScoresDTO,
+  APIAllPassingScoresDTOLnCj,
   APISubitemScoreFxcjDTO,
   APISubitemScoreLookDTO,
   Result,
@@ -31,30 +32,12 @@ import {
 import { sleep, http } from '@/helper/util'
 import { getChineseNumber } from '@/helper/getter'
 import { Logger } from '@/helper/logger'
-
-function getPageHTML(url: string): Promise<string> {
-  return $.get({
-    url,
-    beforeSend: (xhr) =>
-      xhr.setRequestHeader('X-Requested-With', {
-        toString() {
-          return ''
-        }
-      } as string)
-  }) as unknown as Promise<string>
-}
-
-async function LoadHTMLToDealWithError(
-  url: string
-): Promise<{ title: string; message: string; html: string }> {
-  const html = await getPageHTML(url)
-  const title = $('title', html).text()
-  const message = $('.main-content .page-content', html)
-    .text()
-    .replace(/×/g, '')
-    .trim()
-  return { title, message, html }
-}
+import {
+  getExamTypeNameByCode,
+  getPageHTML,
+  getThisTermScoresDataURL,
+  LoadHTMLToDealWithError
+} from './utils'
 
 async function requestStudentSemesterNumberList(): Promise<string[]> {
   const url = '/student/courseSelect/calendarSemesterCurriculum/index'
@@ -488,59 +471,38 @@ function filterCourseScoreInfoList(list: CourseScoreInfo[]): CourseScoreInfo[] {
   )
 }
 
-async function requestAllTermsCourseScoreInfoList(): Promise<
-  CourseScoreInfo[]
-> {
-  const url = '/student/integratedQuery/scoreQuery/allTermScores/data'
+export async function requestAllPassingScores(): Promise<CourseScoreInfo[]> {
+  const url = '/student/integratedQuery/scoreQuery/allPassingScores/callback'
   try {
-    const {
-      list: {
-        pageContext: { totalCount }
-      }
-    } = (await $.post(url, {
-      zxjxjhh: '',
-      kch: '',
-      kcm: '',
-      pageNum: 1,
-      pageSize: 1
-    })) as AllTermScoresDTO
-
-    const {
-      list: { records }
-    } = (await $.post(
-      '/student/integratedQuery/scoreQuery/allTermScores/data',
-      {
-        zxjxjhh: '',
-        kch: '',
-        kcm: '',
-        pageNum: 1,
-        pageSize: totalCount
-      }
-    )) as AllTermScoresDTO
-    type recordType = typeof records[0]
-    const formatRecord = ([
-      executiveEducationPlanNumber,
-      courseNumber,
-      courseSequenceNumber,
+    const { lnList } = (await $.get(url)) as APIAllPassingScoresDTO
+    const records = lnList.reduce(
+      (acc, cur) => acc.concat(cur.cjList),
+      [] as APIAllPassingScoresDTOLnCj[]
+    )
+    const formatRecord = ({
+      id: {
+        executiveEducationPlanNumber,
+        courseNumber,
+        // 对，你没看错，教务系统把 course 打成 coure 了
+        coureSequenceNumber: courseSequenceNumber
+      },
       examTime,
-      inputStatusCode,
-      coursePropertyCode,
+      entryStatusCode: inputStatusCode,
+      courseAttributeCode: coursePropertyCode,
       examTypeCode,
-      inputMethodCode,
+      scoreEntryModeCode: inputMethodCode,
       courseScore,
-      levelCode,
-      // 缓考是 '00'
-      unpassedReasonCode,
+      gradeScore: levelCode,
+      notByReasonCode: unpassedReasonCode,
+      notByReasonName: unpassedReasonExplain,
       courseName,
       englishCourseName,
       credit,
-      studyHour,
-      coursePropertyName,
-      examTypeName,
-      levelName,
-      // 缓考是 '申请缓考'
-      unpassedReasonExplain
-    ]: recordType): CourseScoreInfo => ({
+      cycle: studyHour,
+      gradeName: levelName,
+      courseAttributeName: coursePropertyName,
+      gradePointScore
+    }: APIAllPassingScoresDTOLnCj): CourseScoreInfo => ({
       executiveEducationPlanNumber,
       executiveEducationPlanName: convertSemesterNumberToText(
         executiveEducationPlanNumber
@@ -556,35 +518,37 @@ async function requestAllTermsCourseScoreInfoList(): Promise<
       // levelCode 在本学期成绩信息接口里是 string，在全部成绩信息接口里却是 number
       levelCode:
         levelCode?.toString() ||
-        getLevelCodeByScore(courseScore, executiveEducationPlanNumber) ||
-        '',
+        getLevelCodeByScore(courseScore, executiveEducationPlanNumber),
       unpassedReasonCode,
       courseName,
       englishCourseName,
-      credit,
-      studyHour,
+      credit: Number(credit),
+      studyHour: Number(studyHour),
       coursePropertyName,
-      examTypeName,
+      examTypeName: getExamTypeNameByCode(examTypeCode),
       levelName:
         levelName ||
-        getLevelNameByScore(courseScore, executiveEducationPlanNumber) ||
-        '',
+        getLevelNameByScore(courseScore, executiveEducationPlanNumber),
       unpassedReasonExplain,
-      gradePoint: getPointByScore(courseScore, executiveEducationPlanNumber)
+      gradePoint:
+        gradePointScore ||
+        getPointByScore(courseScore, executiveEducationPlanNumber)
     })
 
     return pipe(map(formatRecord), filterCourseScoreInfoList)(records)
   } catch (error) {
-    const { title, message, html } = await LoadHTMLToDealWithError(url)
-    Logger.error({ title, message, html })
-    throw new Error(`${title}: ${message}`)
+    console.log(error)
+    // const { title, message, html } = await LoadHTMLToDealWithError(url)
+    // Logger.error({ title, message, html })
+    // throw new Error(`${title}: ${message}`)
+    throw new Error(error)
   }
 }
 
 async function requestThisTermCourseScoreInfoList(): Promise<
   CourseScoreInfo[]
 > {
-  const url = '/student/integratedQuery/scoreQuery/thisTermScores/data'
+  const url = await getThisTermScoresDataURL()
   try {
     const data = await $.get(url)
     const [{ list }]: TermScoresData[] = data
@@ -723,7 +687,6 @@ export async function requestAccessToken(): Promise<LoginResultData> {
 
 export {
   requestThisTermCourseScoreInfoList,
-  requestAllTermsCourseScoreInfoList,
   requestCurrentSemesterStudentAcademicInfo,
   requestTrainingSchemeList,
   requestTrainingScheme,

src/store/actions/result.interface.ts

@@ -145,3 +145,98 @@ export interface APISubitemScoreFxcjDTO {
   }
   records: SubitemScoreRecord[]
 }
+
+export interface APIAllPassingScoresDTO {
+  lnList: APIAllPassingScoresDTOLn[]
+  state: string
+  zxjxjhh: string
+}
+
+export interface APIAllPassingScoresDTOLn {
+  cjList: APIAllPassingScoresDTOLnCj[]
+  xqwtg: number
+  xqzms: number
+  xqtgms: number
+  xqzxs: number
+  xqzxf: number
+  zxf: number
+  zxs: number
+  yqzxf: number
+  yqxf: number
+  yxxf: number
+  tgms: number
+  wtgms: number
+  zms: number
+  cjlx: string
+  cjbh: string
+  fajhwkcms: number
+  kznzms: number
+  fajhnkcms: number
+  kzxdms: number
+  kzwtgms: number
+  kztgms: number
+  fajhzxf: number
+  fajhzxs: number
+  fajhzms: number
+  famc: undefined
+  zxjxjhh: string
+}
+
+export interface APIAllPassingScoresDTOLnCj {
+  id: APIAllPassingScoresDTOLnCjId
+  classNo: string
+  entryStatusCode: string
+  scoreEntryModeCode: string
+  gradePointScore?: number
+  standardScore?: number
+  percentileRankScore?: number
+  gradeScore?: number
+  planNO: string
+  courseAttributeName: string
+  courseAttributeCode: string
+  payableMoney: undefined
+  examTypeCode?: string
+  examTime: string
+  electiveTypeCode?: string
+  studyModeCode: string
+  courseScore: number
+  operator?: string
+  operatingTime?: string
+  makeupExaminationTypeCode?: string
+  notByReasonCode: undefined
+  notByReasonName: undefined
+  remark?: string
+  cycle?: string
+  courseName: string
+  englishCourseName: string
+  planName: string
+  planName2: string
+  academicYearCode: string
+  termTypeCode: string
+  termTypeName: string
+  termCode: string
+  termName: string
+  gradeName?: string
+  cj: string
+  xkcsxdm: undefined
+  xkcsxmc: undefined
+  tdkcm: undefined
+  cjlrfsdm: undefined
+  bm: undefined
+  kzlbmc: undefined
+  avgcj: undefined
+  rank: undefined
+  xkkzm: undefined
+  credit: string
+  tscore?: number
+  substituteCourseNo?: string
+}
+
+export interface APIAllPassingScoresDTOLnCjId {
+  executiveEducationPlanNumber: string
+  courseNumber: string
+  startTime: string
+  studentId: string
+  coureSequenceNumber: string
+  kch_zj: string
+}

src/store/actions/utils.ts

@@ -0,0 +1,67 @@
+import { notifyError } from '@/helper/util'
+
+export function getPageHTML(url: string): Promise<string> {
+  return $.get({
+    url,
+    beforeSend: (xhr) =>
+      xhr.setRequestHeader('X-Requested-With', {
+        toString() {
+          return ''
+        }
+      } as string)
+  }) as unknown as Promise<string>
+}
+
+export async function LoadHTMLToDealWithError(
+  url: string
+): Promise<{ title: string; message: string; html: string }> {
+  const html = await getPageHTML(url)
+  const title = $('title', html).text()
+  const message = $('.main-content .page-content', html)
+    .text()
+    .replace(/×/g, '')
+    .trim()
+  return { title, message, html }
+}
+
+export async function getAllTermScoresDataURL(): Promise<string> {
+  const referralUrl = '/student/integratedQuery/scoreQuery/allTermScores/index'
+  const referralPageHTML = await getPageHTML(referralUrl)
+  const r = /scoreQuery\/(.+?)\/allTermScores\/data/.exec(referralPageHTML)
+  if (!r) {
+    const msg = '无法获取 allTermScores 接口的完整地址。'
+    notifyError(msg, '[均分绩点计算器] 获取数据接口地址失败')
+    throw new Error(msg)
+  } else {
+    return `/student/integratedQuery/scoreQuery/${r[1]}/allTermScores/index`
+  }
+}
+
+export async function getThisTermScoresDataURL(): Promise<string> {
+  const referralUrl = '/student/integratedQuery/scoreQuery/thisTermScores/index'
+  const referralPageHTML = await getPageHTML(referralUrl)
+  const r = /scoreQuery\/(.+?)\/thisTermScores\/data/.exec(referralPageHTML)
+  if (!r) {
+    const msg = '无法获取 thisTermScores 接口的完整地址。'
+    notifyError(msg, '[成绩信息查询] 获取数据接口地址失败')
+    throw new Error(msg)
+  } else {
+    return `/student/integratedQuery/scoreQuery/${r[1]}/thisTermScores/data`
+  }
+}
+
+export function getExamTypeNameByCode(
+  examTypeCode: string | undefined
+): string | undefined {
+  if (!examTypeCode) {
+    return undefined
+  }
+  switch (examTypeCode) {
+    case '01':
+      return '考试'
+    case '02':
+      return '考查'
+    default:
+      return undefined
+  }
+}