正在显示
4 个修改的文件
包含
48 行增加
和
65 行删除
| @@ -1174,6 +1174,30 @@ function getDeployOptimize($project_id){ | @@ -1174,6 +1174,30 @@ function getDeployOptimize($project_id){ | ||
| 1174 | return $info; | 1174 | return $info; |
| 1175 | } | 1175 | } |
| 1176 | 1176 | ||
| 1177 | + | ||
| 1178 | +/** | ||
| 1179 | + * @remark :返回分页数据 | ||
| 1180 | + * @name :paginateArray | ||
| 1181 | + * @author :lyh | ||
| 1182 | + * @method :post | ||
| 1183 | + * @time :2025/4/1 9:41 | ||
| 1184 | + */ | ||
| 1185 | +function paginateArray($array, $page = 1, $pageSize = 20) { | ||
| 1186 | + $totalItems = count($array); | ||
| 1187 | + $totalPages = ceil($totalItems / $pageSize); | ||
| 1188 | + // 确保页码有效 | ||
| 1189 | + $page = max(1, min($page, $totalPages)); | ||
| 1190 | + $offset = ($page - 1) * $pageSize; | ||
| 1191 | + $data = array_slice($array, $offset, $pageSize); | ||
| 1192 | + return [ | ||
| 1193 | + 'list' => $data, | ||
| 1194 | + 'page' => $page, | ||
| 1195 | + 'size' => $pageSize, | ||
| 1196 | + 'total_page' => $totalPages, | ||
| 1197 | + 'total' => $totalItems, | ||
| 1198 | + ]; | ||
| 1199 | +} | ||
| 1200 | + | ||
| 1177 | /** | 1201 | /** |
| 1178 | * @remark :获取域名 | 1202 | * @remark :获取域名 |
| 1179 | * @name :getDomain | 1203 | * @name :getDomain |
| @@ -1186,3 +1210,5 @@ function getDomain($url) { | @@ -1186,3 +1210,5 @@ function getDomain($url) { | ||
| 1186 | return $parsedUrl['host'] ?? $url; // 如果解析失败,返回原始 URL | 1210 | return $parsedUrl['host'] ?? $url; // 如果解析失败,返回原始 URL |
| 1187 | } | 1211 | } |
| 1188 | 1212 | ||
| 1213 | + | ||
| 1214 | + |
| @@ -65,11 +65,11 @@ class GoogleKeywordInsightController extends BaseController | @@ -65,11 +65,11 @@ class GoogleKeywordInsightController extends BaseController | ||
| 65 | $detailModel = new GoogleKeywordInsightDetail(); | 65 | $detailModel = new GoogleKeywordInsightDetail(); |
| 66 | $resultData = []; | 66 | $resultData = []; |
| 67 | if(!empty($array)){ | 67 | if(!empty($array)){ |
| 68 | - $resultData = $this->paginateArray($array,$this->page,$this->row); | 68 | + $resultData = paginateArray($array,$this->page,$this->row); |
| 69 | $detailList = $detailModel->list(['search'=>['in',$resultData['list']]]); | 69 | $detailList = $detailModel->list(['search'=>['in',$resultData['list']]]); |
| 70 | foreach ($resultData['list'] as $key => $item){ | 70 | foreach ($resultData['list'] as $key => $item){ |
| 71 | $result['keyword'] = $item; | 71 | $result['keyword'] = $item; |
| 72 | - $searchKeyword = $this->getSearchDetail($item,$detailList); | 72 | + $searchKeyword = $detailModel->getSearchDetail($item,$detailList); |
| 73 | if($searchKeyword === false){ | 73 | if($searchKeyword === false){ |
| 74 | $result['data'] = []; | 74 | $result['data'] = []; |
| 75 | }else{ | 75 | }else{ |
| @@ -101,44 +101,4 @@ class GoogleKeywordInsightController extends BaseController | @@ -101,44 +101,4 @@ class GoogleKeywordInsightController extends BaseController | ||
| 101 | $this->response('success',Code::SUCCESS,$data); | 101 | $this->response('success',Code::SUCCESS,$data); |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | - /** | ||
| 105 | - * @remark :查看当前数据是否存在数组中 | ||
| 106 | - * @name :getSearchDetail | ||
| 107 | - * @author :lyh | ||
| 108 | - * @method :post | ||
| 109 | - * @time :2025/4/1 9:56 | ||
| 110 | - */ | ||
| 111 | - public function getSearchDetail($keyword,$detailList){ | ||
| 112 | - if(!empty($detailList)){ | ||
| 113 | - foreach ($detailList as $value){ | ||
| 114 | - if($keyword == $value['search']){ | ||
| 115 | - return $value; | ||
| 116 | - } | ||
| 117 | - } | ||
| 118 | - } | ||
| 119 | - return []; | ||
| 120 | - } | ||
| 121 | - | ||
| 122 | - /** | ||
| 123 | - * @remark :返回分页数据 | ||
| 124 | - * @name :paginateArray | ||
| 125 | - * @author :lyh | ||
| 126 | - * @method :post | ||
| 127 | - * @time :2025/4/1 9:41 | ||
| 128 | - */ | ||
| 129 | - public function paginateArray($array, $page = 1, $pageSize = 20) { | ||
| 130 | - $totalItems = count($array); | ||
| 131 | - $totalPages = ceil($totalItems / $pageSize); | ||
| 132 | - // 确保页码有效 | ||
| 133 | - $page = max(1, min($page, $totalPages)); | ||
| 134 | - $offset = ($page - 1) * $pageSize; | ||
| 135 | - $data = array_slice($array, $offset, $pageSize); | ||
| 136 | - return [ | ||
| 137 | - 'list' => $data, | ||
| 138 | - 'page' => $page, | ||
| 139 | - 'size' => $pageSize, | ||
| 140 | - 'total_page' => $totalPages, | ||
| 141 | - 'total' => $totalItems, | ||
| 142 | - ]; | ||
| 143 | - } | ||
| 144 | } | 104 | } |
| @@ -29,31 +29,10 @@ class GoogleLinkController extends BaseController | @@ -29,31 +29,10 @@ class GoogleLinkController extends BaseController | ||
| 29 | if(empty($lists['list'])){ | 29 | if(empty($lists['list'])){ |
| 30 | $linkService = new GoogleLinkService(); | 30 | $linkService = new GoogleLinkService(); |
| 31 | $data = $linkService->linkPageData($this->user['domain'],$this->user['project_id']); | 31 | $data = $linkService->linkPageData($this->user['domain'],$this->user['project_id']); |
| 32 | - $lists = $this->paginateArray($data,$this->page,$this->row); | 32 | + $lists = paginateArray($data,$this->page,$this->row); |
| 33 | } | 33 | } |
| 34 | $this->response('success',Code::SUCCESS,$lists); | 34 | $this->response('success',Code::SUCCESS,$lists); |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | - /** | ||
| 38 | - * @remark :返回分页数据 | ||
| 39 | - * @name :paginateArray | ||
| 40 | - * @author :lyh | ||
| 41 | - * @method :post | ||
| 42 | - * @time :2025/4/1 9:41 | ||
| 43 | - */ | ||
| 44 | - public function paginateArray($array, $page = 1, $pageSize = 20) { | ||
| 45 | - $totalItems = count($array); | ||
| 46 | - $totalPages = ceil($totalItems / $pageSize); | ||
| 47 | - // 确保页码有效 | ||
| 48 | - $page = max(1, min($page, $totalPages)); | ||
| 49 | - $offset = ($page - 1) * $pageSize; | ||
| 50 | - $data = array_slice($array, $offset, $pageSize); | ||
| 51 | - return [ | ||
| 52 | - 'list' => $data, | ||
| 53 | - 'page' => $page, | ||
| 54 | - 'size' => $pageSize, | ||
| 55 | - 'total_page' => $totalPages, | ||
| 56 | - 'total' => $totalItems, | ||
| 57 | - ]; | ||
| 58 | - } | 37 | + |
| 59 | } | 38 | } |
| @@ -67,4 +67,22 @@ class GoogleKeywordInsightDetail extends Base | @@ -67,4 +67,22 @@ class GoogleKeywordInsightDetail extends Base | ||
| 67 | ]; | 67 | ]; |
| 68 | return $this->addReturnId($saveData); | 68 | return $this->addReturnId($saveData); |
| 69 | } | 69 | } |
| 70 | + | ||
| 71 | + /** | ||
| 72 | + * @remark :查看当前数据是否存在数组中 | ||
| 73 | + * @name :getSearchDetail | ||
| 74 | + * @author :lyh | ||
| 75 | + * @method :post | ||
| 76 | + * @time :2025/4/1 9:56 | ||
| 77 | + */ | ||
| 78 | + public function getSearchDetail($keyword,$detailList){ | ||
| 79 | + if(!empty($detailList)){ | ||
| 80 | + foreach ($detailList as $value){ | ||
| 81 | + if($keyword == $value['search']){ | ||
| 82 | + return $value; | ||
| 83 | + } | ||
| 84 | + } | ||
| 85 | + } | ||
| 86 | + return []; | ||
| 87 | + } | ||
| 70 | } | 88 | } |
-
请 注册 或 登录 后发表评论