三农资讯网相关功能

app/Controller/AbstractController.php

@@ -17,9 +17,7 @@ use Hyperf\HttpServer\Contract\RequestInterface;
 use Hyperf\HttpServer\Contract\ResponseInterface;
 
 
-use Hyperf\Logger\LoggerFactory;
 use Psr\Container\ContainerInterface;
-use Psr\Log\LoggerInterface;
 
 abstract class AbstractController
 {
@@ -32,14 +30,5 @@ abstract class AbstractController
     #[Inject]
     protected ResponseInterface $response;
 
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-//    public function __construct(LoggerFactory $loggerFactory)
-//    {
-//        $this->logger =  $loggerFactory->get('admin_consumer:', 'default');
-//        $this->logger->info("项目启动访问一次");
-//    }
 
 }

app/Controller/NewsController.php

@@ -63,7 +63,7 @@ class NewsController extends AbstractController
      */
     public function categoryList()
     {
-        $requireData['website_id'] = $this->websiteId;
+        $requireData['website_id'] = Context::get("SiteId");
         $result = $this->newsServiceClient->categoryList($requireData);
         var_dump($result);
         $rep = PublicData::buildMenuTree($result['data']);
@@ -183,7 +183,7 @@ class NewsController extends AbstractController
     public function getArticleList()
     {
         $requireData = $this->request->all();
-        $requireData['website_id'] = $this->websiteId;
+        $requireData['website_id'] = Context::get("SiteId");
         var_dump("资讯：",$requireData);
         $result = $this->newsServiceClient->getArticleList($requireData);
         //1通过，2待审核，3待发 4,拒绝 5删除
@@ -267,7 +267,7 @@ class NewsController extends AbstractController
         }
         $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
         $requireData['ip'] = $loginIp;
-        $requireData['website_id'] = $this->websiteId;
+        $requireData['website_id'] = Context::get("SiteId");
         $requireData['admin_user_id'] =Context::get("UserId");
         $result = $this->newsServiceClient->addArticle($requireData);
 
@@ -301,7 +301,7 @@ class NewsController extends AbstractController
             $requireData['pid_arr'] = json_encode($id);
             $requireData['pid'] = end($id);
         }
-        $requireData['website_id'] = $this->websiteId;
+        $requireData['website_id'] = Context::get("SiteId");
         $result = $this->newsServiceClient->updateArticle($requireData);
         return $result['code']==200? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -326,7 +326,7 @@ class NewsController extends AbstractController
             return Result::error($errorMessage);
         }
 
-        $requireData['website_id'] = $this->websiteId;
+        $requireData['website_id'] = Context::get("SiteId");
         $result = $this->newsServiceClient->delArticle($requireData);
         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
     }

app/Controller/WebController.php

@@ -6,11 +6,13 @@ use App\JsonRpc\NewsServiceInterface;
 use App\JsonRpc\WebsiteServiceInterface;
 use App\Tools\PublicData;
 use Hyperf\Di\Annotation\Inject;
-use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use App\Constants\ErrorCode;
+use App\Controller\PublicController;
 use Hyperf\Context\Context;
+use Hyperf\HttpServer\Contract\RequestInterface;
+use Hyperf\HttpServer\Contract\ResponseInterface;
 /**
  * Class WebController
  * @package App\Controller
@@ -19,7 +21,7 @@ class WebController extends AbstractController
 {
     #[Inject]
     protected ValidatorFactoryInterface $validationFactory;
-
+    private $publicServiceClient;
     /**
      * @var NewsServiceInterface
      */
@@ -31,64 +33,436 @@ class WebController extends AbstractController
      */
     #[Inject]
     private $websiteServiceClient;
-<<<<<<< HEAD
-    protected $siteId;
-    public function __construct(){
-        $websiteInfo = $this->getWebsiteId();
-        var_dump($websiteInfo);
-        if($websiteInfo['code'] == 200){
-            $this->siteId = $websiteInfo['data']['id'];
-        }
-    }
-=======
 
->>>>>>> dc5ca2d82095a07156ecae10ce8899519068294e
+    private $PublicController;
+
+    public function __construct(PublicController $PublicController)
+    {
+        $this->PublicController = $PublicController;
+    }
     /**
      * 获取栏目导航
      * @return array
      */
     public function getWebsiteCategory()
     {
-<<<<<<< HEAD
-       var_dump("网站id：",$this->siteId);
-=======
->>>>>>> dc5ca2d82095a07156ecae10ce8899519068294e
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'pageSize' => 'required'
+            ],
+            [
+                'pageSize.required' => '显示条数不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
         $data = [
-            'website_id'=>Context::get("SiteId")
+            'website_id'=>Context::get("SiteId"),
+            'pageSize'=>$requireData['pageSize']
         ];
-        var_dump("网站id：",Context::get("SiteId"));
+        // var_dump("网站id：",Context::get("SiteId"));
         $result = $this->websiteServiceClient->getWebsiteCategory($data);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
         }
         return Result::success($result['data']);
     }
