修改bug

src/api/miaoguo/miaoguoController.js

@@ -4229,6 +4229,22 @@ export async function GetMiaoguoTestPackage(ctx) {
     ctx.body = { errcode: 10000, result };
 }
 
+export function buildCambridgeCategoryUnits(wordList, testFunction) {
+    const units = [];
+    for (let start = 0; start < wordList.length; start += 10) {
+        const words = wordList.slice(start, start + 10).map(item => item.Word);
+        const id = units.length + 1;
+        units.push({
+            ID: id,
+            UnitName: "Lesson " + id,
+            ListStr: words.join("、"),
+            Length: words.length,
+            TestFunction: testFunction,
+        });
+    }
+    return units;
+}
+
 export async function GetMiaoguoTestUnit(ctx) {
     const param = {
         UserID: ctx.query.UserID || 0,
@@ -4360,6 +4376,18 @@ export async function GetMiaoguoTestUnit(ctx) {
                     delete unit.Words;
                 }
                 arr.push(...arrTemp);
+            } else if (["剑桥KET", "剑桥PET", "剑桥FCE"].includes(info[0].LibraryName1)) {
+                let sourceBookID = 133;
+                if (info[0].LibraryName1 == "剑桥PET")
+                    sourceBookID = 134;
+                else if (info[0].LibraryName1 == "剑桥FCE")
+                    sourceBookID = 136;
+
+                result = await hanzi.GetEnglishUnitData({
+                    BookID: sourceBookID,
+                    LessonID: info[0].BookIDOld,
+                });
+                arr.push(...buildCambridgeCategoryUnits(result, info[0].TestFunction));
             } else {
                 const param2 = { BookID: info[0].BookIDOld };
                 result = await hanzi.GetEnglishUnitData(param2);
@@ -4774,8 +4802,11 @@ export async function GetTestEnglishWords(ctx) {
             param.Type = "GET6";
 
         list = await miaoguo.GetTestEnglishWords(param);
-        param.Type = "textbook";
-        const listTextbook = await miaoguo.GetTestEnglishWords(param);
+        const listTextbook = await miaoguo.GetTestEnglishWords({
+            ...param,
+            Type: "textbook",
+            Words: list.map(item => item.Word),
+        });
         for (const item of list) {
             const json = JSON.parse(item.JSONString);
             item.Data = json.ENG;

src/model/miaoguo.js

@@ -10,6 +10,25 @@ function normalizeIdList(value) {
     return ids.length > 0 ? ids.join(',') : '0';
 }
 
+function normalizeEnglishWordList(value) {
+    const list = Array.isArray(value) ? value : String(value || '').split(',');
+    return list
+        .map(item => String(item).trim().replace(/^(["'])(.*)\1$/, '$2'))
+        .filter(Boolean);
+}
+
+export function buildTextbookWordsQuery(value) {
+    const words = normalizeEnglishWordList(value);
+    if (words.length === 0)
+        return null;
+
+    const placeholders = words.map(() => '?').join(',');
+    return {
+        sql: `Select * from Words where BookID in (151,152,153,161,162,163,164,165,166,167,168,141,142,143,144,145,146) and Word in (${placeholders}) order by Word,BookID,ID`,
+        params: words,
+    };
+}
+
 function normalizeOrderType(orderType, fallback = 'ac.UpdateTime desc') {
     const allowList = new Set([
         'ac.UpdateTime desc',
@@ -800,11 +819,17 @@ class Miaoguo {
     }
 
     static async GetTestEnglishWords(obj) {
-        let sql = "select wf.ID,wf.SentenceID,ml.JSONString from WordFrequency wf inner join MiaoguoLiteracy ml on wf.Word=ml.Word where (ml.SearchType is null or ml.SearchType='ENG') and wf.Word in(" + obj.Words + ");";
-        if (obj.Words.substr(0, 12) == "\"A\",\"B\",\"C\",")
-            sql = "select ID,Word,JSONString from MiaoguoLiteracy where Word in(" + obj.Words + ");";
-        if (obj.Type == "textbook")
-            sql = "Select * from Words where BookID in (151,152,153,161,162,163,164,165,166,167,168,141,142,143,144,145,146) and Word in (" + obj.Words + ") order by Word,BookID,ID";
+        if (obj.Type == "textbook") {
+            const textbookQuery = buildTextbookWordsQuery(obj.Words);
+            if (!textbookQuery)
+                return [];
+            return await query(textbookQuery.sql, textbookQuery.params);
+        }
+
+        const words = String(obj.Words || '');
+        let sql = "select wf.ID,wf.SentenceID,ml.JSONString from WordFrequency wf inner join MiaoguoLiteracy ml on wf.Word=ml.Word where (ml.SearchType is null or ml.SearchType='ENG') and wf.Word in(" + words + ");";
+        if (words.substr(0, 12) == "\"A\",\"B\",\"C\",")
+            sql = "select ID,Word,JSONString from MiaoguoLiteracy where Word in(" + words + ");";
         if (obj.Type == "GaoKao")
             sql = "SELECT w.ID,w.Word,w.ExampleSentence,w.Translate,l.JSONString FROM kylx365_db.Words w left join MiaoguoLiteracy l on w.WordRemark=l.Word where w.BookID=" + obj.BookID + " and w.LessonID=" + obj.LessonID + " Group By w.ID;";
         else if (obj.Type == "GET4" || obj.Type == "GET6")

test/errorRegression.test.js

@@ -4,6 +4,8 @@ import config from '../src/config/index.js';
 import { Decrypt, Encrypt, decryptUrlMiddle } from '../src/util/crypto/index.js';
 import { stringUtils } from '../src/util/stringClass.js';
 import { GetReaderBooksChapter, GetReaderBooksChapterContent } from '../src/api/yjbdc/readerController.js';
+import { buildTextbookWordsQuery } from '../src/model/miaoguo.js';
+import { buildCambridgeCategoryUnits } from '../src/api/miaoguo/miaoguoController.js';
 
 test('ReplaceAllString 将正则特殊字符按普通文本替换', () => {
     assert.equal(stringUtils.ReplaceAllString('a+b+c', '+', '___'), 'a___b___c');
@@ -73,3 +75,29 @@ test('阅读器正文接口校验章节号并正确换算回到过去变成猫
     assert.equal(validCtx.body.errcode, 10000);
     assert.ok(validCtx.body.result.length > 0);
 });
+
+test('教材释义查询不生成空的 IN 条件并参数化单词', () => {
+    assert.equal(buildTextbookWordsQuery([]), null);
+    assert.equal(buildTextbookWordsQuery(''), null);
+
+    const textbookQuery = buildTextbookWordsQuery(['abandon', "student's"]);
+    assert.deepEqual(textbookQuery.params, ['abandon', "student's"]);
+    assert.match(textbookQuery.sql, /Word in \(\?,\?\)/);
+    assert.equal(textbookQuery.sql.includes('abandon'), false);
+
+    const legacyQuery = buildTextbookWordsQuery('"ability","about"');
+    assert.deepEqual(legacyQuery.params, ['ability', 'about']);
+});
+
+test('剑桥分类词汇按每十个单词生成课程并保留尾组', () => {
+    const words = Array.from({ length: 23 }, (_, index) => ({ Word: 'word' + (index + 1) }));
+    const testFunction = [{ N: 'read' }];
+    const units = buildCambridgeCategoryUnits(words, testFunction);
+
+    assert.deepEqual(units.map(item => item.ID), [1, 2, 3]);
+    assert.deepEqual(units.map(item => item.UnitName), ['Lesson 1', 'Lesson 2', 'Lesson 3']);
+    assert.deepEqual(units.map(item => item.Length), [10, 10, 3]);
+    assert.equal(units[2].ListStr, 'word21、word22、word23');
+    assert.equal(units[0].TestFunction, testFunction);
+    assert.deepEqual(buildCambridgeCategoryUnits([], testFunction), []);
+});