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

更新服务器管理



查看合并请求 !630

@@ -12,59 +12,27 @@ namespace App\Http\Controllers\Aside\Devops;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Devops\ServersLogic;
 use App\Http\Logic\Aside\Devops\ServersLogic;
-use App\Models\Devops\Servers;
 use App\Models\Devops\Servers as ServersModel;
 use App\Models\Devops\Servers as ServersModel;
 use App\Models\Devops\ServersIp;
 use App\Models\Devops\ServersIp;
 
 
 class ServersController extends BaseController
 class ServersController extends BaseController
 {
 {
     /**
     /**
-     * @remark :获取服务器列表
+     * @remark :获取服务器列表(不分页)
      * @name   :serverList
      * @name   :serverList
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2024/6/24 17:47
      * @time   :2024/6/24 17:47
      */
      */
-    public function serverList(){
-        $serversIpModel = new ServersIp();
-        $query = $serversIpModel->leftJoin('gl_servers', 'gl_servers_ip.servers_id', '=', 'gl_servers.id');
-        $query = $this->searchParam($query);
-        $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
+    public function list(){
+        if(isset($this->map['server_name']) && !empty($this->map['server_name'])){
+            $this->map['server_name'] = ['like','%'.$this->map['server_name'].'%'];
+        }
+        $serversModel = new ServersModel();
+        $lists = $serversModel->list($this->map);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
-    /**
-     * @remark :查询列表
-     * @name   :selectParam
-     * @author :lyh
-     * @method :post
-     * @time   :2024/6/25 9:33
-     */
-    public function selectParam(){
-        $select = [
-            'gl_servers_ip.id AS id',
-            'gl_servers_ip.ip AS ip',
-            'gl_servers_ip.domain AS domain',
-            'gl_servers.server_name AS server_name',
-            'gl_servers.total AS total',
-            'gl_servers.being_number AS being_number',
-        ];
-        return $select;
-    }
-
-    /**
-     * @remark :服务器名称搜索
-     * @name   :searchParam
-     * @author :lyh
-     * @method :post
-     * @time   :2024/6/25 9:28
-     */
-    public function searchParam(&$query){
-        if(isset($this->param['server_name'])){
-            $query->where('gl_servers.server_name','like','%'.$this->param['server_name'].'%');
-        }
-        return $query;
-    }
 
 
     /**
     /**
      * @remark :服务器列表
      * @remark :服务器列表

@@ -16,6 +16,25 @@ use App\Models\Devops\ServersIp as ServersIpModel;
 
 
 class ServersIpController extends BaseController
 class ServersIpController extends BaseController
 {
 {
+
+    /**
+     * @remark :获取列表（不分页）
+     * @name   :list
+     * @author :lyh
+     * @method :post
+     * @time   :2024/6/25 14:27
+     */
+    public function list(){
+        $this->request->validate([
+            'servers_id'=>'required'
+        ],[
+            'servers_id.required' => '服务器servers_id不能为空'
+        ]);
+        $serversIpModel = new ServersIpModel();
+        $data = $serversIpModel->list($this->map);
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
     /**
     /**
      * @remark :当前服务器器对应的ip列表
      * @remark :当前服务器器对应的ip列表
      * @name   :list
      * @name   :list