+    /**
+     * 获取各省名称
+     */
+    public function getWebsiteDistrit()
+    {
+        $data= [
+            'pid' => 0,
+            'website_id'=>Context::get("SiteId")
+        ];
+        $result=$this->PublicController->getDistrictList($data);
+        
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        // var_dump($result['data']);
+        return Result::success($result['data']);
+        
+    }
+     /**
+     * 获取广告1
+     * @return array
+     */
+    public function getWebsiteAdvertisement()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'adPlace' => 'required'
+            ],
+            [
+                'adPlace.required' => '广告位置编号不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = [
+            'website_id'=>Context::get("SiteId"),
+            'ad_placeid'=>$requireData['adPlace']
+        ]; 
+        
+        $result = $this->websiteServiceClient->getWebsiteAdvertisement($data);
+
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+    /**
+     * 搜索并获取职能部门
+     */
+    public function selectWebsiteDepartment(){
+        $requireData = $this->request->all();
+        $data = [
+            
+            'website_id'=>Context::get("SiteId")
+        ]; 
+       
+        if(!empty($requireData)){
+            $data = [
+                'keyword'=>$requireData['keyword'],
+                'website_id'=>Context::get("SiteId")
+            ]; 
+        }
+   
+        $result = $this->websiteServiceClient->selectWebsiteDepartment($data);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+    /**
+     *各省市查询 
+     */
+    public function selectWebsiteArea()
+    {
+        $requireData = $this->request->all();
+       
+        $data=[];
+        if(!empty($requireData)){
+            $validator = $this->validationFactory->make(
+                $requireData,
+                [
+                    'province' => 'required'
+                ],
+                [
+                    'province.required' => '请先选择省份'
+                ]
+            );
+            if ($validator->fails()){
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);
+            }
+            $data=[
+                'province' => $requireData['province']
+            ];
+            if(isset($requireData['city'])){
+                
+                $data=[
+                    'city' => $requireData['city'],
+                    'province' => $requireData['province']
+                    
+                ];
+                
+                if(isset($requireData['region'])){
+                    $data=[
+                        'province' => $requireData['province'],
+                        'city' => $requireData['city'],
+                        'region' => $requireData['region']
+                    ];
+                }
+            }
+        }
+        $result = $this->websiteServiceClient->selectWebsiteArea($data);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+    /**
+     * 获取新闻
+     */
+    public function getWebsiteArticlett()
+    {
+       
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'level' => 'required',
+                'pageSize' => 'required',
+            ],
+            [
+                'level.required' => '新闻类型不能为空',
+                'pageSize.required' => '显示条数不能为空',
+
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        if(isset($requireData['placeid']) && !empty($requireData['placeid'])){
+            $data =[
+            'website_id'=>Context::get("SiteId"),
+            'level'=>$requireData['level'],
+            'pageSize'=>$requireData['pageSize'],
+            'placeid' => $requireData['placeid']
+            ];
+            
+        }else{
+            $data = [
+                'website_id'=>Context::get("SiteId"),
+                'level'=>$requireData['level'],
+                'pageSize'=>$requireData['pageSize']
+            ]; 
+        }
+        $result = $this->newsServiceClient->getWebsiteArticlett($data);
+        // var_dump($result);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+        
+    }
+     /**
+     * 获取模块新闻
+     */
+    public function getWebsiteModelArticles()
+    {
+        $requireData = $this->request->all();     
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'catid' => 'required',
+                'level' => 'required',
+                'pagesize' => 'required'
+            ],
+            [
+                'catid.required' => '栏目id不能为空',
+                'level.required' => '新闻类型不能为空',
+                'pagesize.required' => '新闻条数不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
 
-<<<<<<< HEAD
+        if(isset($requireData['placeid']) && !empty($requireData['placeid'])){
+            $data =[
+                'website_id'=>Context::get("SiteId"),
+                'catid' => $requireData['catid'],
+                'level' => $requireData['level'],
+                'pagesize' => $requireData['pagesize'],
+                'placeid' => $requireData['placeid']
+            ];
+        }else{
+            $data = [
+                'website_id'=>Context::get("SiteId"),
+                'catid' => $requireData['catid'],
+                'level' => $requireData['level'],
+                'pagesize' => $requireData['pagesize']
+            ];   
+        }      
+        $result = $this->newsServiceClient->getWebsiteModelArticles($data);
+        // var_dump($result);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
     /**
+     * 获取模块栏目
+     */
+    public function getWebsiteModelCategory()
+    {
+        $requireData = $this->request->all();     
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'placeid' => 'required',
+                'pid' => 'required',
+                'num' => 'required'
+            ],
+            [
+                'placeid.required' => '栏目位置不能为空',
+                'pid' => '栏目类型不能为空',
+                'num' => '父级栏目数量'
+            ]
+        );
+        
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = [
+            'website_id'=>Context::get("SiteId"),
+            'placeid' => $requireData['placeid'],
+            'pid' => $requireData['pid'],
+            'num' => $requireData['num']
+        ];    
+        $result=$this->websiteServiceClient->getWebsiteModelCategory($data);
+        
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        // var_dump($result['data']);
+        return Result::success($result['data']);
+        
+    }
+     /**
+     * 获取友情链接
      * @return array
      */
