0

src/api/phonics/phonicsController.js

@@ -477,11 +477,13 @@ export async function GetEnglishAll3(ctx) {
         UpdateTime: ctx.query.UpdateTime,
     };
 
+    const functionName = "GetEnglishAll3";
+
     const updateTimeList = await commonModel.GetDataUpdateStatus();
     const updateTime = moment(updateTimeList[6].UpdateTime).format('YYYY.MM.DD HH:mm:ss');
     
     if (param.UpdateTime !== updateTime) {
-        let result = globalCache.get("GetEnglishAll3");
+        let result = globalCache.get(functionName);
         if (result === 0) {
             result = {
                 UpdateTime: updateTime,
@@ -492,7 +494,7 @@ export async function GetEnglishAll3(ctx) {
                 Limit: 3000
             };
             const engList = await commonModel.RunSql({}, "SELECT * FROM WordFrequency LIMIT 3000");
-            const arrEng = [{
+            let arrEng = [{
                 ID:111,
                 Name:"高频单词1",
                 Name2:"Sight Words",
@@ -562,7 +564,7 @@ export async function GetEnglishAll3(ctx) {
                 }
             }
 
-            const result2 = JSON.stringify(arrEng);
+            let result2 = JSON.stringify(arrEng);
             arrEng = Encrypt(result2, config.urlSecrets.aes_key, config.urlSecrets.aes_iv);
             result.EngList = arrEng;
 
@@ -847,8 +849,7 @@ export async function GetEnglishAll3(ctx) {
                 Max:556,
                 Units:[],
             }];
-
-            const engList2 = await commonModel.GetWordsList();
+            const engList2 = await phonics.GetWordsList();
             const enumList = await commonModel.GetEnumerationListByParentID({ParentID:"320,346,375"});
             let unit = 0;
             for (let i = 0; i < engList2.length; i++) {
@@ -879,12 +880,6 @@ export async function GetEnglishAll3(ctx) {
                             arrEng2[j].Units.push(temp);
                         }
 
-                        // console.log("i:"+i);
-                        // console.log("j:"+j);
-                        //
-                        // if (i==27415 && j==35)
-                        //     debugger;
-
                         arrEng2[j].Units[arrEng2[j].Units.length-1].Words.push(engList2[i].Word);
                         unit = engList2[i].LessonID;
                         break;
@@ -892,7 +887,6 @@ export async function GetEnglishAll3(ctx) {
                 }
             }
 
-
             result.NewConceptEngList = [arrEng2[0], arrEng2[1], arrEng2[2], arrEng2[3]];
             const result3 = JSON.stringify(result.NewConceptEngList);
             result.NewConceptEngList = Encrypt(result3, config.urlSecrets.aes_key, config.urlSecrets.aes_iv);
@@ -933,7 +927,7 @@ export async function GetEnglishAll3(ctx) {
             const result12 = JSON.stringify(result.CET6EngList);
             result.CET6EngList = Encrypt(result12, config.urlSecrets.aes_key, config.urlSecrets.aes_iv);
 
-            globalCache.set("GetEnglishAll3", result, config.BufferMemoryTimeHigh);
+            globalCache.set(functionName, result, config.BufferMemoryTimeHigh);
             console.log("缓存");
         }
 
@@ -942,4 +936,4 @@ export async function GetEnglishAll3(ctx) {
     else {
         ctx.body = {"errcode": 10000};
     }
-}
+}

src/app.js

@@ -33,6 +33,7 @@ app.use(async (ctx, next) => {
             error: err.message,
             url: ctx.url
         };
+        console.log("error_url:"+ctx.url);
         ctx.app.emit('error', err, ctx);
     }
 });

src/model/commonModel.js

@@ -71,6 +71,93 @@ class commonModel {
             throw error;
         }
     }
+
+    static async GetEnumerationListByParentID(obj) {
+        try {
+            const sql = "select EnumID,Name from Enumeration where ParentID in (?) order by Sort,EnumID;";
+            return await query(sql,[obj.ParentID]);
+        } catch (error) {
+            console.error('获取提示信息失败:', error);
+            throw error;
+        }
+    }
+
+
+    /**
+     * 获取枚举列表
+     * @param {Object} obj 查询参数
+     * @returns {Promise<Array>} 枚举列表
+     */
+    static async GetEnumerationList(obj) {
+        try {
+            const sql = "SELECT EnumID, Name, ParentID, Description FROM Enumeration ORDER BY Sort, EnumID;";
+            return await query(sql);
+        } catch (error) {
+            console.error('获取枚举列表失败:', error);
+            throw error;
+        }
+    }
+
+    /**
+     * 根据枚举ID获取枚举信息
+     * @param {Object} obj 包含EnumID的查询参数
+     * @returns {Promise<Array>} 枚举信息
+     */
+    static async GetEnumerationListByEnumID(obj) {
+        try {
+            const sql = "SELECT * FROM Enumeration WHERE EnumID = ?;";
+            return await query(sql, [obj.EnumID]);
+        } catch (error) {
+            console.error('根据ID获取枚举信息失败:', error);
+            throw error;
+        }
+    }
+
+    /**
+     * 根据名称获取枚举信息
+     * @param {Object} obj 包含Name的查询参数
+     * @returns {Promise<Array>} 枚举信息
+     */
+    static async GetEnumerationListByName(obj) {
+        try {
+            const sql = "SELECT * FROM Enumeration WHERE Name = ?;";
+            return await query(sql, [obj.Name]);
+        } catch (error) {
+            console.error('根据名称获取枚举信息失败:', error);
+            throw error;
+        }
+    }
+
+    /**
+     * 添加渠道
+     * @param {Object} obj 渠道信息
+     * @returns {Promise<Array>} 添加结果
+     */
+    static async AddChannel(obj) {
+        try {
+            const sql = "INSERT INTO Channels SET ?";
+            return await query(sql, obj);
+        } catch (error) {
+            console.error('添加渠道失败:', error);
+            throw error;
+        }
+    }
+
+    /**
+     * 获取渠道列表
+     * @param {Object} obj 查询参数
+     * @returns {Promise<Array>} 渠道列表
+     */
+    static async GetChannelList(obj) {
+        try {
+            const sql = "SELECT * FROM Channels;";
+            return await query(sql);
+        } catch (error) {
+            console.error('获取渠道列表失败:', error);
+            throw error;
+        }
+    }
+
 }
 
 export default commonModel;

src/model/phonics.js

@@ -8849,6 +8849,16 @@ class Phonics {
         ];
         return arr;
     }
+
+    static async GetWordsList(obj) {
+        try {
+            const sql = "SELECT ID,Word,BookID,LessonID FROM kylx365_db.Words order by BookID,LessonID,Sort,ID;";
+            return await query(sql);
+        } catch (error) {
+            console.error('更新Phonics测试分数失败:', error);
+            throw error;
+        }
+    }
 }
 
 export default Phonics;