Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -63,18 +63,18 @@ class ProjectImport extends Command
             return true;
             return true;
         }
         }
 
 
+        $total_count = 0; //总条数
         $success_count = 0;  //成功导入条数
         $success_count = 0;  //成功导入条数
-        $count_line = count($line_of_text); //总条数
-        if ($count_line > 1) {
+        if (count($line_of_text) > 1) {
             $task->status = ImportTask::STATUS_ING;//导入中
             $task->status = ImportTask::STATUS_ING;//导入中
-            $task->total_count = $count_line - 1;
             $task->save();
             $task->save();
 
 
             //设置数据库
             //设置数据库
             $project = ProjectServer::useProject($task->project_id);
             $project = ProjectServer::useProject($task->project_id);
             if ($project) {
             if ($project) {
                 foreach ($line_of_text as $k => $v) {
                 foreach ($line_of_text as $k => $v) {
-                    if ($k > 0) {
+                    if ($k > 0 && $v) {
+                        $total_count += 1;
                         if ($task->type == ImportTask::TYPE_NEWS) {
                         if ($task->type == ImportTask::TYPE_NEWS) {
                             if ((new NewsLogic())->importNews($task->project_id, $task->user_id, $v)) {
                             if ((new NewsLogic())->importNews($task->project_id, $task->user_id, $v)) {
                                 $success_count += 1;
                                 $success_count += 1;
@@ -88,10 +88,11 @@ class ProjectImport extends Command
         }
         }
 
 
         $task->status = ImportTask::STATUS_COM;//导入完成
         $task->status = ImportTask::STATUS_COM;//导入完成
+        $task->total_count = $total_count;
         $task->success_count = $success_count;
         $task->success_count = $success_count;
         $task->save();
         $task->save();
 
 
-        echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', import end, total count: ' . ($count_line - 1) . ', success count: ' . $success_count . PHP_EOL;
+        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;
 
 
         sleep(2);
         sleep(2);
     }
     }

@@ -272,6 +272,16 @@ class NewsCategoryLogic extends BaseLogic
         return $this->success();
         return $this->success();
     }
     }
 
 
+    /**
+     * 新闻导入：分类处理
+     * @param $project_id
+     * @param $user_id
+     * @param $category
+     * @return string
+     * @throws \Exception
+     * @author Akun
+     * @date 2023/09/20 17:35
+     */
     public function importNewsCategory($project_id,$user_id,$category){
     public function importNewsCategory($project_id,$user_id,$category){
         $return = [];
         $return = [];
 
 

@@ -256,6 +256,16 @@ class NewsLogic extends BaseLogic
         return $this->success();
         return $this->success();
     }
     }
 
 
+    /**
+     * 新闻导入
+     * @param $project_id
+     * @param $user_id
+     * @param $data
+     * @return bool
+     * @throws \Exception
+     * @author Akun
+     * @date 2023/09/20 17:51
+     */
     public function importNews($project_id, $user_id, $data)
     public function importNews($project_id, $user_id, $data)
     {
     {
         $category_id = '';
         $category_id = '';
@@ -264,6 +274,31 @@ class NewsLogic extends BaseLogic
             $newsCategoryLogic = new NewsCategoryLogic();
             $newsCategoryLogic = new NewsCategoryLogic();
             $category_id = $newsCategoryLogic->importNewsCategory($project_id, $user_id, $data[2]);
             $category_id = $newsCategoryLogic->importNewsCategory($project_id, $user_id, $data[2]);
         }
         }
-        dd($category_id);
+
+        $news = $this->model->read(['name'=>$data[0]]);
+        if(!$news){
+            $id = $this->model->addReturnId(
+                [
+                    'name' => $data[0],
+                    'category_id' => $category_id,
+                    'text' => $data[4],
+                    'remark' => $data[3],
+                    'image' => '',//TODO: 远程图片下载本地
+                    'seo_title' => $data[6],
+                    'seo_keywords' => $data[7],
+                    'seo_description' => $data[8],
+                    'project_id' => $project_id,
+                    'operator_id' => $user_id,
+                    'create_id' => $user_id
+                ]
+            );
+            //更新路由
+            $route = RouteMap::setRoute($data[0], RouteMap::SOURCE_NEWS, $id, $project_id);
+            $this->edit(['url' => $route], ['id' => $id]);
+
+            return true;
+        }
+
+        return false;
     }
     }
 }
 }