Merge branch '20250210_lj_zhanqun' into dev

app/Controller/ChatController.php

@@ -81,11 +81,21 @@ class ChatController extends AbstractController
      */
     public function topicType()
     {
-        $type = array(
-            '1' => '科研',
-            '2' => '维权',
-            '3' => '讨论',
-        );
+        $requireData = ['page' => 1, 'page_size' => 100];
+        $topicArray = $this->chatServiceClient->getTopicClassList($requireData);
+        $typeArr = $topicArray['data']['data'];
+        $type = array();
+        foreach ($typeArr as   $value) {
+            // var_dump($value['id'], '=-===2222222222');
+           $type[$value['id']] = (string) $value['topicname'];
+        }
+        // var_dump($type);
+        // exit;
+        // $type = array(
+        //     '1' => '科研',
+        //     '2' => '维权',
+        //     '3' => '讨论',
+        // );
         $result = array();
         foreach ($type as $k => $v) {
             $result[] = ['value' => $k, 'label' => $v];

app/Controller/NewsController.php

@@ -499,4 +499,106 @@ class NewsController extends AbstractController
         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
+     //20250226  产品列表
+     public function getGoodList(){
+         $requireData = $this->request->all();
+         $validator = $this->validationFactory->make(
+             $requireData,
+             [
+                 'page'=> 'integer|required',
+                 'page_size'=> 'integer|required',
+             ],
+             [
+                 'page.integer' => 'page必须是整型',
+                 'page_size.integer' => 'page_size必须是整型',
+                 'page.required' => 'page不能为空',
+                 'page_size.required' => 'page_size不能为空',
+                
+             ]
+         );
+         if ($validator->fails()) {
+             $errorMessage = $validator->errors()->first();
+             return Result::error($errorMessage);
+         }
+         $result = $this->newsServiceClient->getGoodList($requireData);
+         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
+     }
+     public function getGoodInfo(){
+         $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->newsServiceClient->getGoodInfo($requireData);
+         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
+         }
+     public function updateGood(){
+         $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->newsServiceClient->updateGood($requireData);
+         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']
+         );
+         }
+     public function addGood(){
+         $requireData = $this->request->all();
+         $validator = $this->validationFactory->make(
+             $requireData,
+             [
+                 'name'=> 'required',
+                 'price'=> 'required',
+                 'stock'=> 'required',
+             ],
+             [
+                 'name.required' => '产品名称不能为空',
+                 'price.required' => '产品价格不能为空',
+                 'stock.required' => '产品库存不能为空',
+             ]
+         );
+         if ($validator->fails()) {
+             $errorMessage = $validator->errors()->first();
+             return Result::error($errorMessage);
+         }
+         $result = $this->newsServiceClient->addGood($requireData);
+         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
+         }
+     public function delGood(){
+         $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->newsServiceClient->delGood($requireData);
+         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
+     }
+
+      //20250226  产品列表
 }

app/JsonRpc/NewsService.php

@@ -150,6 +150,29 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+ 
+
+     //20250226  产品列表
+    public function getGoodList(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getGoodInfo(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function addGood(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function delGood(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function updateGood(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+  
+    
+     //20250226  产品列表
+    
+ 
 
     /**
      * @param array $data

app/JsonRpc/NewsServiceInterface.php

@@ -77,27 +77,27 @@ interface NewsServiceInterface
      */
     public function upArticleStatus(array $data);
 
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function getWebsiteArticleList(array $data);
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function selectWebsiteArticleInfo(array $data);
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function getWebsiteSurvey(array $data);
-      /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function addWebsiteSurveyOption(array $data);
-      /**
+    /**
      * @param array $data
      * @return mixed
      */
@@ -109,6 +109,12 @@ interface NewsServiceInterface
      */
     public function checkCategoryName(array $data);
 
+    //20250226  产品列表
+    public function getGoodList(array $data);
+    public function getGoodInfo(array $data);
+    public function addGood(array $data);
+    public function updateGood(array $data);
+    public function delGood(array $data);
+    //20250226  产品列表
 
 }
-

config/api/news.php

@@ -39,6 +39,13 @@ Router::addGroup(
         //检测导航池名称是否存在
         Router::post('/checkCategoryName', [NewsController::class, 'checkCategoryName']);
 
+        //20250226  产品列表
+        Router::post('/getGoodList', [NewsController::class, 'getGoodList']);
+        Router::post('/getGoodInfo', [NewsController::class, 'getGoodInfo']);
+        Router::post('/addGood', [NewsController::class, 'addGood']);
+        Router::post('/updateGood', [NewsController::class, 'updateGood']);
+        Router::post('/delGood', [NewsController::class, 'delGood']);
+        //20250226  产品列表
     },
     ['middleware' => [FooMiddleware::class]]
 );