正在显示
1 个修改的文件
包含
28 行增加
和
12 行删除
| @@ -77,9 +77,13 @@ class ProjectVisit extends Command | @@ -77,9 +77,13 @@ class ProjectVisit extends Command | ||
| 77 | if (isset($data['count']) && $data['count'] > 0) { | 77 | if (isset($data['count']) && $data['count'] > 0) { |
| 78 | $count = $data['count']; | 78 | $count = $data['count']; |
| 79 | $max_id = $data['data'][0]['id'] ?? 0; | 79 | $max_id = $data['data'][0]['id'] ?? 0; |
| 80 | + $is_stop = 0; | ||
| 80 | 81 | ||
| 81 | $total_page = ceil($count / $page_size); | 82 | $total_page = ceil($count / $page_size); |
| 82 | for ($page = 1; $page <= $total_page; $page++) { | 83 | for ($page = 1; $page <= $total_page; $page++) { |
| 84 | + if ($is_stop) { | ||
| 85 | + break; | ||
| 86 | + } | ||
| 83 | $url_page = $api_url . '?' . http_build_query(['w' => 'visit_list', 'page' => $page, 'pagesize' => $page_size]); | 87 | $url_page = $api_url . '?' . http_build_query(['w' => 'visit_list', 'page' => $page, 'pagesize' => $page_size]); |
| 84 | $data_page = curl_c($url_page); | 88 | $data_page = curl_c($url_page); |
| 85 | if (isset($data_page['data']) && $data_page['data']) { | 89 | if (isset($data_page['data']) && $data_page['data']) { |
| @@ -104,20 +108,24 @@ class ProjectVisit extends Command | @@ -104,20 +108,24 @@ class ProjectVisit extends Command | ||
| 104 | 'updated_date' => date('Y-m-d', isset($item['c_time']) && $item['c_time'] ? strtotime($item['c_time']) : time()), | 108 | 'updated_date' => date('Y-m-d', isset($item['c_time']) && $item['c_time'] ? strtotime($item['c_time']) : time()), |
| 105 | 'original_id' => $item['id'], | 109 | 'original_id' => $item['id'], |
| 106 | ]; | 110 | ]; |
| 111 | + } else { | ||
| 112 | + $is_stop = 1; | ||
| 113 | + break; | ||
| 107 | } | 114 | } |
| 108 | } | 115 | } |
| 109 | } | 116 | } |
| 110 | - try { | ||
| 111 | - $model->insert($insert); | ||
| 112 | - } catch (\Exception $e) { | ||
| 113 | - echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ',page: ' . $page . ' error: ' . $e->getMessage() . PHP_EOL; | ||
| 114 | - continue; | 117 | + if ($insert) { |
| 118 | + try { | ||
| 119 | + $model->insert($insert); | ||
| 120 | + } catch (\Exception $e) { | ||
| 121 | + echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ',page: ' . $page . ' error: ' . $e->getMessage() . PHP_EOL; | ||
| 122 | + continue; | ||
| 123 | + } | ||
| 115 | } | 124 | } |
| 116 | } | 125 | } |
| 117 | } | 126 | } |
| 118 | if ($max_id) { | 127 | if ($max_id) { |
| 119 | $task->max_id = $max_id; | 128 | $task->max_id = $max_id; |
| 120 | - $task->save(); | ||
| 121 | } | 129 | } |
| 122 | } else { | 130 | } else { |
| 123 | return true; | 131 | return true; |
| @@ -129,9 +137,13 @@ class ProjectVisit extends Command | @@ -129,9 +137,13 @@ class ProjectVisit extends Command | ||
| 129 | if (isset($data['count']) && $data['count'] > 0) { | 137 | if (isset($data['count']) && $data['count'] > 0) { |
| 130 | $count = $data['count']; | 138 | $count = $data['count']; |
| 131 | $max_id = $data['data'][0]['id'] ?? 0; | 139 | $max_id = $data['data'][0]['id'] ?? 0; |
| 140 | + $is_stop = 0; | ||
| 132 | 141 | ||
| 133 | $total_page = ceil($count / $page_size); | 142 | $total_page = ceil($count / $page_size); |
| 134 | for ($page = 1; $page <= $total_page; $page++) { | 143 | for ($page = 1; $page <= $total_page; $page++) { |
| 144 | + if ($is_stop) { | ||
| 145 | + break; | ||
| 146 | + } | ||
| 135 | $url_page = $api_url . '?' . http_build_query(['w' => 'visit_detail_list', 'page' => $page, 'pagesize' => $page_size]); | 147 | $url_page = $api_url . '?' . http_build_query(['w' => 'visit_detail_list', 'page' => $page, 'pagesize' => $page_size]); |
| 136 | $data_page = curl_c($url_page); | 148 | $data_page = curl_c($url_page); |
| 137 | if (isset($data_page['data']) && $data_page['data']) { | 149 | if (isset($data_page['data']) && $data_page['data']) { |
| @@ -158,20 +170,24 @@ class ProjectVisit extends Command | @@ -158,20 +170,24 @@ class ProjectVisit extends Command | ||
| 158 | 'original_id' => $item['id'], | 170 | 'original_id' => $item['id'], |
| 159 | ]; | 171 | ]; |
| 160 | } | 172 | } |
| 173 | + } else { | ||
| 174 | + $is_stop = 1; | ||
| 175 | + break; | ||
| 161 | } | 176 | } |
| 162 | } | 177 | } |
| 163 | } | 178 | } |
| 164 | - try { | ||
| 165 | - $model->insert($insert); | ||
| 166 | - } catch (\Exception $e) { | ||
| 167 | - echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ',page: ' . $page . ' error: ' . $e->getMessage() . PHP_EOL; | ||
| 168 | - continue; | 179 | + if ($insert) { |
| 180 | + try { | ||
| 181 | + $model->insert($insert); | ||
| 182 | + } catch (\Exception $e) { | ||
| 183 | + echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ',page: ' . $page . ' error: ' . $e->getMessage() . PHP_EOL; | ||
| 184 | + continue; | ||
| 185 | + } | ||
| 169 | } | 186 | } |
| 170 | } | 187 | } |
| 171 | } | 188 | } |
| 172 | if ($max_id) { | 189 | if ($max_id) { |
| 173 | $task->max_id = $max_id; | 190 | $task->max_id = $max_id; |
| 174 | - $task->save(); | ||
| 175 | } | 191 | } |
| 176 | } else { | 192 | } else { |
| 177 | return true; | 193 | return true; |
-
请 注册 或 登录 后发表评论