gx

@@ -51,6 +51,7 @@ class Count extends Command
                 $list = $list->toArray();
                 $list = $list->toArray();
                 $data = [];
                 $data = [];
                 $yesterday = Carbon::yesterday()->toDateString();
                 $yesterday = Carbon::yesterday()->toDateString();
+                $yesterday = '2024-03-09';
                 $domainInfo = new DomainInfo();
                 $domainInfo = new DomainInfo();
                 foreach ($list as $v){
                 foreach ($list as $v){
                     $v = (array)$v;
                     $v = (array)$v;

@@ -7,6 +7,9 @@
  */
  */
 namespace App\Services;
 namespace App\Services;
 
 
+use App\Models\Project\Project;
+use App\Models\RouteMap\RouteMap;
+
 class CreateHtmlService
 class CreateHtmlService
 {
 {
     public function __construct(){}
     public function __construct(){}
@@ -15,13 +18,17 @@ class CreateHtmlService
      * 返回最终需要的HTML
      * 返回最终需要的HTML
      * @return string
      * @return string
      */
      */
-    public function getHtml($project, $route, $lang = [], $page = 0)
+    public function getHtml($project_id, $route, $lang = [], $page = 0)
     {
     {
+        //获取项目详情
+        $projectInfo = $this->getProjectInfo($project_id);
+        if($projectInfo === false){
+            return ['code'=>400,'message'=>'当前项目不存在或者已被删除'];
+        }
         // 获取页面信息
         // 获取页面信息
         $page_info = $this->getInfoByRoute($route);
         $page_info = $this->getInfoByRoute($route);
-
         // 根据项目和路由信息返回的结果确定当前页面使用5.0还是6.0的页面；
         // 根据项目和路由信息返回的结果确定当前页面使用5.0还是6.0的页面；
-        if ($project && $page_info) {
+        if ($projectInfo && $page_info) {
             $html = $this->getHtmlV6($page_info['master_lang'], $lang = [], $page = 0);
             $html = $this->getHtmlV6($page_info['master_lang'], $lang = [], $page = 0);
         } else {
         } else {
             $html = $this->getHtmlV5();
             $html = $this->getHtmlV5();
@@ -30,6 +37,19 @@ class CreateHtmlService
     }
     }
 
 
     /**
     /**
+     * @remark :获取项目详情
+     * @name   :getProjectInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2024/3/11 9:20
+     */
+    public function getProjectInfo($project_id){
+        $projectModel = new Project();
+        $projectInfo = $projectModel->read(['id'=>$project_id,'delete_status'=>0],['id','is_upgrade']);
+        return $projectInfo;
+    }
+
+    /**
      * 返回5.0页面最终HTML
      * 返回5.0页面最终HTML
      * @return string
      * @return string
      */
      */
@@ -62,8 +82,17 @@ class CreateHtmlService
      */
      */
     public function getInfoByRoute($route)
     public function getInfoByRoute($route)
     {
     {
+        $routeMapModel = new RouteMap();
+        $routeInfo = $routeMapModel->read(['route'=>$route]);
+        if($routeInfo === false){
+            if($route == 'top-search' || $route == 'products' || $route == 'news' || $route == 'blog'){
+                $routeInfo = $route;
+            }else{
+                $routeInfo =  [];
+            }
+        }
         // TODO 获取详情需要通过路由查下路由信息， 以及数据信息， 要处理特殊几个路由： top-search、products、news、blog， 这几个如果存在就用查下的信息， 如果不存在要初始化信息
         // TODO 获取详情需要通过路由查下路由信息， 以及数据信息， 要处理特殊几个路由： top-search、products、news、blog， 这几个如果存在就用查下的信息， 如果不存在要初始化信息
-        return [];
+        return $routeInfo;
     }
     }
 
 
     /**
     /**
@@ -113,4 +142,4 @@ class CreateHtmlService
          */
          */
         return $html;
         return $html;
     }
     }
-}
+}