Merge remote-tracking branch 'origin/master' into workorder

@@ -56,13 +56,40 @@ class lyhDemo extends Command
     protected $description = '更新路由';
     protected $description = '更新路由';
 
 
     public function handle(){
     public function handle(){
-        $string = '<p>Wow, the 137th Canton Fair was quite a game changer for EV Charging Pile suppliers! Seriously, it showcased some amazing growth in international participation and trade opportunities. Can you believe it? They reported a record-breaking 288,938 overseas buyers from 219 countries and regions, which is a 17.3% jump compared to the last fair. This kind of surge really highlights just how much the demand for electric vehicle infrastructure is ramping up. Industry forecasts suggest global EV sales could hit around 26 million units by 2030! And get this, export intentions at the fair climbed to a whopping $25.44 billion, marking a 3% increase. It’s clear that this fair has become a vital hub for manufacturers and suppliers in the EV Charging Pile sector, connecting them with international markets. Plus, the online platform keeps the networking going year-round, so companies can tap into new opportunities even after the fair wraps up. As everyone gears up for the 138th Canton Fair, it’s the perfect time for businesses to strategically carve out their space in the ever-growing EV charging scene.</p><img src="https://ecdn6.globalso.com/public/img/2025-05-24/9834757034_0.png" alt="Unlocking Global Opportunities at the 137th Canton Fair for Ev Charging Pile Suppliers" itemprop="image">';
-        $promote = AiCommand::where(['key' => 'ai_layout_design'])->first();
-        $promote = str_replace("{html}", $string, $promote->ai);
-        $aiCommandService = new AiCommandService();
-        $result = $aiCommandService->send_layout_design($promote);
-        dd($result);
-        return true;
+        $projectModel = new Project();
+        $lists = $projectModel->list(['delete_status' => 0,'project_type'=>0,'extend_type'=>0,'type'=>['in',[2,3,4,6]]], 'id', ['id']);
+        foreach ($lists as $item){
+            echo date('Y-m-d H:i:s') . '开始--项目的id:'. $item['id'] . PHP_EOL;
+            ProjectServer::useProject($item['id']);
+            $authorModel = new AiBlogAuthor();
+            $author_list = $authorModel->list(['id'=>['>',0]]);
+            if(empty($author_list)){
+                echo '跳过的项目id:'.$item['id'].PHP_EOL;
+                DB::disconnect('custom_mysql');
+                continue;
+            }
+            $projectAiSettingModel = new ProjectAiSetting();
+            $aiSettingInfo = $projectAiSettingModel->read(['project_id'=>$item['id']]);
+            if($aiSettingInfo === false){
+                echo '跳过的项目id:'.$item['id'].PHP_EOL;
+                DB::disconnect('custom_mysql');
+                continue;
+            }
+            $aiBlogService = new AiBlogService($item['id']);
+            foreach ($author_list as $val){
+                $aiBlogService->author_id = $val['author_id'];
+                $result = $aiBlogService->getAuthorDetail();
+                if(isset($result['status']) && $result['status'] == 200){
+                    //当前作者的页面
+                    $aiBlogAuthorModel = new AiBlogAuthor();
+                    $authorInfo = $aiBlogAuthorModel->read(['author_id'=>$val['author_id']],['id','route']);
+                    if($authorInfo !== false && !empty($result['data']['section'])){
+                        $aiBlogAuthorModel->edit(['text'=>$result['data']['section']],['author_id'=>$val['author_id']]);
+                    }
+                }
+            }
+            DB::disconnect('custom_mysql');
+        }
     }
     }
 
 
     public function _actionTemplateMain(){
     public function _actionTemplateMain(){

@@ -177,6 +177,13 @@ class IndexController extends BaseController
             'text.required' => '文本text不能为空',
             'text.required' => '文本text不能为空',
             'lang.required' => '语种不能为空',
             'lang.required' => '语种不能为空',
         ]);
         ]);
