正在显示
1 个修改的文件
包含
22 行增加
和
0 行删除
| @@ -6,6 +6,7 @@ use App\Http\Logic\Bside\Blog\BlogLogic; | @@ -6,6 +6,7 @@ use App\Http\Logic\Bside\Blog\BlogLogic; | ||
| 6 | use App\Http\Logic\Bside\News\NewsLogic; | 6 | use App\Http\Logic\Bside\News\NewsLogic; |
| 7 | use App\Http\Logic\Bside\Product\ProductLogic; | 7 | use App\Http\Logic\Bside\Product\ProductLogic; |
| 8 | use App\Models\Import\ImportTask; | 8 | use App\Models\Import\ImportTask; |
| 9 | +use App\Models\Mail\Mail; | ||
| 9 | use App\Services\ProjectServer; | 10 | use App\Services\ProjectServer; |
| 10 | use Illuminate\Console\Command; | 11 | use Illuminate\Console\Command; |
| 11 | use Illuminate\Support\Facades\DB; | 12 | use Illuminate\Support\Facades\DB; |
| @@ -56,6 +57,8 @@ class ProjectImport extends Command | @@ -56,6 +57,8 @@ class ProjectImport extends Command | ||
| 56 | echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', import fail, error: 文件编码格式错误' . PHP_EOL; | 57 | echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', import fail, error: 文件编码格式错误' . PHP_EOL; |
| 57 | $task->status = ImportTask::STATUS_COM;//导入完成 | 58 | $task->status = ImportTask::STATUS_COM;//导入完成 |
| 58 | $task->save(); | 59 | $task->save(); |
| 60 | + | ||
| 61 | + $this->send_mail($task->user_id, $task->created_at, 0, '文件编码格式错误,仅支持UTF-8和GBK编码格式'); | ||
| 59 | return true; | 62 | return true; |
| 60 | } elseif ($file_code_type === 'GBK') { | 63 | } elseif ($file_code_type === 'GBK') { |
| 61 | $is_gbk = 1; | 64 | $is_gbk = 1; |
| @@ -74,6 +77,8 @@ class ProjectImport extends Command | @@ -74,6 +77,8 @@ class ProjectImport extends Command | ||
| 74 | echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', import fail, error: ' . $e->getMessage() . PHP_EOL; | 77 | echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', import fail, error: ' . $e->getMessage() . PHP_EOL; |
| 75 | $task->status = ImportTask::STATUS_COM;//导入完成 | 78 | $task->status = ImportTask::STATUS_COM;//导入完成 |
| 76 | $task->save(); | 79 | $task->save(); |
| 80 | + | ||
| 81 | + $this->send_mail($task->user_id, $task->created_at, 0, '读取文件数据失败'); | ||
| 77 | return true; | 82 | return true; |
| 78 | } | 83 | } |
| 79 | 84 | ||
| @@ -125,6 +130,8 @@ class ProjectImport extends Command | @@ -125,6 +130,8 @@ class ProjectImport extends Command | ||
| 125 | $task->success_count += $success_count; | 130 | $task->success_count += $success_count; |
| 126 | $task->save(); | 131 | $task->save(); |
| 127 | 132 | ||
| 133 | + $this->send_mail($task->user_id, $task->created_at, $success_count, ''); | ||
| 134 | + | ||
| 128 | echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', import end, total count: ' . $total_count . ', success count: ' . $success_count . PHP_EOL; | 135 | echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', import end, total count: ' . $total_count . ', success count: ' . $success_count . PHP_EOL; |
| 129 | 136 | ||
| 130 | sleep(2); | 137 | sleep(2); |
| @@ -143,4 +150,19 @@ class ProjectImport extends Command | @@ -143,4 +150,19 @@ class ProjectImport extends Command | ||
| 143 | } | 150 | } |
| 144 | return false; | 151 | return false; |
| 145 | } | 152 | } |
| 153 | + | ||
| 154 | + //发生站内通知 | ||
| 155 | + protected function send_mail($user_list, $time, $success_count, $reason) | ||
| 156 | + { | ||
| 157 | + $title = '导入结果通知'; | ||
| 158 | + $content = '您于 ' . $time . ' 添加的导入任务已执行完成, 成功导入数据条数:' . $success_count . '。'; | ||
| 159 | + $reason && $content .= '原因:' . $reason; | ||
| 160 | + | ||
| 161 | + $mail_model = new Mail(); | ||
| 162 | + $mail_model->add([ | ||
| 163 | + 'user_list' => $mail_model->setUserList($user_list), | ||
| 164 | + 'title' => $title, | ||
| 165 | + 'content' => $content | ||
| 166 | + ]); | ||
| 167 | + } | ||
| 146 | } | 168 | } |
-
请 注册 或 登录 后发表评论