904118851 преди 8 месеца
родител
ревизия
8ac74d9aa8
променени са 4 файла, в които са добавени 31 реда и са изтрити 10 реда
  1. 10 3
      2_PRODUCT_FACTORY/dz_batch_factory.js
  2. 11 4
      2_PRODUCT_FACTORY/fq_factory.js
  3. 10 3
      2_PRODUCT_FACTORY/qm_batch_factory.js
  4. BIN
      dump.rdb

+ 10 - 3
2_PRODUCT_FACTORY/dz_batch_factory.js

@@ -1,6 +1,7 @@
 const CMD = {}
 const video_product_controllers = require('../src/data_manager/Controllers/video_product_controllers');
 const filter_data_controllers = require('../src/data_manager/Controllers/filter_data_controllers');
+const other_book_controllers = require('../src/data_manager/Controllers/other_book_controllers');
 const video_applet_product_controllers = require('../src/data_manager/Controllers/video_applet_product_controllers');
 const redis_help = require('../src/use_redis');
 const axios = require('axios');
@@ -87,6 +88,11 @@ async function processCreateTask(){
         if(task_queue.length>0){
             let task_queue_item = task_queue.pop()
             result = task_queue_item.result
+            let other_book = await other_book_controllers.getData({product_id:task_queue_item.result.data.book_id})
+            if(other_book.success){
+                await filter_data_controllers.updateFilterData({id:result.data.id},{status:2,book_id:other_book.data.product_id,book_name:other_book.data.product_name,material_sync_status:2})
+                throw "处理了一条长篇或者筛选不要的书"
+            }
             let product = await video_product_controllers.getProductData({ book_id: task_queue_item.result.data.book_id });
             let FilterConfig = await redis_help.getKeyValue("FilterConfig")
             FilterConfig = JSON.parse(FilterConfig)
@@ -118,9 +124,9 @@ async function processCreateTask(){
         }
     }catch(e){
         console.log("error::",e)
-        if(result!=null){
-            await filter_data_controllers.updateFilterData({id:result.data.id},{status:2})
-        }
+        // if(result!=null){
+        //     await filter_data_controllers.updateFilterData({id:result.data.id},{status:2})
+        // }
         console.log("processCreateTask:",e)
     } finally{
         global.setTimeout(processCreateTask, time_count);
@@ -252,6 +258,7 @@ CMD.update_filter_data = async function(FilterConfig,data) {
         }
         
     }else{
+        await other_book_controllers.createData({product_id:data.book_id,product_name:data.book_name,tg_platform_id:data.tg_platform_id})
         await filter_data_controllers.updateFilterData({id:data.id},{status:2,book_id:data.book_id,book_name:data.book_name,genre:data.genre,material_sync_status:2})
     }
 }

+ 11 - 4
2_PRODUCT_FACTORY/fq_factory.js

