作者 zhl

拆分同步项目脚本

@@ -111,7 +111,10 @@ class SyncInquiryProject extends Command @@ -111,7 +111,10 @@ class SyncInquiryProject extends Command
111 return false; 111 return false;
112 } 112 }
113 } 113 }
114 - $this->deleteExpire($date); 114 +
  115 + $ids = InquiryProject::where('date', '<', $date)->where('version', '<', InquiryProject::VERSION_SIX)->pluck('id')->toArrat();
  116 + $this->deleteExpire($ids);
  117 +
115 return true; 118 return true;
116 } 119 }
117 120
@@ -142,20 +145,26 @@ class SyncInquiryProject extends Command @@ -142,20 +145,26 @@ class SyncInquiryProject extends Command
142 $project = InquiryProject::saveProject($date,InquiryProject::VERSION_SIX, $val->id, $val->title, $val->channel['channel_id'], $domains[$val->id]); 145 $project = InquiryProject::saveProject($date,InquiryProject::VERSION_SIX, $val->id, $val->title, $val->channel['channel_id'], $domains[$val->id]);
143 $this->pushTask($project->id); 146 $this->pushTask($project->id);
144 } 147 }
145 - $this->deleteExpire($date); 148 +
  149 + $ids = InquiryProject::where('date', '<', $date)->where('version', '=', InquiryProject::VERSION_SIX)->pluck('id')->toArrat();
  150 + $this->deleteExpire($ids);
  151 +
146 return true; 152 return true;
147 } 153 }
148 154
149 155
150 /** 156 /**
151 * 删除过期数据, 非当日更新数据, 都删除, 误删第二天再重新同步更新 157 * 删除过期数据, 非当日更新数据, 都删除, 误删第二天再重新同步更新
152 - * @param $date 158 + * @param $ids
153 * @return bool 159 * @return bool
154 */ 160 */
155 - public function deleteExpire($date) 161 + public function deleteExpire($ids)
156 { 162 {
157 - $project_num = InquiryProject::where('date', '<', $date)->delete();  
158 - $this->log('删除过期项目数量:' . $project_num); 163 + if (empty($ids))
  164 + return true;
  165 + $project_num = InquiryProject::whereIn('id', $ids)->delete();
  166 + $project_route_num = InquiryProjectRoute::whereIn('project_id', $ids)->delete();
  167 + $this->log('删除过期项目数量:' . $project_num . ', 删除过期项目路由数量:' . $project_route_num);
159 return true; 168 return true;
160 } 169 }
161 170