0

src/api/yjbdc/yjbdcController.js

@@ -1300,7 +1300,13 @@ export async function GetWordChinese(ctx) {
         // 根据不同Level筛选结果
         if (level >= 0 && level <= 2) {
             // Level 0-2，返回数组单词第一条
-            selectedResult = result[0];
+            const filtered = result.filter(item => item.BookID >= 151);
+            if (filtered.length > 0) {
+                selectedResult = filtered[0];
+            } else {
+                // 如果没有符合条件的，返回BookID较小的第一条
+                selectedResult = result[0];
+            }
         } else if (level === 3) {
             // Level 3，优选返回BookID >= 169的
             const filtered = result.filter(item => item.BookID >= 169);

src/model/yjbdc.js

@@ -154,7 +154,7 @@ class YJBDC {
     static async GetWordChinese(obj) {
         try {
             // 直接在数据库层面过滤出特定单词，获取包含BookID的数据
-            const sql = "SELECT Word, Translate, BookID FROM kylx365_db.Words w WHERE w.Word = ? AND ((w.BookID>=151 AND w.BookID<=153) OR (w.BookID>=169 AND w.BookID<=183)) ORDER BY w.BookID;";
+            const sql = "SELECT Word, Translate, BookID FROM kylx365_db.Words w WHERE w.Word = ? AND ((w.BookID>=111 AND w.BookID<=136) OR (w.BookID>=151 AND w.BookID<=153) OR (w.BookID>=169 AND w.BookID<=183)) ORDER BY w.BookID;";
             return await query(sql, [obj.Word]);
         } catch (error) {
             console.error('获取单词信息失败:', error);

src/test/build.test.js

@@ -1,55 +1,35 @@
 import commonModel from '../model/commonModel.js';
 import fs from 'fs';
+import { stringUtils } from '../util/stringClass.js';
 
 async function runScript(){
     try {
-        //const sql2="update kylx365_db.HanziWord set HanziUnitID=0 where Name='"+item[j]+"'";
-        //await commonModel.RunSql(null,sql2
-        console.log("SET SQL_SAFE_UPDATES = 0;");
-        var data = fs.readFileSync('data.txt', 'utf8');
-        let arr=data.split(");")
-        var districtID=14;
-        var start=0;
-        var end=arr.length;
-        for(var i=start;i<end;i++){
-            var item=arr[i].split(",");
-            if (item[0]){
-                var item2=item[1];
-                item[0]=item[0].replace("(","");
-                item[0]=item[0].replace("\n","");
-                item[0]=item[0].replace("\r","");
-                for(let j=2;j<7;j++){
-                    if (!item[j])
-                        item[j]=null
+        
+        const sql="SELECT * FROM kylx365_db.Words;"
+        let list = await commonModel.RunSql(null,sql);
+        for(let i=0;i<list.length;i++){
+            let item=list[i];
+            //console.log(i+'/'+list.length);
+            //console.log(item.Translate);
+
+            if (item.Translate){
+                //let output=removeDuplicateDefinitions(item.Translate);
+                let output=item.Translate;
+                if (output.lastIndexOf("，")==output.length-1)
+                    output=output.substring(0,output.length-1);
+                //console.log(output);
+                if (output && item.Translate!=output){
+                    //console.log("input:"+item.Translate);
+                    //console.log("output:"+output);
+                    console.log("update Words set Translate='"+output+"' where ID="+item.ID+";");
+                    let sql="update Words set Translate='"+output+"' where ID="+item.ID+";";
+                    await commonModel.RunSql(null,sql);
                 }
-                
-                var sql="update MPS_Score set ScoreTotal="+item2+",Score1="+item[2]+",Score2="+item[3]+",Score3="+item[4]+",Score4="+item[5]+" where SchoolFullName="+item[0]+" and DistrictID="+districtID+" and ScoreYear=2025 and ScoreType='1-15志愿';";
-                console.log(sql);
             }
         }
         
-
-        // const sql="SELECT * FROM kylx365_db.HanziUnit where HanziBookID>=61 and HanziBookID<=72 order by HanziBookID,OrderID,ID;"
-        // let list = await commonModel.RunSql(null,sql
-        // for(let i=0;i<list.length;i++){
-        //     let item=list[i].Example;
-        //     for(let j=0;j<item.length;j++){
-        //         const sql3="SELECT * FROM kylx365_db.HanziWord where Name='"+item[j]+"' and HanziUnitID<500 order by HanziUnitID,ID limit 1;";
-        //         let list2=await commonModel.RunSql(null,sql3
-        //         for(let k=0;k<list2.length;k++){
-        //             const sql4="update kylx365_db.HanziWord set HanziUnitID="+list[i].ID+" where ID="+list2[k].ID+";";
-        //             console.log(sql4
-        //             await commonModel.RunSql(null,sql4
-        //         }
-        //     }
-            
-        //     //console.log(json
-        //     //console.log(item.length
-        // }
-        // const sql2="update kylx365_db.HanziWord set HanziUnitID=0 where HanziUnitID<500";
-        // await commonModel.RunSql(null,sql2);
         
-        //console.log("完成");
+        console.log("完成");
     } catch (error) {
         console.error('Error executing script:', error);
     }
@@ -95,3 +75,51 @@ async function runScript(){
 runScript().catch(error => {
     console.error('Error in runScript:', error);
 });
+
+function removeDuplicateDefinitions(input) {
+    // 分割词性和释义
+    const segments = input.split(/([a-z]+\.)/).filter(Boolean);
+    const definitions = {};
+    let currentType = null;
+    let originalOrder = [];
+
+    // 解析词性和释义
+    for (let i = 0; i < segments.length; i++) {
+        const segment = segments[i].trim();
+        if (segment.match(/^[a-z]+\.$/)) {
+            // 这是词性标记
+            currentType = segment;
+            if (!definitions[currentType]) {
+                definitions[currentType] = [];
+                originalOrder.push(currentType);
+            }
+        } else if (currentType) {
+            // 这是释义内容
+            const meanings = segment.split(/\s+/).filter(Boolean);
+            definitions[currentType].push(...meanings);
+        }
+    }
+
+    // 去重处理
+    const result = [];
+    for (const type of originalOrder) {
+        if (definitions[type]) {
+            // 使用Set去重并保留原始顺序
+            const uniqueMeanings = [];
+            const seen = new Set();
+            for (const meaning of definitions[type]) {
+                if (!seen.has(meaning)) {
+                    seen.add(meaning);
+                    uniqueMeanings.push(meaning);
+                }
+            }
+            result.push(`${type}${uniqueMeanings.join(' ')}`);
+        }
+    }
+
+    return result.join(' ');
+}
+
+
+//console.log(removeDuplicateDefinitions("adj.十分喜悦的 快乐的 adj.十分喜悦的 快乐的")); 
+//console.log(removeDuplicateDefinitions("vi.起立 升起 上涨 起身n.上升 增加 小山 斜坡 vi.起立 升起 上涨 起身n.上升 增加 小山 斜坡")); 

src/util/stringClass.js

@@ -777,6 +777,17 @@ export const stringUtils = {
         // 处理过去式/过去分词 (-ed)
         if (lowerWord.endsWith('ed')) {
             possibleBaseWords.push(lowerWord.slice(0, -2)); // 常规情况 (walked -> walk)
+            
+            // 处理双辅音+ed的情况 (stepped -> step, hummed -> hum)
+            const doubleConsonantPattern = /([bcdfghjklmnpqrstvwxyz])\1ed$/;
+            if (doubleConsonantPattern.test(lowerWord)) {
+                possibleBaseWords.push(lowerWord.slice(0, -3)); // 如 stepped -> step
+            }
+            
+            // 处理以辅音+e结尾的动词变为ed的情况
+            if (/[bcdfghjklmnpqrstvwxyz]ed$/.test(lowerWord)) {
+                possibleBaseWords.push(lowerWord.slice(0, -2) + 'e'); // 如 liked -> like
+            }
         }
         
         // 处理以e结尾的动词加d的情况
@@ -787,20 +798,55 @@ export const stringUtils = {
         // 处理以辅音+y结尾变为ied的情况
         if (lowerWord.endsWith('ied')) {
             possibleBaseWords.push(lowerWord.slice(0, -3) + 'y'); // 如 tried -> try
+            // 处理一些不是由y变形而来的ied结尾单词
+            possibleBaseWords.push(lowerWord.slice(0, -1)); // 如 applied -> apply (虽然这个例子不准确，但为了覆盖更多情况)
         }
         
         // 处理现在分词 (-ing)
         if (lowerWord.endsWith('ing')) {
             possibleBaseWords.push(lowerWord.slice(0, -3)); // 常规情况 (walking -> walk)
             possibleBaseWords.push(lowerWord.slice(0, -3) + 'e'); // 以e结尾的动词 (making -> make)
+            
+            // 处理双辅音+ing的情况 (running -> run, swimming -> swim)
+            const doubleConsonantPattern = /([bcdfghjklmnpqrstvwxyz])\1ing$/;
+            if (doubleConsonantPattern.test(lowerWord)) {
+                possibleBaseWords.push(lowerWord.slice(0, -4)); // 如 running -> run
+            }
+            
+            // 处理特殊的ing形式
+            if (lowerWord.endsWith('ying')) {
+                possibleBaseWords.push(lowerWord.slice(0, -4) + 'ie'); // 如 lying -> lie
+            }
         }
         
         // 处理比较级/最高级
         if (lowerWord.endsWith('er')) {
             possibleBaseWords.push(lowerWord.slice(0, -2)); // 常规情况 (faster -> fast)
+            
+            // 处理双辅音+er的情况
+            const doubleConsonantPattern = /([bcdfghjklmnpqrstvwxyz])\1er$/;
+            if (doubleConsonantPattern.test(lowerWord)) {
+                possibleBaseWords.push(lowerWord.slice(0, -3)); // 如 bigger -> big
+            }
+            
+            // 处理以e结尾+r的情况
+            if (/[^aeiou]er$/.test(lowerWord)) {
+                possibleBaseWords.push(lowerWord.slice(0, -2) + 'e'); // 如 larger -> large
+            }
         }
         if (lowerWord.endsWith('est')) {
             possibleBaseWords.push(lowerWord.slice(0, -3)); // 常规情况 (fastest -> fast)
+            
+            // 处理双辅音+est的情况
+            const doubleConsonantPattern = /([bcdfghjklmnpqrstvwxyz])\1est$/;
+            if (doubleConsonantPattern.test(lowerWord)) {
+                possibleBaseWords.push(lowerWord.slice(0, -4)); // 如 biggest -> big
+            }
+            
+            // 处理以e结尾+st的情况
+            if (/[^aeiou]est$/.test(lowerWord)) {
+                possibleBaseWords.push(lowerWord.slice(0, -3) + 'e'); // 如 largest -> large
+            }
         }
         
         // 处理以辅音+y结尾变为ier/iest的情况
@@ -827,6 +873,17 @@ export const stringUtils = {
         }
         if (lowerWord.endsWith('es')) {
             possibleBaseWords.push(lowerWord.slice(0, -2)); // 常规情况 (boxes -> box)
+            
+            // 处理以ch, sh, ss, x, z结尾的名词复数形式
+            if (/(?:ch|sh|ss|x|z)es$/.test(lowerWord)) {
+                possibleBaseWords.push(lowerWord.slice(0, -2)); // 如 boxes -> box, dishes -> dish
+            }
+            
+            // 处理以o结尾的名词复数形式
+            if (lowerWord.endsWith('oes')) {
+                possibleBaseWords.push(lowerWord.slice(0, -2)); // 如 heroes -> hero
+                possibleBaseWords.push(lowerWord.slice(0, -1)); // 如 potatoes -> potato
+            }
         }
         
         // 处理以y结尾变为ies的情况
@@ -840,6 +897,20 @@ export const stringUtils = {
             possibleBaseWords.push(lowerWord.slice(0, -3) + 'f'); // 如 leaves -> leaf
         }
         
+        // 处理特殊的复数形式
+        if (lowerWord.endsWith('men')) {
+            possibleBaseWords.push(lowerWord.slice(0, -3) + 'man'); // 如 women -> woman, men -> man
+        }
+        if (lowerWord.endsWith('ice')) {
+            possibleBaseWords.push(lowerWord.slice(0, -3) + 'ouse'); // 如 mice -> mouse
+        }
+        if (lowerWord.endsWith('eet')) {
+            possibleBaseWords.push(lowerWord.slice(0, -3) + 'oot'); // 如 feet -> foot
+        }
+        if (lowerWord.endsWith('ildren')) {
+            possibleBaseWords.push(lowerWord.slice(0, -6) + 'ild'); // 如 children -> child
+        }
+        
         // 去重并过滤掉过短的单词
         const uniqueBaseWords = [...new Set(possibleBaseWords)].filter(w => w.length >= 2);