Merge branch '20250210_lj_zhanqun' into dev

app/Controller/NewsController.php

@@ -10,6 +10,7 @@ use App\Tools\Result;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use Hyperf\Context\Context;
 use App\JsonRpc\UserServiceInterface;
+use App\JsonRpc\WebsiteServiceInterface;
 /**
  * Class NewsController
  * @package App\Controller
@@ -26,11 +27,16 @@ class NewsController extends AbstractController
     #[Inject]
     private $newsServiceClient;
 
-     /**
+    /**
      * @var UserServiceInterface
      */
     #[Inject]
     private $userServiceClient;
+    /**
+     * @var WebsiteServiceInterface
+     */
+    #[Inject]
+    private $WebsiteServiceClient;
 
 
     /**
@@ -56,11 +62,11 @@ class NewsController extends AbstractController
             return Result::error($errorMessage);
         }
          //获取用户信息
-         $user_id = Context::get("UserId");
-         $userInfo = $this->userServiceClient->getUserInfo((int)$user_id);
-         var_dump("用户信息：",$userInfo);
-         $sszq = $userInfo['data']['sszq'];
-         $type_id = $userInfo['data']['type_id']; //'1:个人会员 2：政务会员 3：企业会员 4:调研员 10000：管理员 20000：游客（小程序）'
+        //  $user_id = Context::get("UserId");
+        //  $userInfo = $this->userServiceClient->getUserInfo((int)$user_id);
+        //  var_dump("用户信息：",$userInfo);
+        //  $sszq = $userInfo['data']['sszq'];
+        //  $type_id = $userInfo['data']['type_id']; //'1:个人会员 2：政务会员 3：企业会员 4:调研员 10000：管理员 20000：游客（小程序）'
         $result = $this->newsServiceClient->getCategoryList($requireData);
         if($result['data']){
             foreach ($result['data']['rows'] as $k=>$v) {
@@ -246,6 +252,11 @@ class NewsController extends AbstractController
         $userInfo = $this->userServiceClient->getUserInfo((int)$user_id);
         var_dump("用户信息：",$userInfo);
         $sszq = $userInfo['data']['sszq'];
+        //获取websiteid
+        $groupInfo = $this->WebsiteServiceClient->getWebsiteGroupInfo(['id' => $sszq]);
+        var_dump("groupInfo:",$groupInfo);
+        $sszqstr = implode(',',json_decode($groupInfo['data']['web_ids']));
+
         $type_id = $userInfo['data']['type_id']; //'1:个人会员 2：政务会员 3：企业会员 4:调研员 10000：管理员 20000：游客（小程序）'
         $requireData['type_id'] = $type_id;
         $requireData['user_id'] = $user_id;

app/Controller/WebsiteController.php

@@ -11,6 +11,7 @@ use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use Hyperf\Context\Context;
 use Phper666\JWTAuth\JWT;
 use DateTime;
+use App\JsonRpc\UserServiceInterface;
 /**
  * Class WebsiteController
  * @package App\Controller
@@ -29,6 +30,14 @@ class WebsiteController extends AbstractController
     #[Inject]
     private $websiteServiceClient;
 
+
+     /**
+     * @var UserServiceInterface
+     */
+    #[Inject]
+    private $userServiceClient;
+
+    
     protected JWT $JWT;
     public function __construct(Jwt $JWT)
     {
@@ -1489,7 +1498,146 @@ class WebsiteController extends AbstractController
             return Result::error($result['message']);
         }
     }
