904118851 8 meses atrás
pai
commit
e6c4e9a8cd

+ 7 - 1
2_PRODUCT_FACTORY/collect_hy_book.js

@@ -4,7 +4,13 @@ let hy_search_book = require('../src/api/hy/hy_search_book')
 CMD.runTask = async function(data){
     // console.log("执行一个寻找黑岩任务:",data)
     let book_info = await  hy_search_book.search_id(data.book_id)
-    
+    if(book_info.rows==null||book_info.row==undefined){
+        return null
+    }
+
+    if(book_info.rows.lenght<=0){
+        return null
+    }
     let book_name = book_info.rows[0].name;
     let typeDesc = book_info.rows[0].typeDesc; //'中篇',
     let words = book_info.rows[0].words;  //多少字

+ 4 - 3
2_PRODUCT_FACTORY/dz_batch_factory.js

@@ -30,6 +30,7 @@ async function processTask(){
         if(result.success){
             let ProductIds = []
             let FilterList = []
+            let Ids = []
             if(result.data.length<=0){
                 throw '没有数据可处理!'
             }
@@ -37,6 +38,7 @@ async function processTask(){
                 let filter_item = result.data[index];
                 ProductIds.push(filter_item.book_id)
                 FilterList[filter_item.book_id] = filter_item
+                Ids.push(filter_item.id)
             }
 
             let product_list_result = await video_product_controllers.findNonExistentProductIds(ProductIds);
@@ -60,10 +62,9 @@ async function processTask(){
                         await new Promise(resolve => setTimeout(resolve,100));
                     } 
                 }
-                let Ids = []
+
                 for (let index = 0; index < product_list_result.data.nonExistentIds.length; index++) {
                     const product_id = product_list_result.data.nonExistentIds[index];
-                    Ids.push(FilterList[product_id].id)
                     task_queue.push({result:{data:FilterList[product_id]}})
                 }
                 if(Ids.length>0){
@@ -108,8 +109,8 @@ async function processCreateTask(){
                     }
                 
                 }
+                await CMD.update_filter_data(FilterConfig,result.data)
             }
-            await CMD.update_filter_data(FilterConfig,result.data)
         }
     }catch(e){
         console.log("error::",e)

+ 18 - 11
2_PRODUCT_FACTORY/hy_batch_factory.js

@@ -65,7 +65,7 @@ async function processTask(){
         if(result.success){
             let ProductIds = []
             let FilterList = []
-
+            let Ids = []
             if(result.data.length<=0){
                 throw '没有数据可处理!'
             }
@@ -73,10 +73,12 @@ async function processTask(){
                 let filter_item = result.data[index];
                 ProductIds.push(filter_item.book_id)
                 FilterList[filter_item.book_id] = filter_item
+                Ids.push(info.id)
             }
 
             let product_list_result = await video_product_controllers.findNonExistentProductIds(ProductIds);
             if(product_list_result.success){
+   
                 for (let index = 0; index < result.data.length; index++) {
                     let filter_item = result.data[index];
                     if(product_list_result.data.existingProductIds.has(filter_item.book_id)){
@@ -94,18 +96,16 @@ async function processTask(){
                         info.book_name = product_item.product_name
                         await CMD.update_filter_data(FilterConfig,info)
                         await new Promise(resolve => setTimeout(resolve,100));
-                    } 
+                    }
                 }
                 //找到相同数据的数据进行同步
                 // await findSameFilterData(product_list_result.data.existingRecords,FilterConfig)
-                let Ids = []
+
                 for (let index = 0; index < product_list_result.data.nonExistentIds.length; index++) {
                     const product_id = product_list_result.data.nonExistentIds[index];
-                    Ids.push(FilterList[product_id].id)
                     task_queue.push({result:{data:FilterList[product_id]}})
                 }
                 if(Ids.length>0){
-                    console.log("Ids:",Ids)
                     await filter_data_controllers.updateFilterDataByIds({ids:Ids},{status:1})
                 }
               
@@ -133,13 +133,20 @@ async function processCreateTask(){
                 let tg_platform_id = result.data.tg_platform_id
                 if(tg_platform_id==config.platform_heiyan){
                     let hy_book_data = await require('./collect_hy_book').runTask(result.data)
-                    if(CMD.isGenre(FilterConfig,hy_book_data.genre)){
-                        await CMD.insert_product(hy_book_data)
+                    if(hy_book_data!=null){
+                        if(CMD.isGenre(FilterConfig,hy_book_data.genre)){
+                            await CMD.insert_product(hy_book_data)
+                        }
+                        result.data.words = hy_book_data.words
+                        result.data.genre = hy_book_data.genre
+                        result.data.book_id = hy_book_data.book_id
+                        result.data.book_name = hy_book_data.book_name
+                    }else{
+                        result.data.words = 0
+                        result.data.genre = 999
+                        result.data.book_id = result.data.book_id
+                        result.data.book_name = "没有找到这本书"
                     }
-                    result.data.words = hy_book_data.words
-                    result.data.genre = hy_book_data.genre
-                    result.data.book_id = hy_book_data.book_id
-                    result.data.book_name = hy_book_data.book_name
                 }
                 await CMD.update_filter_data(FilterConfig,result.data)
             }

+ 3 - 4
2_PRODUCT_FACTORY/qm_batch_factory.js

@@ -35,7 +35,7 @@ async function processTask(){
         if(result.success){
             let ProductIds = []
             let FilterList = []
-
+            let Ids = []
             if(result.data.length<=0){
                 throw '没有数据可处理!'
             }
@@ -66,10 +66,9 @@ async function processTask(){
                         await new Promise(resolve => setTimeout(resolve,100));
                     } 
                 }
-                let Ids = []
+
                 for (let index = 0; index < product_list_result.data.nonExistentIds.length; index++) {
                     const product_id = product_list_result.data.nonExistentIds[index];
-                    Ids.push(FilterList[product_id].id)
                     task_queue.push({result:{data:FilterList[product_id]}})
                 }
                 if(Ids.length>0){
@@ -117,8 +116,8 @@ async function processCreateTask(){
                         result.data.book_name = qm_book_data.book_name
                     }
                 }
+                await CMD.update_filter_data(FilterConfig,result.data)
             }
-            await CMD.update_filter_data(FilterConfig,result.data)
         }
     }catch(e){
         console.log("error::",e)

BIN
dump.rdb


+ 0 - 1
src/api/hy/hy_search_book.js

@@ -34,7 +34,6 @@ CMD.just_do_it = async function(bookId){
     return await axios.post(url, {} , {headers:headers})
     .then(response => {
         return response.data.data
-        console.log(response.data.data); // 输出结果
     })
     .catch(error => {
         console.error('Error:', error.message); // 输出错误信息

BIN
src/api/hy/qr.gif


BIN
src/api/hy/qr_resized.gif


+ 3 - 5
tg_factory_main.js

@@ -30,19 +30,17 @@ const hy_search_book = require('./src/api/hy/hy_search_book');
 // }
 let isInit = false
 // config.isDebug
-if(true){
+if(config.isDebug){
     redis_help.connect( async (results)=>{
         if(results){
-            let data = await hy_search_book.search_id("1868479666362478594")
-            console.log("data:",data)
             isInit = true
             // main()
-    
-    
         }
     })
 }
 
+// let data = await hy_search_book.search_id("1868479666362478594")
+// console.log("data:",data)
 
         //  let response =  helper.resolveDomain("clipvideoup.s6kuwan.com")
         //  console.log("response:",response)