+        if($this->param['lang'] == 0){
+            $lang = Translate::translateSl($this->param['text']);
+            $this->param['lang'] = $lang['texts']['sl'] ?? '';
+        }
+        if(empty($this->param['lang'])){
+            $this->fail('未获取到语种');
+        }
         $service = new HumanizeAiTextService();
         $service = new HumanizeAiTextService();
         $data = $service->humanizer($this->param['text'],$this->param['lang']);
         $data = $service->humanizer($this->param['text'],$this->param['lang']);
         $this->response('success', Code::SUCCESS, $data);
         $this->response('success', Code::SUCCESS, $data);

@@ -139,11 +139,14 @@ class AiBlogLogic extends BaseLogic
         try {
         try {
             $aiSettingInfo = $this->getProjectAiSetting();
             $aiSettingInfo = $this->getProjectAiSetting();
             $aiBlogService = new AiBlogService();
             $aiBlogService = new AiBlogService();
+            $aiBlogTask = new AiBlogTask();
             foreach ($this->param['ids'] as $id) {
             foreach ($this->param['ids'] as $id) {
-                $info = $this->model->read(['id'=>$id],['task_id','route']);
+                $info = $this->model->read(['id'=>$id],['task_id','route','author_id']);
                 $aiBlogService->mch_id = $aiSettingInfo['mch_id'];
                 $aiBlogService->mch_id = $aiSettingInfo['mch_id'];
                 $aiBlogService->key = $aiSettingInfo['key'];
                 $aiBlogService->key = $aiSettingInfo['key'];
                 $aiBlogService->delDetail($info['task_id']);
                 $aiBlogService->delDetail($info['task_id']);
+                //重新生成作者页面
+                $aiBlogTask->addReturnId(['type'=>$aiBlogTask::TYPE_AUTHOR_ID,'task_id'=>$info['author_id'],'status'=>1,'project_id'=>$this->user['project_id']]);
                 //删除路由映射
                 //删除路由映射
                 RouteMap::delRoute(RouteMap::SOURCE_AI_BLOG, $id, $this->user['project_id']);
                 RouteMap::delRoute(RouteMap::SOURCE_AI_BLOG, $id, $this->user['project_id']);
                 $this->model->del(['id'=>$id]);
                 $this->model->del(['id'=>$id]);

@@ -25,7 +25,7 @@ class MonthCountLogic extends BaseLogic
      */
      */
     public function getCountLists($map,$order = 'created_at',$filed = ['*']){
     public function getCountLists($map,$order = 'created_at',$filed = ['*']){
         $map['project_id'] = $this->user['project_id'];
         $map['project_id'] = $this->user['project_id'];
-        $lists = $this->model->list($map,$order,$filed,'desc',12);
+        $lists = $this->model->list($map,$order,$filed,'desc');
         if(isset($this->project['is_record_china_visit']) && ($this->project['is_record_china_visit'] == 0)){
         if(isset($this->project['is_record_china_visit']) && ($this->project['is_record_china_visit'] == 0)){
             foreach ($lists as $k => $v){
             foreach ($lists as $k => $v){
                 if(empty($v['source_country'])){
                 if(empty($v['source_country'])){
@@ -55,9 +55,9 @@ class MonthCountLogic extends BaseLogic
      */
      */
     public function getIpPvCount(){
     public function getIpPvCount(){
         $count = new Count();
         $count = new Count();
-        $startTime = date("Y-m-d", strtotime("-11 months", mktime(0, 0, 0)));
+        $startTime = date("Y-m-d", strtotime("-35 months", mktime(0, 0, 0)));
         $ensTime = date('Y-m-d',time());
         $ensTime = date('Y-m-d',time());
-        $lists = $count->list(['date'=>['between',[$startTime,$ensTime]],'project_id'=>$this->user['project_id']],'id',['*'],'asc');
+        $lists = $count->list(['date'=>['<=',$ensTime],'project_id'=>$this->user['project_id']],'id',['*'],'asc');
         $groupedData = [];
         $groupedData = [];
         foreach ($lists as $v){
         foreach ($lists as $v){
             $month = date('Y-m', strtotime($v['date']));
             $month = date('Y-m', strtotime($v['date']));