-    public function getWebsiteId()
+    public function selectWebsiteLinks()
     {
-        $header = $this->request->getHeaders();
-       var_dump("获取header：",$header);
-        if(!isset($header['origin'])){
-            return Result::error("header请配置origin");
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'type' => 'required',
+                'num' => 'required'
+            ],
+            [
+                'type.required' => '友情链接类型不能为空',
+                'num.required' => '友情链接数量不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
         }
-        $origin = $header['origin'][0];
-        $logindevice = explode("//", $origin);
         $data = [
-            'website_url'=>$logindevice[1]
+            'website_id'=>Context::get("SiteId"),
+            'type'=>$requireData['type'],
+            'num' =>$requireData['num']
         ];
-        var_dump($data);
-        $result = $this->websiteServiceClient->getWebsiteId($data);
+        $result = $this->websiteServiceClient->selectWebsiteLinks($data);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
         }
         return Result::success($result['data']);
     }
-=======
+    /**
+     * 获取文章列表
+     */
+    public function getWebsiteArticlesList()
+    {
+       
+        $requireData = $this->request->all();
+        if(isset($requireData['catid'])){
+            $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'catid' => 'required'
+            ],
+            [
+                'catid.required' => '栏目id不能为空'
 
->>>>>>> dc5ca2d82095a07156ecae10ce8899519068294e
+            ]
+            );
+            $data['catid'] =  $requireData['catid']; 
+        }elseif(isset($requireData['keyword'])){
+            $validator = $this->validationFactory->make(
+                $requireData,
+                [
+                    'keyword' => 'required'
+                ],
+                [
+                    'keyword.required' => '搜索词不能为空'
+    
+                ]
+            );
+            $data['keyword'] =  $requireData['keyword']; 
+        }else{
+            $validator = $this->validationFactory->make(
+                $requireData,
+                [
+                    'catid' => 'required',
+                    'keyword' => 'required'
+                ],
+                [
+                    'catid.required' => '栏目id不能为空',
+                    'keyword.required' => '搜索词不能为空'
+    
+                ]
+            );
+            $data['catid'] =  $requireData['catid']; 
+            $data['keyword'] =  $requireData['keyword']; 
+        }
+        $validator = $this->validationFactory->make(
+                $requireData,
+                [
+                    'page' => 'required',
+                    'pageSize' => 'required'
+                ],
+                [
+                    'page.required' => '分页不能为空',
+                    'pageSize.required' => '显示条数不能为空'
+    
+                ]
+            );
+            if ($validator->fails()){
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);
+            }
+            $data['website_id'] = Context::get("SiteId");
+            $data['pageSize'] = $requireData['pageSize']; 
+            $data['page'] = $requireData['page']; 
+        $result = $this->newsServiceClient->getArticleList($data);
+        // var_dump($result);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        // $result = $data; 
+        return Result::success($result['data']);
+        
+    }
+     /**
+     * 获取文章详情
+     */
+    public function selectWebsiteArticleInfo()
+    {
+       
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'articleid' => 'required'
+            ],
+            [
+                'articleid.required' => '新闻id不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = [
+            'website_id'=>Context::get("SiteId"),
+            'id'=>$requireData['articleid'],
+        ]; 
+        $result = $this->newsServiceClient->getArticleInfo($data);
+        // var_dump($result);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+        
+    }
 
 }

app/JsonRpc/NewsService.php

