gx

@@ -9,6 +9,7 @@
 
 namespace App\Console\Commands\TemplateLabel;
 
+use App\Models\Template\Template;
 use App\Models\Template\TemplateModule;
 use Illuminate\Console\Command;
 use App\Models\Template\TemplateLabel as TemplateLabelModel;
@@ -37,24 +38,77 @@ class TemplateLabel extends Command
      * @time   :2024/6/3 11:35
      */
     public function handle(){
-        //清除当前所有最新标签
-        $labelModel = new TemplateLabelModel();
-        //获取最近5天左侧的记录
+        //获取最近7天模版的记录
         $start_time = now()->subDays(7)->startOfDay()->toDateString();
         $end_time = now()->startOfDay()->toDateString();
-        $templateModuleModel = new TemplateModule();
-        $moduleInfo = $templateModuleModel->list(['created_at'=>['between',[$start_time,$end_time]],'type'=>1]);
-        if($moduleInfo === false){
-            return false;
+        $this->setTemplateModule($start_time,$end_time);
+        $this->setTemplate($start_time,$end_time);
+        return true;
+    }
+
+    /**
+     * @remark :公共模块
+     * @name   :setTemplate
+     * @author :lyh
+     * @method :post
+     * @time   :2024/6/3 15:56
+     */
+    public function setTemplate($start_time,$end_time){
+        $templateModel = new Template();
+        $info = $templateModel->list(['created_at'=>['between',[$start_time,$end_time]],'test_model'=>0],'id',['id']);
+        if(empty($info)){
+            return true;
         }else{
+            //清除当前所有最新标签
+            $labelModel = new TemplateLabelModel();
+            $labelModel->del(['name'=>'最新','type'=>1]);
             $data = [];
-            foreach ($moduleInfo as $k => $v){
+            foreach ($info as $k => $v){
                 $data[] = [
                     'name'=>'最新',
+                    'type'=>1,
+                    'template_id'=>$v['id'],
+                    'manager_id'=>0,
+                    'created_at'=>date('Y-m-d H:i:s'),
+                    'updated_at'=>date('Y-m-d H:i:s')
+                ];
+            }
+            //设置为最新
+            $labelModel->insert($data);
+        }
+        return true;
+    }
+
+    /**
+     * @remark :左侧模块
+     * @name   :templateModule
+     * @author :lyh
+     * @method :post
+     * @time   :2024/6/3 15:54
+     */
+    public function setTemplateModule($start_time,$end_time){
+        $templateModuleModel = new TemplateModule();
+        $moduleInfo = $templateModuleModel->list(['created_at'=>['between',[$start_time,$end_time]],'test_model'=>0],'id',['id']);
+        if(empty($moduleInfo)){
+            return true;
+        }else{
+            //清除当前所有最新标签
+            $labelModel = new TemplateLabelModel();
+            $labelModel->del(['name'=>'最新','type'=>2]);
+            $moduleData = [];
+            foreach ($moduleInfo as $k => $v){
+                $moduleData[] = [
+                    'name'=>'最新',
+                    'type'=>2,
+                    'template_id'=>$v['id'],
+                    'manager_id'=>0,
+                    'created_at'=>date('Y-m-d H:i:s'),
+                    'updated_at'=>date('Y-m-d H:i:s')
                 ];
             }
             //设置为最新
+            $labelModel->insert($moduleData);
         }
-        //清空所有的最近标签
+        return true;
     }
 }

@@ -15,6 +15,8 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
+        // 每日更新最新模块
+        $schedule->command('template_label')->dailyAt('01:00')->withoutOverlapping(1);//最新模块
         // $schedule->command('inspire')->hourly();
         $schedule->command('remain_day')->dailyAt('09:00')->withoutOverlapping(1); // 项目剩余服务时长
         $schedule->command('rank_data_task')->everyMinute()->withoutOverlapping(1); // 排名数据更新任务

@@ -24,7 +24,7 @@ use App\Models\Template\TemplateLabel;
 class BTemplateLabelController extends BaseController
 {
     /**
-     * @remark :获取左侧模版的标签
+     * @remark :获取模版的标签
      * @name   :lists
      * @author :lyh
      * @method :post

@@ -537,6 +537,11 @@ Route::middleware(['bloginauth'])->group(function () {
     Route::prefix('tutorial')->group(function () {
         Route::any('/', [\App\Http\Controllers\Bside\BCom\TutorialController::class, 'lists'])->name('tutorial_lists');
     });
+    //oa教程
+    Route::prefix('template_label')->group(function () {
+        Route::any('/save', [\App\Http\Controllers\Bside\Template\BTemplateLabelController::class, 'save'])->name('template_label_save');
+        Route::any('/del', [\App\Http\Controllers\Bside\Template\BTemplateLabelController::class, 'del'])->name('template_label_del');
+    });
 });
 //无需登录验证的路由组
 Route::group([], function () {