Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/admin_consumer

app/Controller/WebController.php

@@ -1283,5 +1283,31 @@ class WebController extends AbstractController
         $result = $this->newsServiceClient->getPositionList($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
-
+    /*
+    *c端-招聘 职位列表
+    * @return array
+    */
+    public function getWebsiteLevelJob(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'job_level' =>'required|integer',
+                'pageSize' =>'required|integer',
+            ],
+            [
+                'job_level.required' => '推荐等级不能为空',
+                'job_level.integer' => '推荐等级必须为整数',
+                'pageSize.required' => '每页数量不能为空',
+                'pageSize.integer' => '每页数量必须为整数',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['website_id'] =  Context::get("SiteId")?? 0;
+        $result = $this->newsServiceClient->getWebsiteLevelJob($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
 }

app/Controller/WebsiteController.php

@@ -1296,18 +1296,35 @@ class WebsiteController extends AbstractController
     }
 
     /**
-     * 获取模板皮肤分类
+     * 获取风格
      * @return void
      */
     public function getTemplateClass()
     {
         $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page' =>'required|integer',
+                'pageSize' =>'required|integer',
+            ],
+            [
+                'page.required' => '页码不能为空',
+                'page.integer' => '页码必须为整数',
+                'pageSize.required' => '每页条数不能为空',
+                'pageSize.integer' => '每页条数必须为整数',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
         $result = $this->websiteServiceClient->getTemplateClass($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
     /**
-     * 添加模板分类
+     * 添加风格
      * @return void
      */
     public function addTemplateClass()
@@ -1316,26 +1333,24 @@ class WebsiteController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'name' => 'required'
+                'name' => 'required',
+                'keyword' =>'required',
             ],
             [
-                'name.required' => '模板类型不能为空'
+                'name.required' => '风格名称不能为空',
+                'keyword.required' => '风格关键词不能为空'
             ]
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $data = [
-            'name' => $requireData['name'],
-            'sort' => $requireData['sort'] ?? 0,
-        ];
-        $result = $this->websiteServiceClient->addTemplateClass($data);
+        $result = $this->websiteServiceClient->addTemplateClass($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
     /**
-     * 更新模板分类
+     * 更新风格
      * @return array
      */
     public function upTemplateClass()
@@ -1346,27 +1361,24 @@ class WebsiteController extends AbstractController
             [
                 'name' => 'required',
                 'id' => 'required',
+                'keyword' =>'required',
             ],
             [
-                'name.required' => '模板类型不能为空',
-                'name.id' => '模板类型ID不能为空'
+                'name.required' => '风格名称不能为空',
+                'id.required' => '风格ID不能为空',
+                'keyword.required' => '风格关键词不能为空'
             ]
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $data = [
-            'id' => $requireData['id'],
-            'name' => $requireData['name'],
-            'sort' => $requireData['sort'] ?? 0,
-        ];
-        $result = $this->websiteServiceClient->upTemplateClass($data);
+        $result = $this->websiteServiceClient->upTemplateClass($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
     /**
-     * 删除模板分类
+     * 删除风格
      * @return array
      */
     public function delTemplateClass()
@@ -1378,17 +1390,14 @@ class WebsiteController extends AbstractController
                 'id' => 'required'
             ],
             [
-                'name.required' => '类型id不能为空'
+                'id.required' => '风格id不能为空'
             ]
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $data = [
-            'id' => $requireData['id']
-        ];
-        $result = $this->websiteServiceClient->delTemplateClass($data);
+        $result = $this->websiteServiceClient->delTemplateClass($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
@@ -2449,11 +2458,12 @@ class WebsiteController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'website_id' =>'required|numeric',
+                'img_url' =>'required',
+                'img_size' =>'required',
             ],
             [
-                'website_id.required' => '网站id不能为空',
-                'website_id.numeric' => '网站id必须是数字类型',
+                'img_url.required' => '图片地址不能为空',
+                'img_size.numeric' => '图片尺寸不能为空',
             ]
         );
         if ($validator->fails()) {
@@ -2488,28 +2498,138 @@ class WebsiteController extends AbstractController
         Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
-     * 获取所有的静态资源
+     * 获取尺寸列表
      * @return array
      */
-    public function getStaticResourceInfo()
+    public function getSizeList()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'id' =>'required|integer'
+                'page' =>'required|integer',
+                'pageSize' =>'required|integer'
             ],
             [
-                'id.required' => '网站id不能为空',
-                'id.integer' => '网站id必须是整数类型'
+                'page.required' => '页码不能为空',
+                'page.integer' => '页码必须是整数',
+                'pageSize.required' => '每页显示数量不能为空',  
+                'pageSize.integer' => '每页显示数量必须是整数'
             ]
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $result = $this->websiteServiceClient->getStaticResourceInfo($requireData);
-        Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+        $result = $this->websiteServiceClient->getSizeList($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 添加尺寸
+     * @return array
+     */
+    public function addSize()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'width' =>'required|integer',
+                'height' =>'required|integer',
+            ],
+            [
+                'width.required' => '尺寸宽度不能为空',
+                'width.integer' => '尺寸宽度必须是整数类型',
+                'height.required' => '尺寸高度不能为空',
+                'height.integer' => '尺寸高度必须是整数类型',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->addSize($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 修改尺寸
+     * @return array
+     */
+    public function upSize()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+               'id' =>'required|integer',
+               'width' =>'required|integer',
+               'height' =>'required|integer',
+            
+            ],
+            [
+               'id.required' => 'id不能为空',
+               'id.integer' => 'id必须是整数类型',
+               'width.required' => '尺寸宽度不能为空',
+               'width.integer' => '尺寸宽度必须是整数类型',
+               'height.required' => '尺寸高度不能为空',
+               'height.integer' => '尺寸高度必须是整数类型',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->upSize($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 删除尺寸
+     * @return array
+     */
+    public function delSize()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+               'id' =>'required|integer',
+            ],
+            [
+               'id.required' => 'id不能为空',
+               'id.integer' => 'id必须是整数类型',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->delSize($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 获取网站模板信息
+     * @return array
+     */
+    public function getSizeInfo()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+               'id' =>'required|integer',
+            ],
+            [
+               'id.required' => 'id不能为空',
+               'id.integer' => 'id必须是整数类型',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->getSizeInfo($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+
     }
     // --自助建站-----------20250522fr----------------------end
     /**

app/JsonRpc/NewsService.php

@@ -519,6 +519,14 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteLevelJob(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
     /**
      * @param array $data
      * @return mixed

app/JsonRpc/NewsServiceInterface.php

@@ -385,5 +385,9 @@ interface NewsServiceInterface
     public function getWebsiteTsbbDetail(array $data);
 
     public function getWebsiteCatidshop(array $data);
-
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteLevelJob(array $data);
 }

app/JsonRpc/WebsiteService.php

@@ -763,7 +763,39 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      * @param array $data
      * @return mixed
      */
-    public function getStaticResourceInfo(array $data)
+    public function getSizeList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addSize(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delSize(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upSize(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getSizeInfo(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }

app/JsonRpc/WebsiteServiceInterface.php

@@ -482,13 +482,37 @@ interface WebsiteServiceInterface
      */
     public function getFooterContentList(array $data);
     public function delStaticResource(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getSizeList(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addSize(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delSize(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upSize(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getSizeInfo(array $data);
 
     /**
      * @param array $data
      * @return mixed
      */
     public function getFooterContentInfo(array $data);
-    public function getStaticResourceInfo(array $data);
 
     /**
      * @param array $data

config/api/web.php

@@ -94,6 +94,8 @@ Router::addGroup(
                 // Router::get('/getWebsiteJobApply', [WebController::class, 'getWebsiteJobApply']);
                 // c端-招聘 职位分类
                 Router::get('/getPositionList', [WebController::class, 'getPositionList']);
+                // c端-招聘 推荐等级职位
+                Router::get('/getWebsiteLevelJob', [WebController::class, 'getWebsiteLevelJob']);
                 //贴身宝贝
                 Router::get('/getWebsiteTsbb', [WebController::class, 'getWebsiteTsbb']);
                 //列表页

config/api/website.php

@@ -132,8 +132,17 @@ Router::addGroup(
         Router::post('/addStaticResource', [WebsiteController::class, 'addStaticResource']);
         // 删除静态资源
         Router::post('/delStaticResource', [WebsiteController::class, 'delStaticResource']);
-        // 查看静态资源
-        Router::get('/getStaticResourceInfo', [WebsiteController::class, 'getStaticResourceInfo']);
+
+        // 获取尺寸列表
+        Router::get('/getSizeList', [WebsiteController::class, 'getSizeList']);
+        // 添加尺寸
+        Router::post('/addSize', [WebsiteController::class, 'addSize']);
+        // 删除尺寸
+        Router::post('/delSize', [WebsiteController::class, 'delSize']);
+        // 修改尺寸
+        Router::post('/upSize', [WebsiteController::class, 'upSize']);
+        // 获取尺寸详情
+        Router::get('/getSizeInfo', [WebsiteController::class, 'getSizeInfo']);
         // --自助建站-----------fr----------------------end
 
         // --网站底部基础信息-----------fr----------------------start