-
+     //20250212  网站标识
+    public function addWebsiteGroup()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'name' =>'required',
+                'web_ids' =>'required',
+            ],
+            [
+                'name.required' => '网站标识名称不能为空',
+                'web_ids.required' => '网站标识不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        };
+        $result = $this->websiteServiceClient->addWebsiteGroup($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    public function getWebsiteGrouplist()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page' =>'required',
+                'pageSize' =>'required',
+            ],
+            [
+                'page.required' => 'page不能为空',
+                'pageSize.required' => '每页显示条数不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        };
+        $result = $this->websiteServiceClient->getWebsiteGrouplist($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    public function getWebsiteGroupInfo()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required',
+            ],
+            [
+                'id.required' => '网站标识id不能为空',
+            ]
+        );
+        if ($validator->fails()){
+           $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        };
+        $result = $this->websiteServiceClient->getWebsiteGroupInfo($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    public function updateWebsiteGroup()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required',
+                'name' => 'required',
+                'web_ids' => 'required',
+            ],
+            [
+                'id.required' => '网站标识id不能为空',
+                'name.required' => '网站标识名称不能为空',
+                'web_ids.required' => '网站标识不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        };
+        $result = $this->websiteServiceClient->updateWebsiteGroup($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']); 
+    }
+    public function deleteWebsiteGroup()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required',
+            ],
+            [
+                'id.required' => '网站标识id不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage= $validator->errors()->first();
+            return Result::error($errorMessage);
+        };
+        $result = $this->websiteServiceClient->deleteWebsiteGroup($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']); 
+    }
+    //获取网站下导航列表
+    public function getWebsiteNavList()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' => 'required',
+                'pid' => 'required',
+            ],
+            [
+                'website_id.required' => '网站id不能为空',
+                'pid.required' => '父级id不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage= $validator->errors()->first();
+            return Result::error($errorMessage);
+        };
+
+         //获取用户信息
+         $user_id = Context::get("UserId");
+         $userInfo = $this->userServiceClient->getUserInfo((int)$user_id);
+         var_dump("用户信息：",$userInfo);
+         $sszq = $userInfo['data']['sszq'];
+         //获取websiteid
+         $groupInfo = $this->websiteServiceClient->getWebsiteGroupInfo(['id' => $sszq]);
+         var_dump("groupInfo:",$groupInfo);
+         $sszqarr =  json_decode($groupInfo['data']['web_ids']);
+         var_dump($website_id = Context::get("SiteId")??2 ,'------------website------'); 
+        if (!in_array($website_id, $sszqarr)) {
+            return Result::error("您没有权限访问该网站");
+        }
+        $result = $this->websiteServiceClient->getWebsiteNavList($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']); 
+    }
     public function getSiteCategory()
     {
         $requireData['website_id'] = Context::get("SiteId");

app/JsonRpc/WebsiteService.php

@@ -638,4 +638,29 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    //20250212  网站标识
+    public function addWebsiteGroup(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getWebsiteGroupList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getWebsiteGroupInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function deleteWebsiteGroup(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function updateWebsiteGroup(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getWebsiteNavList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -1,5 +1,6 @@
 <?php
 namespace App\JsonRpc;
+
 interface WebsiteServiceInterface
 {
     /**
@@ -20,7 +21,7 @@ interface WebsiteServiceInterface
      * @param array $data
      * @return array
      */
-    public function updateWebsite(int $id,array $data);
+    public function updateWebsite(int $id, array $data);
 
     /**
      * @param int $id
@@ -59,7 +60,7 @@ interface WebsiteServiceInterface
      * @param array $data
      * @return array
      */
-    public function updateWebsiteColumn(int $id,array $data);
+    public function updateWebsiteColumn(int $id, array $data);
 
     /**
      * @param int $id
@@ -72,7 +73,7 @@ interface WebsiteServiceInterface
      * @param int $page
      * @param int $pageSize
      */
-    public function getWebsiteRoleList(string $keyword,int $page,int $pageSize,int $websiteId);
+    public function getWebsiteRoleList(string $keyword, int $page, int $pageSize, int $websiteId);
     /**
      * @param array $data
      * @return array
@@ -84,7 +85,7 @@ interface WebsiteServiceInterface
      * @param array $data
      * @return array
      */
-    public function updateWebsiteRole(int $id,array $data);
+    public function updateWebsiteRole(int $id, array $data);
 
     /**
      * @param int $id
@@ -97,7 +98,7 @@ interface WebsiteServiceInterface
      * @param int $page
      * @param int $pageSize
      */
-    public function getWebsiteRoleUserList(string $keyword,int $page,int $pageSize,int $websiteId,int $roleId);
+    public function getWebsiteRoleUserList(string $keyword, int $page, int $pageSize, int $websiteId, int $roleId);
 
     /**
      * @param array $data
@@ -110,7 +111,7 @@ interface WebsiteServiceInterface
      * @param array $data
      * @return array
      */
-    public function updateWebsiteRoleUser(int $id,array $data);
+    public function updateWebsiteRoleUser(int $id, array $data);
 
     /**
      * @param int $id
@@ -130,10 +131,6 @@ interface WebsiteServiceInterface
      *
      */
     public function getWebsiteCategory(array $data);
-     
-
-
-
 
     /**
      * @param array $data
@@ -322,18 +319,24 @@ interface WebsiteServiceInterface
     * @return mixed
     *
     */
+    public function addWebsiteTemplateintel(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
     public function getAllTemplateClass(array $data);
-     /** 
-    * @param array $data
-    * @return mixed
-    *
-    */
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
     public function getWebsiteTemplateList(array $data);
-   /** 
-    * @param array $data
-    * @return mixed
-    *
-    */
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
     public function addWebsiteTemplateclassintel(array $data);
     /** 
     * @param array $data
@@ -424,5 +427,13 @@ interface WebsiteServiceInterface
      * @return mixed
      */
     public function getWebsiteCategoryHead(array $data);
+
+    //20250212  网站标识
+    public function addWebsiteGroup(array $data);
+    public function getWebsiteGroupList(array $data);
+    public function deleteWebsiteGroup(array $data);
+    public function getWebsiteGroupInfo(array $data);
+    public function updateWebsiteGroup(array $data);
+    public function getWebsiteNavList(array $data);
 }
 

config/api/website.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare (strict_types = 1);
 
 use App\Controller\WebsiteController;
 use Hyperf\HttpServer\Router\Router;
@@ -71,8 +71,6 @@ Router::addGroup(
         //管理后台数据统计
         Router::get('/getAdminIndex', [WebsiteController::class, 'getAdminIndex']);
 
-
-
         //搜索网站列表
         Router::get('/websiteList', [WebsiteController::class, 'websiteList']);
         //检测网站名称是否存在
@@ -90,25 +88,38 @@ Router::addGroup(
         //获取模板的数据
         Router::get('/getWebsiteTemplateData', [WebsiteController::class, 'getWebsiteTemplateData']);
 
-
         //获取并搜索网站
         Router::post('/getWebsiteintel', [WebsiteController::class, 'getWebsiteintel']);
         //添加搭建网站基础信息
         Router::post('/addWebsiteTemplateintel', [WebsiteController::class, 'addWebsiteTemplateintel']);
-         //获取搭建网站基础信息
-         Router::post('/getWebsiteTemplateintel', [WebsiteController::class, 'getWebsiteTemplateintel']);
-         //修改搭建网站基础信息
-         Router::post('/upWebsiteTemplateintel', [WebsiteController::class, 'upWebsiteTemplateintel']);
-         //获取网站所有风格
+        //获取搭建网站基础信息
+        Router::post('/getWebsiteTemplateintel', [WebsiteController::class, 'getWebsiteTemplateintel']);
+        //修改搭建网站基础信息
+        Router::post('/upWebsiteTemplateintel', [WebsiteController::class, 'upWebsiteTemplateintel']);
+        //获取网站所有风格
         Router::post('/getAllTemplateClass', [WebsiteController::class, 'getAllTemplateClass']);
         //获取网站模板列表
         Router::post('/getWebsiteTemplateList', [WebsiteController::class, 'getWebsiteTemplateList']);
         //添加网站选择风格
         Router::post('/addWebsiteTemplateclassintel', [WebsiteController::class, 'addWebsiteTemplateclassintel']);
-         //获取网站选择风格
-         Router::post('/getWebsiteTemplateclassintel', [WebsiteController::class, 'getWebsiteTemplateclassintel']);
+        //获取网站选择风格
+        Router::post('/getWebsiteTemplateclassintel', [WebsiteController::class, 'getWebsiteTemplateclassintel']);
+
+        //20250212  网站标识
+        //添加网站标识
+        Router::post('/addWebsiteGroup', [WebsiteController::class, 'addWebsiteGroup']);
+        //删除网站标识
+        Router::post('/deleteWebsiteGroup', [WebsiteController::class, 'deleteWebsiteGroup']);
+        //修改网站标识
+        Router::post('/updateWebsiteGroup', [WebsiteController::class, 'updateWebsiteGroup']);
+        //获取网站标识信息
+        Router::post('/getWebsiteGroupInfo', [WebsiteController::class, 'getWebsiteGroupInfo']);
+        //获取网站标识下网站列表
+        Router::post('/getWebsiteGroupList', [WebsiteController::class, 'getWebsiteGroupList']);
+        //获取网站下导航列表
+        Router::post('/getWebsiteNavList', [WebsiteController::class, 'getWebsiteNavList']);
 
-        },
+    },
     ['middleware' => [FooMiddleware::class]]
 );
 
@@ -121,22 +132,19 @@ Router::addGroup(
     }
 );
 
-
-
 Router::addGroup(
     '/web', function () {
-    //添加网站
-    Router::post('/getSiteInfo', [WebsiteController::class, 'getSiteInfo']);
-    //获取网站导航池
-    Router::get('/getSiteCategory', [WebsiteController::class, 'getSiteCategory']);
-    //获取底部导航
-    Router::get('/getFooterCategoryList', [WebsiteController::class, 'getFooterCategoryList']);
-    //获取底部导航详情
-    Router::get('/getFooterContentList', [WebsiteController::class, 'getFooterContentList']);
-    //底部导航详情页
-    Router::get('/getFooterContentInfo', [WebsiteController::class, 'getFooterContentInfo']);
+        //添加网站
+        Router::post('/getSiteInfo', [WebsiteController::class, 'getSiteInfo']);
+        //获取网站导航池
+        Router::get('/getSiteCategory', [WebsiteController::class, 'getSiteCategory']);
+        //获取底部导航
+        Router::get('/getFooterCategoryList', [WebsiteController::class, 'getFooterCategoryList']);
+        //获取底部导航详情
+        Router::get('/getFooterContentList', [WebsiteController::class, 'getFooterContentList']);
+        //底部导航详情页
+        Router::get('/getFooterContentInfo', [WebsiteController::class, 'getFooterContentInfo']);
 
-},
+    },
     ['middleware' => [\App\Middleware\Auth\WebMiddleware::class]]
 );
-