904118851 8 сар өмнө
parent
commit
521dfc3265

+ 1 - 0
1_FILTER_FACTORY/FILTER_FACTORY.js

@@ -26,6 +26,7 @@ async function createFilterData(result,FilterConfig) {
             tg_platform_id:filter_data.tg_platform_id,
             source:filter_data.source,
             status:0,
+            material_sync_status:0
         })
         console.log("新增一条数据:",res.data.id)
     }

+ 0 - 5
2_PRODUCT_FACTORY/PRODUCT_FACTORY.js

@@ -263,11 +263,6 @@ CMD.update_filter_data = async function(FilterConfig,data) {
     let isGenre = CMD.isGenre(FilterConfig,data.genre)
     // console.log("data.genre:",data.genre,data,isGenre)
     if(isGenre){
-        try{
-            await CMD.video_product_material(data)
-        }catch(e){
-            console.log("video_product_material error:",e)
-        }
         await filter_data_controllers.updateFilterData({id:data.id},{status:1,book_id:data.book_id,book_name:data.book_name,genre:data.genre,words:data.words})
         //创建一个小程序    
         let AppConfig = await redis_help.getKeyValue("AppConfig")

+ 1 - 40
2_PRODUCT_FACTORY/dz_batch_factory.js

@@ -179,13 +179,7 @@ CMD.isGenre = function(FilterConfig,genre){
 
 CMD.update_filter_data = async function(FilterConfig,data) {
     let isGenre = CMD.isGenre(FilterConfig,data.genre)
-    // console.log("data.genre:",data.genre,data,isGenre)
     if(isGenre){
-        try{
-            CMD.video_product_material(data)
-        }catch(e){
-            console.log("video_product_material error:",e)
-        }
         await filter_data_controllers.updateFilterData({id:data.id},{status:1,book_id:data.book_id,book_name:data.book_name,genre:data.genre,words:data.words})
         //创建一个小程序    
         let AppConfig = await redis_help.getKeyValue("AppConfig")
@@ -253,44 +247,11 @@ CMD.update_filter_data = async function(FilterConfig,data) {
         }
         
     }else{
-        await filter_data_controllers.updateFilterData({id:data.id},{status:2,book_id:data.book_id,book_name:data.book_name,genre:data.genre})
+        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})
     }
 }
 
-CMD.video_product_material = async function(data){
-    let url = config.isDebug?config.debug_supdate_config.host:config.release_supdate_config.host 
-    url = url+'/sapi/video_product_material/supdate';
-    const formData = new FormData();
-    formData.append('data',JSON.stringify({
-        dy_id:data.video_id,
-        dy_url:data.video_link,
-        product_id:data.book_id,
-        product_name:data.book_name,
-        d_z_number:data.like_num,
-        collect_number:data.kepp_num,
-        comment_number: data.comment_num,
-        forward_number: data.shared_num,
-        book_platform: data.tg_platform_id,
-        title: data.title,
-        yun_fabu_time:data.publish_time
-    }))
-    return await axios.post(url, formData, {
-        headers: {
-            'Content-Type': 'multipart/form-data'
-        }
-    })
-    .then(response => {
-        if(response.data.code===10000){
-            console.log("点众批处理插入任务表成功:", response.data);
-        }else{
-            console.log("插入任务表失败:", formData);
-        }
 
-    })
-    .catch(error => {
-        console.error("插入任务表失败:", error,formData);
-    });
-}
 
 CMD.insert_product = async function(data){
     return await video_product_controllers.createProductData({

+ 1 - 40
2_PRODUCT_FACTORY/dz_factory.js

@@ -216,11 +216,6 @@ CMD.update_filter_data = async function(FilterConfig,data) {
     let isGenre = CMD.isGenre(FilterConfig,data.genre)
     // console.log("data.genre:",data.genre,data,isGenre)
     if(isGenre){
-        try{
-            CMD.video_product_material(data)
-        }catch(e){
-            console.log("video_product_material error:",e)
-        }
         await filter_data_controllers.updateFilterData({id:data.id},{status:1,book_id:data.book_id,book_name:data.book_name,genre:data.genre,words:data.words})
         //创建一个小程序    
         let AppConfig = await redis_help.getKeyValue("AppConfig")
@@ -288,44 +283,10 @@ CMD.update_filter_data = async function(FilterConfig,data) {
         }
         
     }else{
-        await filter_data_controllers.updateFilterData({id:data.id},{status:2,book_id:data.book_id,book_name:data.book_name,genre:data.genre})
+        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})
     }
 }
 
-CMD.video_product_material = async function(data){
-    let url = config.isDebug?config.debug_supdate_config.host:config.release_supdate_config.host 
-    url = url+'/sapi/video_product_material/supdate';
-    const formData = new FormData();
-    formData.append('data',JSON.stringify({
-        dy_id:data.video_id,
-        dy_url:data.video_link,
-        product_id:data.book_id,
-        product_name:data.book_name,
-        d_z_number:data.like_num,
-        collect_number:data.kepp_num,
-        comment_number: data.comment_num,
-        forward_number: data.shared_num,
-        book_platform: data.tg_platform_id,
-        title: data.title,
-        yun_fabu_time:data.publish_time
-    }))
-    return await axios.post(url, formData, {
-        headers: {
-            'Content-Type': 'multipart/form-data'
-        }
-    })
-    .then(response => {
-        if(response.data.code===10000){
-            console.log("点众插入任务表成功:", response.data);
-        }else{
-            console.log("插入任务表失败:", formData);
-        }
-
-    })
-    .catch(error => {
-        console.error("插入任务表失败:", error,formData);
-    });
-}
 
 CMD.insert_product = async function(data){
     return await video_product_controllers.createProductData({

+ 1 - 41
2_PRODUCT_FACTORY/fq_batch_factory.js

@@ -220,11 +220,6 @@ CMD.update_filter_data = async function(FilterConfig,data) {
     let isGenre = CMD.isGenre(FilterConfig,data.genre)
     // console.log("data.genre:",data.genre,data,isGenre)
     if(isGenre){
-        try{
-            await CMD.video_product_material(data)
-        }catch(e){
-            console.log("video_product_material error:",e)
-        }
         await filter_data_controllers.updateFilterData({id:data.id},{status:1,book_id:data.book_id,book_name:data.book_name,genre:data.genre,words:data.words})
         //创建一个小程序    
         let AppConfig = await redis_help.getKeyValue("AppConfig")
@@ -292,45 +287,10 @@ CMD.update_filter_data = async function(FilterConfig,data) {
         }
         
     }else{
-        await filter_data_controllers.updateFilterData({id:data.id},{status:2,book_id:data.book_id,book_name:data.book_name,genre:data.genre})
+        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})
     }
 }
 
-CMD.video_product_material = async function(data){
-    let url = config.isDebug?config.debug_supdate_config.host:config.release_supdate_config.host 
-    url = url+'/sapi/video_product_material/supdate';
-    const formData = new FormData();
-    formData.append('data',JSON.stringify({
-        dy_id:data.video_id,
-        dy_url:data.video_link,
-        product_id:data.book_id,
-        product_name:data.book_name,
-        d_z_number:data.like_num,
-        collect_number:data.kepp_num,
-        comment_number: data.comment_num,
-        forward_number: data.shared_num,
-        book_platform: data.tg_platform_id,
-        title: data.title,
-        yun_fabu_time:data.publish_time
-    }))
-    return await axios.post(url, formData, {
-        headers: {
-            'Content-Type': 'multipart/form-data'
-        }
-    })
-    .then(response => {
-        if(response.data.code===10000){
-            console.log("番茄插入任务表成功:", response.data);
-        }else{
-            console.log("插入任务表失败:", formData);
-        }
-
-    })
-    .catch(error => {
-        console.error("插入任务表失败:", error,formData);
-    });
-}
-
 CMD.insert_product = async function(data){
     return await video_product_controllers.createProductData({
         book_platform:data.tg_platform_id,

+ 1 - 40
2_PRODUCT_FACTORY/fq_factory.js

@@ -191,11 +191,6 @@ CMD.update_filter_data = async function(FilterConfig,data) {
     let isGenre = CMD.isGenre(FilterConfig,data.genre)
     // console.log("data.genre:",data.genre,data,isGenre)
     if(isGenre){
-        try{
-            await CMD.video_product_material(data)
-        }catch(e){
-            console.log("video_product_material error:",e)
-        }
         await filter_data_controllers.updateFilterData({id:data.id},{status:1,book_id:data.book_id,book_name:data.book_name,genre:data.genre,words:data.words})
         //创建一个小程序    
         let AppConfig = await redis_help.getKeyValue("AppConfig")
@@ -263,44 +258,10 @@ CMD.update_filter_data = async function(FilterConfig,data) {
         }
         
     }else{
-        await filter_data_controllers.updateFilterData({id:data.id},{status:2,book_id:data.book_id,book_name:data.book_name,genre:data.genre})
+        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})
     }
 }
 
-CMD.video_product_material = async function(data){
-    let url = config.isDebug?config.debug_supdate_config.host:config.release_supdate_config.host 
-    url = url+'/sapi/video_product_material/supdate';
-    const formData = new FormData();
-    formData.append('data',JSON.stringify({
-        dy_id:data.video_id,
-        dy_url:data.video_link,
-        product_id:data.book_id,
-        product_name:data.book_name,
-        d_z_number:data.like_num,
-        collect_number:data.kepp_num,
-        comment_number: data.comment_num,
-        forward_number: data.shared_num,
-        book_platform: data.tg_platform_id,
-        title: data.title,
-        yun_fabu_time:data.publish_time
-    }))
-    return await axios.post(url, formData, {
-        headers: {
-            'Content-Type': 'multipart/form-data'
-        }
-    })
-    .then(response => {
-        if(response.data.code===10000){
-            console.log("番茄插入任务表成功:", response.data);
-        }else{
-            console.log("插入任务表失败:", formData);
-        }
-
-    })
-    .catch(error => {
-        console.error("插入任务表失败:", error,formData);
-    });
-}
 
 CMD.insert_product = async function(data){
     return await video_product_controllers.createProductData({

+ 6 - 40
2_PRODUCT_FACTORY/hy_batch_factory.js

@@ -27,6 +27,7 @@ async function findSameFilterData(product_list,FilterConfig) {
                 
             }else{
                 let Ids = []
+                let notNeedMaterial = []
                 for (let j = 0; j < result.data.length; j++) {
                     let info  = result.data[j]
                     info.words = product_item.words
@@ -36,10 +37,12 @@ async function findSameFilterData(product_list,FilterConfig) {
 
                     let isGenre = CMD.isGenre(FilterConfig,info.genre)
                     if(isGenre){
-                        CMD.video_product_material(info)
+                        Ids.push(info.id)
+                    }else{
+                        notNeedMaterial.push(info.id)
                     }
-                    Ids.push(info.id)
                 }
+                await filter_data_controllers.updateFilterDataByIds({ids:notNeedMaterial},{status:1,material_sync_status:2})
                 await filter_data_controllers.updateFilterDataByIds({ids:Ids},{status:1})
                 await new Promise(resolve => setTimeout(resolve,100));
             }
@@ -211,9 +214,7 @@ CMD.update_filter_data = async function(FilterConfig,data) {
     // console.log("data.genre:",data.genre,data,isGenre)
     if(isGenre){
         try{
-            CMD.video_product_material(data)
         }catch(e){
-            console.log("video_product_material error:",e)
         }
         await filter_data_controllers.updateFilterData({id:data.id},{status:1,book_id:data.book_id,book_name:data.book_name,genre:data.genre,words:data.words})
         //创建一个小程序    
@@ -282,45 +283,10 @@ CMD.update_filter_data = async function(FilterConfig,data) {
         }
         
     }else{
-        await filter_data_controllers.updateFilterData({id:data.id},{status:2,book_id:data.book_id,book_name:data.book_name,genre:data.genre})
+        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})
     }
 }
 
-CMD.video_product_material = async function(data){
-    let url = config.isDebug?config.debug_supdate_config.host:config.release_supdate_config.host 
-    url = url+'/sapi/video_product_material/supdate';
-    const formData = new FormData();
-    formData.append('data',JSON.stringify({
-        dy_id:data.video_id,
-        dy_url:data.video_link,
-        product_id:data.book_id,
-        product_name:data.book_name,
-        d_z_number:data.like_num,
-        collect_number:data.kepp_num,
-        comment_number: data.comment_num,
-        forward_number: data.shared_num,
-        book_platform: data.tg_platform_id,
-        title: data.title,
-        yun_fabu_time:data.publish_time
-    }))
-    axios.post(url, formData, {
-        headers: {
-            'Content-Type': 'multipart/form-data'
-        }
-    })
-    .then(response => {
-        if(response.data.code===10000){
-            console.log("黑岩批处理插入任务表成功:", response.data);
-        }else{
-            console.log("插入任务表失败:", formData);
-        }
-
-    })
-    .catch(error => {
-        console.error("插入任务表失败:", error,formData);
-    });
-}
-
 CMD.insert_product = async function(data){
     return await video_product_controllers.createProductData({
         book_platform:data.tg_platform_id,

+ 1 - 40
2_PRODUCT_FACTORY/hy_factory.js

@@ -145,11 +145,6 @@ CMD.update_filter_data = async function(FilterConfig,data) {
     let isGenre = CMD.isGenre(FilterConfig,data.genre)
     // console.log("data.genre:",data.genre,data,isGenre)
     if(isGenre){
-        try{
-            await CMD.video_product_material(data)
-        }catch(e){
-            console.log("video_product_material error:",e)
-        }
         await filter_data_controllers.updateFilterData({id:data.id},{status:1,book_id:data.book_id,book_name:data.book_name,genre:data.genre,words:data.words})
         //创建一个小程序    
         let AppConfig = await redis_help.getKeyValue("AppConfig")
@@ -217,44 +212,10 @@ CMD.update_filter_data = async function(FilterConfig,data) {
         }
         
     }else{
-        await filter_data_controllers.updateFilterData({id:data.id},{status:2,book_id:data.book_id,book_name:data.book_name,genre:data.genre})
+        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})
     }
 }
 
-CMD.video_product_material = async function(data){
-    let url = config.isDebug?config.debug_supdate_config.host:config.release_supdate_config.host 
-    url = url+'/sapi/video_product_material/supdate';
-    const formData = new FormData();
-    formData.append('data',JSON.stringify({
-        dy_id:data.video_id,
-        dy_url:data.video_link,
-        product_id:data.book_id,
-        product_name:data.book_name,
-        d_z_number:data.like_num,
-        collect_number:data.kepp_num,
-        comment_number: data.comment_num,
-        forward_number: data.shared_num,
-        book_platform: data.tg_platform_id,
-        title: data.title,
-        yun_fabu_time:data.publish_time
-    }))
-    return await axios.post(url, formData, {
-        headers: {
-            'Content-Type': 'multipart/form-data'
-        }
-    })
-    .then(response => {
-        if(response.data.code===10000){
-            console.log("黑岩插入任务表成功:", response.data);
-        }else{
-            console.log("插入任务表失败:", formData);
-        }
-
-    })
-    .catch(error => {
-        console.error("插入任务表失败:", error,formData);
-    });
-}
 
 CMD.insert_product = async function(data){
     return await video_product_controllers.createProductData({

+ 1 - 40
2_PRODUCT_FACTORY/qm_batch_factory.js

@@ -189,11 +189,6 @@ CMD.update_filter_data = async function(FilterConfig,data) {
     let isGenre = CMD.isGenre(FilterConfig,data.genre)
     // console.log("data.genre:",data.genre,data,isGenre)
     if(isGenre){
-        try{
-            await CMD.video_product_material(data)
-        }catch(e){
-            console.log("video_product_material error:",e)
-        }
         await filter_data_controllers.updateFilterData({id:data.id},{status:1,book_id:data.book_id,book_name:data.book_name,genre:data.genre,words:data.words})
         //创建一个小程序    
         let AppConfig = await redis_help.getKeyValue("AppConfig")
@@ -261,44 +256,10 @@ CMD.update_filter_data = async function(FilterConfig,data) {
         }
         
     }else{
-        await filter_data_controllers.updateFilterData({id:data.id},{status:2,book_id:data.book_id,book_name:data.book_name,genre:data.genre})
+        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})
     }
 }
 
-CMD.video_product_material = async function(data){
-    let url = config.isDebug?config.debug_supdate_config.host:config.release_supdate_config.host 
-    url = url+'/sapi/video_product_material/supdate';
-    const formData = new FormData();
-    formData.append('data',JSON.stringify({
-        dy_id:data.video_id,
-        dy_url:data.video_link,
-        product_id:data.book_id,
-        product_name:data.book_name,
-        d_z_number:data.like_num,
-        collect_number:data.kepp_num,
-        comment_number: data.comment_num,
-        forward_number: data.shared_num,
-        book_platform: data.tg_platform_id,
-        title: data.title,
-        yun_fabu_time:data.publish_time
-    }))
-    return await axios.post(url, formData, {
-        headers: {
-            'Content-Type': 'multipart/form-data'
-        }
-    })
-    .then(response => {
-        if(response.data.code===10000){
-            console.log("七猫批处理插入任务表成功:", response.data);
-        }else{
-            console.log("插入任务表失败:", formData);
-        }
-
-    })
-    .catch(error => {
-        console.error("插入任务表失败:", error,formData);
-    });
-}
 
 CMD.insert_product = async function(data){
     return await video_product_controllers.createProductData({

+ 1 - 40
2_PRODUCT_FACTORY/qm_factory.js

@@ -153,11 +153,6 @@ CMD.update_filter_data = async function(FilterConfig,data) {
     let isGenre = CMD.isGenre(FilterConfig,data.genre)
     // console.log("data.genre:",data.genre,data,isGenre)
     if(isGenre){
-        try{
-            await CMD.video_product_material(data)
-        }catch(e){
-            console.log("video_product_material error:",e)
-        }
         await filter_data_controllers.updateFilterData({id:data.id},{status:1,book_id:data.book_id,book_name:data.book_name,genre:data.genre,words:data.words})
         //创建一个小程序    
         let AppConfig = await redis_help.getKeyValue("AppConfig")
@@ -225,44 +220,10 @@ CMD.update_filter_data = async function(FilterConfig,data) {
         }
         
     }else{
-        await filter_data_controllers.updateFilterData({id:data.id},{status:2,book_id:data.book_id,book_name:data.book_name,genre:data.genre})
+        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})
     }
 }
 
-CMD.video_product_material = async function(data){
-    let url = config.isDebug?config.debug_supdate_config.host:config.release_supdate_config.host 
-    url = url+'/sapi/video_product_material/supdate';
-    const formData = new FormData();
-    formData.append('data',JSON.stringify({
-        dy_id:data.video_id,
-        dy_url:data.video_link,
-        product_id:data.book_id,
-        product_name:data.book_name,
-        d_z_number:data.like_num,
-        collect_number:data.kepp_num,
-        comment_number: data.comment_num,
-        forward_number: data.shared_num,
-        book_platform: data.tg_platform_id,
-        title: data.title,
-        yun_fabu_time:data.publish_time
-    }))
-    return await axios.post(url, formData, {
-        headers: {
-            'Content-Type': 'multipart/form-data'
-        }
-    })
-    .then(response => {
-        if(response.data.code===10000){
-            console.log("七猫插入任务表成功:", response.data);
-        }else{
-            console.log("插入任务表失败:", formData);
-        }
-
-    })
-    .catch(error => {
-        console.error("插入任务表失败:", error,formData);
-    });
-}
 
 CMD.insert_product = async function(data){
     return await video_product_controllers.createProductData({

BIN
dump.rdb