904118851 před 8 měsíci
rodič
revize
8c80648d1f
1 změnil soubory, kde provedl 30 přidání a 31 odebrání
  1. 30 31
      PULL_DATA_FACTORY/PULL_DATA.js

+ 30 - 31
PULL_DATA_FACTORY/PULL_DATA.js

@@ -74,12 +74,7 @@ async function startConsumer() {
     }
 }
 
-function generate_pull_time_data(materialId_list,detail_list){
-    let list = []
-    for (let index = 0; index < materialId_list.length; index++) {
-        const materialId = materialId_list[index];
-        list.push(detail_list[materialId])
-    }
+function generate_pull_time_data(list){
     sendPullDataMQMessage(JSON.stringify({cmd:"on_recv_pull_data",data:list}))
 }
 
@@ -88,45 +83,49 @@ async function processDetailTask(task_item) {
         console.log(" start processDetailTask")
         let materialId_list = task_item.materialId_list
         let materialId_data_list = task_item.materialId_data_list
-        let response = await pullDataService.get_detail(materialId_list)
+        let response = await pullDataService.get_detail(task_item.id_list)
         if(!response.success){
             console.log("get_detail:",response)
             throw {msg:response,timeRange:cur_timeRange,fun:"get_detail",materialId_list:materialId_list}
         }
 
         if(cur_timeRange!=null){
-            cur_timeRange.finish_count+=response.data.list.length
+            cur_timeRange.finish_count+=materialId_list.length
             const today = helper.getLocalDate();
             cur_day_data.get(today)[cur_timeRange.start].finish_count = cur_timeRange.finish_count
             await manager.updateRecord(today,cur_day_data.get(today));
         }
-        let detail_list = []
         for (let index = 0; index < response.data.list.length; index++) {
             const element = response.data.list[index];
-            const info = materialId_data_list[element.materialId]
-            detail_list[element.materialId] = element
-            if(element.hasAnchorInfo){
-                await origin_data_controllers.createOriginData(
-                    {
-                        video_id:element.awemeId,
-                        materialId:element.materialId,
-                        video_link:element.awemeUrl,
-                        title:CMD.subTitle(element.title),
-                        publish_time:new Date(element.publishTime),
-                        kepp_num:info.kepp_num,
-                        comment_num:info.comment_num,
-                        like_num:info.like_num,
-                        shared_num:info.shared_num,
-                        is_guajian:1,
-                        guajian_link:element.landingUrl,
-                        status:0,
-                        createTime_new:new Date(element.createTime),
-                        updateTime_new:new Date(element.updateTime)
+            for (let j = 0; j < materialId_list.length; j++) {
+                const materialId = materialId_list[j];
+                if(element.materialId==materialId){
+                    const info = materialId_data_list[element.materialId]
+                    if(element.hasAnchorInfo){
+                        await origin_data_controllers.createOriginData(
+                            {
+                                video_id:element.awemeId,
+                                materialId:element.materialId,
+                                video_link:element.awemeUrl,
+                                title:CMD.subTitle(element.title),
+                                publish_time:new Date(element.publishTime),
+                                kepp_num:info.kepp_num,
+                                comment_num:info.comment_num,
+                                like_num:info.like_num,
+                                shared_num:info.shared_num,
+                                is_guajian:1,
+                                guajian_link:element.landingUrl,
+                                status:0,
+                                createTime_new:new Date(element.createTime),
+                                updateTime_new:new Date(element.updateTime)
+                            }
+                        )
                     }
-                )
+                    break
+                }
             }
         }
-        generate_pull_time_data(materialId_list,detail_list)
+        generate_pull_time_data(response.data.list)
         console.log(" finish processDetailTask")
     }catch (error) {
         console.error("processDetailTask:",error)
@@ -186,7 +185,7 @@ async function process_material_list(response,page) {
             }
         }
         let result = await origin_data_controllers.findNonExistentMaterialIds(materialId_list)
-        return {materialId_list:result.data.nonExistentIds,materialId_data_list:materialId_data_list,count:response.data.list.length}
+        return {id_list:materialId_list,materialId_list:result.data.nonExistentIds,materialId_data_list:materialId_data_list,count:response.data.list.length}
     }catch(e){
         console.log("materialId_list:",e)
         return null