0

src/api/miaoguo/literacyController.js

@@ -94,7 +94,7 @@ export async function GetMiaoguoAISearch(ctx) {
                 result=JSON.parse(literacyItem[0].JSONString);
                 //console.log("3:"+moment().format("mm:ss"));
                 //查找英语词频
-                if (!stringUtils.IsChineseSentence(param.Word)){
+                if (!stringUtils.HasChinese(param.Word)){
                     param.Word=stringUtils.ReplaceAllString(param.Word,"'","ˈ");
                     let sql ="select FinallyNum from WordFrequency where Word='"+param.Word+"';";
                     //console.log(sql);
@@ -120,7 +120,7 @@ export async function GetMiaoguoAISearch(ctx) {
                         result.ENG.Book=arrTemp;
                 }
                 //单个汉字，查找是否在人教版中
-                if (stringUtils.IsChineseSentence(param.Word) && param.Word.length==1){
+                if (stringUtils.HasChinese(param.Word) && param.Word.length==1){
                     let sql = "select b.Name,u.Name as 'Name2' from HanziUnit u inner join HanziBook b on u.HanziBookID=b.ID where ((b.ID>=13 and b.ID<=24) or (b.ID>=61 and b.ID<=72)) and u.Example like '%"+param.Word+"%' order by b.Name;";
                     //console.log(sql);
                     let list=await commonModel.RunSql({},sql);
@@ -233,7 +233,7 @@ export async function GetMiaoguoAISearch(ctx) {
 
             }
             //整句中是否有中文
-            else if ((stringUtils.IsChineseSentence(param.Word)) && param.SearchType!="eng") {
+            else if ((stringUtils.HasChinese(param.Word)) && param.SearchType!="eng") {
             
                 //判断是否都是中文
                 if (stringUtils.IsChinese(param.Word)){
@@ -289,7 +289,7 @@ export async function GetMiaoguoAISearch(ctx) {
         }
 
         //判断是否有公式
-        if (stringUtils.IsChineseSentence(param.Word) && param.Word.length>=2 && param.SearchType!="zici") {
+        if (stringUtils.HasChinese(param.Word) && param.Word.length>=2 && param.SearchType!="zici") {
 
             if (param.SearchType=="latex"){
                 let sql="SELECT * FROM kylx365_db.LatexTable where Name = '"+param.Word+"';";
@@ -362,7 +362,7 @@ export async function GetMiaoguoAISearch(ctx) {
                 }
             }
         }
-
+        
         globalCache.set(cacheKey, result, config.BufferMemoryTimeHigh);
         console.log("缓存");
     }
@@ -391,6 +391,7 @@ function getWordFrequency(id){
         let num=Math.floor(id/1000)*1000;
         result={Min:num,Max:Number(num+1000)};
     }
+    
     return result;
 }
 

src/util/stringClass.js

@@ -52,7 +52,7 @@ import os from 'os';
  * @property {Function} FormatMoney - 将金额转换为格式化字符串
  * @property {Function} FormatPercentageToFigure - 将百分比转换为数字
  * @property {Function} SortArrayByStringLength - 根据字符串长度排序数组
- * @property {Function} IsChineseSentence - 判断整句是否包含中文
+ * @property {Function} HasChinese - 判断整句是否包含中文
  * @property {Function} SentenceChinesePosition - 返回句中中文的位置
  * @property {Function} IsChinese - 判断是否是中文
  * @property {Function} IsEnglish - 判断是否是英文
@@ -756,32 +756,33 @@ export const stringUtils = {
         }
         return result;
     },
-    //判断整句是否有中文
-    IsChineseSentence: (temp) => {
-        let result = false;
+    
+    //返回句中中文的位置
+    SentenceChinesePosition: (temp) => {
+        let result = -1;
         const reg = /^[\u4e00-\u9fa5]|[\uFE30-\uFFA0]+$/;   /*定义验证表达式*/
 
         if (temp) {
             temp = temp.toString();
             for (let i = 0; i < temp.length; i++) {
                 if (reg.test(temp[i])) {
-                    result = true;
+                    result = i;
                     break;
                 }
             }
         }
         return result;
     },
-    //返回句中中文的位置
-    SentenceChinesePosition: (temp) => {
-        let result = -1;
+    //判断整句是否有中文
+    HasChinese: (temp) => {
+        let result = false;
         const reg = /^[\u4e00-\u9fa5]|[\uFE30-\uFFA0]+$/;   /*定义验证表达式*/
 
         if (temp) {
             temp = temp.toString();
             for (let i = 0; i < temp.length; i++) {
                 if (reg.test(temp[i])) {
-                    result = i;
+                    result = true;
                     break;
                 }
             }
@@ -790,7 +791,7 @@ export const stringUtils = {
     },
     //判断是否是中文
     IsChinese: (temp) => {
-        const reg = /^[\u4e00-\u9fa5]|[\uFE30-\uFFA0]+$/;   /*定义验证表达式*/
+        const reg = /^[\u4e00-\u9fa5\uFE30-\uFFA0]+$/;   /*定义验证表达式*/
         return reg.test(temp);     /*进行验证*/
     },
     //判断是否是英文