@@ -3,6 +3,7 @@ const video_product_controllers = require('../src/data_manager/Controllers/video
 const filter_data_controllers = require('../src/data_manager/Controllers/filter_data_controllers');
 const get_fq_book_tab_controllers = require('../src/data_manager/Controllers/get_fq_book_tab_controllers');
 const video_applet_product_controllers = require('../src/data_manager/Controllers/video_applet_product_controllers');
+const other_book_controllers = require('../src/data_manager/Controllers/other_book_controllers');
 const redis_help = require('../src/use_redis');
 const axios = require('axios');
 const config = require('../etc/config.json');
@@ -73,11 +74,16 @@ async function processCreateTask(){
     try{
         if(task_queue.length>0){
             let task_queue_item = task_queue.pop()
+            result = task_queue_item.result
+            let other_book = await other_book_controllers.getData({product_id:task_queue_item.result.data.book_id})
+            if(other_book.success){
+                await filter_data_controllers.updateFilterData({id:result.data.id},{status:2,book_id:other_book.data.product_id,book_name:other_book.data.product_name,material_sync_status:2})
+                throw "处理了一条长篇或者筛选不要的书"
+            }
             let product = await video_product_controllers.getProductData({ book_id: task_queue_item.result.data.book_id });
             let FilterConfig = await redis_help.getKeyValue("FilterConfig")
             FilterConfig = JSON.parse(FilterConfig)
             if(!product.success){
-                result = task_queue_item.result
                 let tg_platform_id = result.data.tg_platform_id
                 if(tg_platform_id==2){
                     let client =  new HttpClient()
@@ -112,9 +118,9 @@ async function processCreateTask(){
         }
     }catch(e){
         console.log("error::",e)
-        if(result!=null){
-            await filter_data_controllers.updateFilterData({id:result.data.id},{status:2})
-        }
+        // if(result!=null){
+        //     await filter_data_controllers.updateFilterData({id:result.data.id},{status:2})
+        // }
         console.log("processCreateTask:",e)
     } finally{
         global.setTimeout(processCreateTask, time_count);
@@ -258,6 +264,7 @@ CMD.update_filter_data = async function(FilterConfig,data) {
         }
         
     }else{
+        await other_book_controllers.createData({product_id:data.book_id,product_name:data.book_name,tg_platform_id:data.tg_platform_id})
         await filter_data_controllers.updateFilterData({id:data.id},{status:2,book_id:data.book_id,book_name:data.book_name,genre:data.genre,material_sync_status:2})
     }
 }

+ 10 - 3
2_PRODUCT_FACTORY/qm_batch_factory.js

@@ -3,6 +3,7 @@ const video_product_controllers = require('../src/data_manager/Controllers/video
 const filter_data_controllers = require('../src/data_manager/Controllers/filter_data_controllers');
 const get_fq_book_tab_controllers = require('../src/data_manager/Controllers/get_fq_book_tab_controllers');
 const video_applet_product_controllers = require('../src/data_manager/Controllers/video_applet_product_controllers');
+const other_book_controllers = require('../src/data_manager/Controllers/other_book_controllers');
 const redis_help = require('../src/use_redis');
 const axios = require('axios');
 const config = require('../etc/config.json');
@@ -105,6 +106,11 @@ async function processCreateTask(){
         if(task_queue.length>0){
             let task_queue_item = task_queue.pop()
             result = task_queue_item.result
+            let other_book = await other_book_controllers.getData({product_id:task_queue_item.result.data.book_id})
+            if(other_book.success){
+                await filter_data_controllers.updateFilterData({id:result.data.id},{status:2,book_id:other_book.data.product_id,book_name:other_book.data.product_name,material_sync_status:2})
+                throw "处理了一条长篇或者筛选不要的书"
+            }
             let product = await video_product_controllers.getProductData({ book_id: task_queue_item.result.data.book_id });
             let FilterConfig = await redis_help.getKeyValue("FilterConfig")
             FilterConfig = JSON.parse(FilterConfig)
@@ -135,9 +141,9 @@ async function processCreateTask(){
         }
     }catch(e){
         console.log("error::",e)
-        if(result!=null){
-            await filter_data_controllers.updateFilterData({id:result.data.id},{status:2})
-        }
+        // if(result!=null){
+        //     await filter_data_controllers.updateFilterData({id:result.data.id},{status:2})
+        // }
         console.log("processCreateTask:",e)
     } finally{
         global.setTimeout(processCreateTask, time_count);
@@ -269,6 +275,7 @@ CMD.update_filter_data = async function(FilterConfig,data) {
         }
         
     }else{
+        await other_book_controllers.createData({product_id:data.book_id,product_name:data.book_name,tg_platform_id:data.tg_platform_id})
         await filter_data_controllers.updateFilterData({id:data.id},{status:2,book_id:data.book_id,book_name:data.book_name,genre:data.genre,material_sync_status:2})
     }
 }

BIN
dump.rdb