合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !3124

@@ -145,7 +145,7 @@ class RemainDay extends Command
      */
      */
     public function remainDay($item,$deploy_build){
     public function remainDay($item,$deploy_build){
         //默认版本统计
         //默认版本统计
-        if($deploy_build['service_duration'] == 0){
+        if($deploy_build['service_duration'] == 0 || $deploy_build['plan'] == 0){
             return false;
             return false;
         }
         }
         //默认版本计算剩余服务时常
         //默认版本计算剩余服务时常

@@ -41,7 +41,7 @@ class ManageEntryPositionController extends BaseController
      */
      */
     public function lists()
     public function lists()
     {
     {
-        $data = $this->logic->listEntryPosition();
+        $data = $this->logic->listEntryPosition($this->map,$this->page,$this->row,$this->order);
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 

+<?php
+/**
+ * @remark :
+ * @name   :AiBlogKeywordController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/11/4 14:35
+ */
+
+namespace App\Http\Controllers\Bside\Ai;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Bside\BaseController;
+use App\Http\Logic\Bside\Ai\AiBlogKeywordLogic;
+use Illuminate\Http\Request;
+
+class AiBlogKeywordController extends BaseController
+{
+    public function __construct(Request $request)
+    {
+        parent::__construct($request);
+        $this->logic = new AiBlogKeywordLogic();
+    }
+
+    /**
+     * @remark :获取关键词详情
+     * @name   :getKeywordInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2025/11/4 14:35
+     */
+    public function getKeywordInfo()
+    {
+        $data = $this->logic->getKeywordInfo();
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :保存对应关键词
+     * @name   :saveKeyword
+     * @author :lyh
+     * @method :post
+     * @time   :2025/11/4 14:35
+     */
+    public function saveKeyword()
+    {
+        $this->request->validate([
+            'project_id'=>['required'],
+            'keywords'=>['required'],
+        ],[
+            'project_id.required' => '项目ID不能为空',
+            'keywords.required' => 'keywords不能为空',
+        ]);
+        $data = $this->logic->saveKeyword();
+        $this->response('success',Code::SUCCESS,$data);
+    }
+}

+<?php
+/**
+ * @remark :
+ * @name   :AiBlogKeywordLogic.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/11/4 14:37
+ */
+
+namespace App\Http\Logic\Bside\Ai;
+
+use App\Http\Logic\Bside\BaseLogic;
+use App\Models\Ai\AiBlogKeyword;
+
+class AiBlogKeywordLogic extends BaseLogic
+{
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->param = $this->requestAll;
+        $this->model = new AiBlogKeyword();
+    }
+
+    /**
+     * @remark :获取当前详情
+     * @name   :getKeywordInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2025/11/4 14:39
+     */
+    public function getKeywordInfo()
+    {
+        $data = $this->model->read(['project_id'=>$this->user['project_id']]);
+        return $this->success($data);
+    }
+
+    /**
+     * @remark :
+     * @name   :saveKeyword
+     * @author :lyh
+     * @method :post
+     * @time   :2025/11/4 14:52
+     */
+    public function saveKeyword()
+    {
+        $data = $this->model->read(['project_id'=>$this->user['project_id']]);
+        if($data !== false){
+            $id = $data['id'];
+            $this->model->edit($this->param,['id'=>$id]);
+        }else{
+            $this->param['project_id'] = $this->user['project_id'];
+            $id = $this->model->addReturnId($this->param);
+        }
+        return $this->success(['id'=>$id]);
+    }
+}

+<?php
+/**
+ * @remark :
+ * @name   :AiBlogKeyword.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/11/4 14:26
+ */
+
+namespace App\Models\Ai;
+
+use App\Models\Base;
+
+class AiBlogKeyword extends Base
+{
+    protected $table = 'gl_ai_blog_keyword';
+}

@@ -777,6 +777,11 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/deleteFaq', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'deleteFaq'])->name('faq_deleteFaq');
         Route::any('/deleteFaq', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'deleteFaq'])->name('faq_deleteFaq');
         Route::any('/getInfo', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'getInfo'])->name('faq_getInfo');
         Route::any('/getInfo', [\App\Http\Controllers\Bside\Setting\SettingFaqController::class,'getInfo'])->name('faq_getInfo');
     });
     });
+    //ai_blog随机关键词
+    Route::prefix('ai_blog_keyword')->group(function () {
+        Route::any('/getKeywordInfo', [\App\Http\Controllers\Bside\Ai\AiBlogKeywordController::class,'getKeywordInfo'])->name('ai_blog_keyword_getKeywordInfo');
+        Route::any('/saveKeyword', [\App\Http\Controllers\Bside\Ai\AiBlogKeywordController::class,'saveKeyword'])->name('ai_blog_keyword_saveKeyword');
+    });
 });
 });
 //无需登录验证的路由组
 //无需登录验证的路由组
 Route::group([], function () {
 Route::group([], function () {