@@ -116,4 +116,25 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getWebsiteArticlett(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+         /**
+     * @param array $data
+     * @return array
+     */
+    public function getWebsiteModelArticles(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    
+
+
+
 }

app/JsonRpc/NewsServiceInterface.php

@@ -58,5 +58,15 @@ interface NewsServiceInterface
      * @return mixed
      */
     public function getCategoryInfo(array $data);
+    /**
+     * @param array $data
+     *
+     */
+    public function getWebsiteArticlett(array $data);
+
+    /**
+     * @param array $data
+     */
+    public function getWebsiteModelArticles(array $data);
 
 }

app/JsonRpc/WebsiteService.php

@@ -208,6 +208,55 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getWebsiteAdvertisement(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+     /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function selectWebsiteDepartment(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function selectWebsiteArea(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteModelCategory(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function selectWebsiteLinks(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+
+
+
+
+
+
 
     /**
      * @param array $data
@@ -289,4 +338,5 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -130,6 +130,55 @@ interface WebsiteServiceInterface
      *
      */
     public function getWebsiteCategory(array $data);
+     
+
+
+
+
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
+    public function getWebsiteAdvertisement(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
+    public function selectWebsiteDepartment(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
+    public function selectWebsiteArea(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
+    public function getWebsiteModelCategory(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
+    public function selectWebsiteLinks(array $data);
+
+
+
+
+
+
+
+
+
+
+
+
 
     /**
      * @param array $data

config/api/web.php

@@ -7,8 +7,19 @@ use Hyperf\HttpServer\Router\Router;
 use App\Middleware\Auth\WebMiddleware;
 Router::addGroup(
     '/web', function () {
-                Router::get('/getWebsiteId', [WebController::class, 'getWebsiteId']);
+
                 Router::get('/getWebsiteCategory', [WebController::class, 'getWebsiteCategory']);
+                Router::get('/getWebsiteDistrit', [WebController::class, 'getWebsiteDistrit']);
+                Router::get('/getWebsiteAdvertisement', [WebController::class, 'getWebsiteAdvertisement']);
+                Router::get('/selectWebsiteDepartment', [WebController::class, 'selectWebsiteDepartment']);
+                Router::get('/selectWebsiteArea', [WebController::class, 'selectWebsiteArea']);
+
+                Router::get('/getWebsiteArticlett', [WebController::class, 'getWebsiteArticlett']);
+                Router::get('/getWebsiteModelArticles', [WebController::class, 'getWebsiteModelArticles']);
+                Router::get('/getWebsiteModelCategory', [WebController::class, 'getWebsiteModelCategory']);
+                Router::get('/getWebsiteArticlesList', [WebController::class, 'getWebsiteArticlesList']);
+                Router::get('/selectWebsiteArticleInfo', [WebController::class, 'selectWebsiteArticleInfo']);
+                Router::get('/selectWebsiteLinks', [WebController::class, 'selectWebsiteLinks']);
             },
     ['middleware' => [WebMiddleware::class]]
 );

runtime/container/proxy/App_Controller_NewsController.proxy.php

@@ -59,7 +59,7 @@ class NewsController extends AbstractController
      */
     public function categoryList()
     {
-        $requireData['website_id'] = $this->websiteId;
+        $requireData['website_id'] = Context::get("SiteId");
         $result = $this->newsServiceClient->categoryList($requireData);
         var_dump($result);
         $rep = PublicData::buildMenuTree($result['data']);
@@ -129,7 +129,7 @@ class NewsController extends AbstractController
     public function getArticleList()
     {
         $requireData = $this->request->all();
-        $requireData['website_id'] = $this->websiteId;
+        $requireData['website_id'] = Context::get("SiteId");
         var_dump("资讯：", $requireData);
         $result = $this->newsServiceClient->getArticleList($requireData);
         //1通过，2待审核，3待发 4,拒绝 5删除
@@ -182,7 +182,7 @@ class NewsController extends AbstractController
         }
         $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
         $requireData['ip'] = $loginIp;
-        $requireData['website_id'] = $this->websiteId;
+        $requireData['website_id'] = Context::get("SiteId");
         $requireData['admin_user_id'] = Context::get("UserId");
         $result = $this->newsServiceClient->addArticle($requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
@@ -203,7 +203,7 @@ class NewsController extends AbstractController
             $requireData['pid_arr'] = json_encode($id);
             $requireData['pid'] = end($id);
         }
-        $requireData['website_id'] = $this->websiteId;
+        $requireData['website_id'] = Context::get("SiteId");
         $result = $this->newsServiceClient->updateArticle($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -219,7 +219,7 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['website_id'] = $this->websiteId;
+        $requireData['website_id'] = Context::get("SiteId");
         $result = $this->newsServiceClient->delArticle($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }