authority：修改菜单、添加菜单、获取菜单列表（权限管理）

news：获取资讯列表、添加资讯、修改资讯；public：随机模板、流程管理保存模板；website：创建网站、修改网站、获取网站列表、（复制表相关getWebsiteColumnList、getWebsiteInfo、websiteList、getWebsiteCategoryList、getWebsiteintel、checkWebsiteBuild、upWebsiteTemplateintel、getWebsiteTemplateList、getWebsiteNavPoolSite、getStaticResourceList）

app/JsonRpc/AuthorityService.php

@@ -7,7 +7,9 @@ use App\Model\Website;
 use App\Model\WebsiteRoleUser;
 use App\Tools\Result;
 use Hyperf\RpcServer\Annotation\RpcService;
-
+use App\Tools\PublicData;
+use Hyperf\DbConnection\Db;
+use Hyperf\Database\Exception\DbException;
 #[RpcService(name: "AuthorityService", protocol: "jsonrpc-http", server: "jsonrpc-http")]
 class AuthorityService implements AuthorityServiceInterface
 {
@@ -48,16 +50,99 @@ class AuthorityService implements AuthorityServiceInterface
      */
     public function updateMenu(array $data): array
     {
+        $data['pid'] = isset($data['pid_arr']) ? end($data['pid_arr']) : '';
+        $pid_arr = isset($data['pid_arr']) ? array_map('intval', $data['pid_arr']) : null;
+        $data['pid_arr'] = json_encode($pid_arr) ?? '';
         $where = [
             'id'=>$data['id']
         ];
         unset($data['id']);
-        $result = Menu::where($where)->update($data);
-        if($result){
-            return Result::success($data);
-        }else{
-            return Result::error($data);
+        // 使用模型查询，避免 Collection 的 where 方法报错
+        $menu = Menu::where($where)->first();
+        if(empty($menu)){
+            return Result::error("菜单不存在",0,[]);
         }
+        $menu_query = Menu::query();
+        if($pid_arr[0] != 0){
+            $pid_menu = $menu_query->whereIn('id',$pid_arr)->get()->toArray();
+            if(empty($pid_menu)){
+                return Result::error("父菜单不存在",0,[]);
+            }
+            foreach ($pid_menu as $val) {
+                if (!empty($val['url'])) {
+                    return Result::error("父级菜单已存在路由，无法添加子级菜单！");
+                }
+            }
+        }
+        Db::beginTransaction();
+        try{
+            $child_key = 0;
+            $all_child_pid = Menu::where('pid','!=',0)->where('id','!=',$where['id'])->select('pid_arr','id','pid')->orderByRaw("JSON_LENGTH(pid_arr)")->get()->toArray();
+            if($data['pid'] == 0){
+                $pid_arr = []; 
+            }
+            $child_id = array_keys($all_child_pid);
+            $ids = array_column($all_child_pid,'id');
+            $pids = array_column($all_child_pid,'pid');
+            if($data['pid_arr'] != $menu['pid_arr'] && in_array($where['id'],$pids)){
+                $child_pid = [];
+                $one_pidarr = [];
+                $pid_arrnum = [];
+                $child_data = [];
+                $caseSql = '';
+                foreach($all_child_pid as $key => $value){
+                    $child_arr = json_decode($value['pid_arr'] ?? '[]',true);
+                    if(in_array($where['id'],$child_arr)){
+                        $count_childarr = count($child_arr);
+                        $child_ids[$child_key] = $value['id'];
+                        if($value['pid'] == $where['id']){
+                            $child_data[$value['id']] = array_merge($pid_arr,[intval($where['id'])]);
+                            $one_pidarr[$count_childarr] = array_merge($pid_arr,[intval($where['id'])]);
+                            $pid_arrnum[$child_key] = $count_childarr;
+                        }else{
+                            // 确保 $child_data[$value['pid']] 已定义
+                            if(!isset($child_data[$value['pid']])){
+                                // 若未定义，先初始化为空数组
+                                $child_data[$value['pid']] = [];
+                            }
+                            if(in_array($count_childarr,$pid_arrnum)){
+                                $child_data[$value['id']] = array_merge($one_pidarr[$count_childarr-1],[intval($value['pid'])]);
+                            }else{
+                                $one_pidarr[$count_childarr] = array_merge($child_data[$value['pid']],[intval($value['pid'])]);
+                                $child_data[$value['id']] = $one_pidarr[$count_childarr];
+                                $pid_arrnum[$child_key] = $count_childarr;
+                            }
+                        }
+                        $pidArrJson = json_encode($child_data[$value['id']]);
+                        $caseSql .= "WHEN id = {$value['id']} THEN '{$pidArrJson}' ";
+                        $child_key++;
+                    }
+                }
+                $caseSql = "CASE {$caseSql} END";
+                // Db::rollBack();
+                // return Result::success($child_data);
+                $affectedRows = Menu::whereIn('id', $child_ids)
+                    ->update([
+                        'pid_arr' => \Hyperf\DbConnection\Db::raw($caseSql)
+                    ]);
+                if($affectedRows != count($child_ids)){
+                    Db::rollBack();
+                    return Result::error('更新子菜单失败');
+                }
+            }
+            $result = Menu::where($where)->update($data);
+            if(empty($result)){
+                Db::rollBack();
+                return Result::error('更新菜单失败');
+            }
+            Db::commit();
+            return Result::success($result);
+        }catch (\Exception $e){
+            Db::rollBack();
+            return Result::error($e->getMessage());
+        }
+
+         
     }
 
     /**
@@ -80,11 +165,25 @@ class AuthorityService implements AuthorityServiceInterface
      */
     public function addMenu(array $data): array
     {
+        $data['pid'] = isset($data['pid_arr']) ? end($data['pid_arr']) : '';
+        $pid_arr = isset($data['pid_arr']) ? array_map('intval', $data['pid_arr']) : null;
+        $data['pid_arr'] = json_encode($pid_arr) ?? '';
+        if($pid_arr[0] != 0){
+            $pid_menu = Menu::whereIn('id',$pid_arr)->get()->toArray();
+            if(empty($pid_menu)){
+                return Result::error("父菜单不存在",0,[]);
+            }
+            foreach ($pid_menu as $val) {
+                if (!empty($val['url'])) {
+                    return Result::error("父级菜单已存在路由，无法添加子级菜单！");
+                }
+            }
+        }
         $result = Menu::insertGetId($data);
         if($result){
-            return Result::success($data);
+            return Result::success($result);
         }else{
-            return Result::error($data);
+            return Result::error('添加失败');
         }
     }
 
@@ -119,9 +218,37 @@ class AuthorityService implements AuthorityServiceInterface
      */
     public function getAllMenuList(array $data): array
     {
-        $result = Menu::get();
-        if($result){
-            return Result::success($result);
+
+        // $all_menu = Menu::get();
+        // return Result::success($data);
+        $top_menu =  Menu::where('pid',0)->pluck('id')->toArray();
+        $pid_arr =  Menu::where('pid', '!=', 0)
+            ->where('url', '<>', '')
+            ->select('pid_arr','id')
+            ->get()
+            ->toArray();
+        // return Result::success($pid_arr);
+        $child_ids = array_column($pid_arr,'id');
+        $pids = array_column($pid_arr,'pid_arr');
+        $all_pid = [];
+        foreach ($pids as $key => $val) {
+            $value = json_decode($val, true) ?: [];
+            if (is_array($value)) {
+                $all_pid = array_merge($all_pid,$value);
+            }
+        }
+        $all_pid = array_values(array_unique($all_pid));
+        $all_ids = array_merge($child_ids,$all_pid);
+        // return Result::success($child_ids);
+        $all_menu =  Menu::whereIn('id',$all_ids)->get()->toArray();
+        // $all_menuids = array_column($all_menu,'id');
+        if($all_menu){
+            // return Result::success([
+            //     'child_ids'=>$child_ids,
+            //     'all_pid'=>$all_pid,
+            //     'all_menuids'=>$all_menuids,
+            // ]);
+            return Result::success($all_menu);
         }else{
             return Result::error("没有权限",0,[]);
         }

app/JsonRpc/NewsService.php

@@ -435,6 +435,8 @@ class NewsService implements NewsServiceInterface
         },
         'websiteCategory' => function ($query) {
           $query->select('website_id', 'category_id', 'alias');
+        },'user' => function ($query) {
+          $query->select('id', 'nickname');
         }
       ])
       // 构建where条件
@@ -609,6 +611,9 @@ class NewsService implements NewsServiceInterface
           'messageType' => 2,
         ]);
       }
+      if(!empty($data['fujian'])){
+        $articleData['fujian'] = $data['fujian'];
+      }
       $id = Article::insertGetId($articleData);
       if (!$id) {
         throw new \Exception('文章插入失败');
@@ -990,6 +995,9 @@ class NewsService implements NewsServiceInterface
           'messageType' => 2,
         ]);
       }
+      if(!empty($data['fujian'])){
+        $articleData['fujian'] = $data['fujian'];
+      }
       $id = Article::where(['id' => $data['id']])->update($articleData);
       // $articleDataContent = [
       //   'content' => $data['content'],
@@ -8891,4 +8899,4 @@ class NewsService implements NewsServiceInterface
     }
     return Result::success($result);
   }
-}
+}

app/JsonRpc/PublicRpcService.php

@@ -2397,11 +2397,13 @@ class PublicRpcService implements PublicRpcServiceInterface
                 Db::rollback();
                 return Result::error('该网站不存在已保存的模版！');
             } else {
+                $data['template_id'] = $data['template_id']?? $website_template_info->template_id;
                 $template = WebsiteTemplate::where('website_id', $data['website_id'])->update(
                     [
                         'template_data' => $data['template_data'],
                         'user_id' => $data['user_id'],
                         'canvas_data' => $data['canvas_data'],
+                        'template_id' => $data['template_id']
                     ]
                 );
             }
@@ -4323,8 +4325,11 @@ class PublicRpcService implements PublicRpcServiceInterface
                             $cat_key += 2;
                         } else {
                             $componentData['name'] = $all_cate[$cat_key]['alias'];
-                            $componentData['category_arr'] = $cat_arr[$cat_key];
-                            $componentData['category_id'] = $all_cate[$cat_key]['category_id'];
+                            if(!empty($all_cate[$cat_key]['category_arr_id'])){
+                                $componentData['category_arr'] = $all_cate[$cat_key]['real_category_arr_id'];
+                            }else{
+                                $componentData['category_arr'] = $all_cate[$cat_key]['category_arr_id'];
+                            }
                             $cat_key++;
                         }
                     }

app/JsonRpc/WebsiteService.php

@@ -76,31 +76,42 @@ class WebsiteService implements WebsiteServiceInterface
         // 构建查询
         $query = Website::when($data, function ($query) use ($data) {
             if (isset($data['keyword']) && !empty($data['keyword'])) {
-                $query->where('website.website_name', 'like', '%' . trim($data['keyword']) . '%');
+                $query->where('zxt_website.website_name', 'like', '%' . trim($data['keyword']) . '%');
             }
             if (isset($data['website_column_id']) && !empty($data['website_column_id'])) {
-                $query->whereJsonContains("website.website_column_arr_id", intval($data['website_column_id']));
+                $query->whereJsonContains("zxt_website.website_column_arr_id", intval($data['website_column_id']));
             }
-            if (isset($data['city_id']) && !empty($data['city_id'])) {
-                $query->whereJsonContains("website.city_arr_id", intval($data['city_id']));
+            if (isset($data['web_type']) && !empty($data['web_type'])) {
+                $query->where('zxt_website.web_type', intval($data['web_type']));
+            }
+            if (isset($data['is_core']) && !empty($data['is_core'])) {
+                $query->where('zxt_website.is_core', intval($data['is_core']));
             }
         });
 
-        // 执行查询并获取总数和结果
-        $queryWithJoins = $query->leftJoin("website_column", "website.website_column_id", "website_column.id")
-            ->leftJoin("district", "district.id", "website.city_id");
-
+        $column_name = WebsiteColumn::pluck('column_name', 'id')->all();
+        $queryWithJoins = $query->leftJoin("zxt_website_column", "zxt_website.website_column_id", "zxt_website_column.id");
         $count = $queryWithJoins->count();
-        $result = $queryWithJoins->select("website.*", "website_column.column_name", "district.name as city_name")
+        $result = $queryWithJoins->select("zxt_website.*", "zxt_website_column.column_name")
             ->limit($data['pageSize'])
             ->offset(($data['page'] - 1) * $data['pageSize'])
-            ->orderBy("website.updated_at", "desc")
-            ->get();
+            ->orderBy("zxt_website.updated_at", "desc")
+            ->get()
+            ->all();
+        foreach ($result as $key => $value) {
+            $column_arr = json_decode($value['website_column_arr_id']);
+            $result[$key]['website_url'] = json_decode($value['website_url']);
+            $result[$key]['website_column_arr_id'] = $column_arr;
+            $result[$key]['city_arr_id'] = json_decode($value['city_arr_id'] ?? '[]', true);
+            if(count($column_arr) > 1){
+                $result[$key]['column_name'] = implode('/', array_intersect_key($column_name, array_flip($column_arr)));
+            }
+        }
         if (empty($result)) {
             return Result::error("没有数据", 0);
         }
         $data = [
-            'rows' => $result->toArray(),
+            'rows' => $result,
             'count' => $count,
         ];
         return Result::success($data);
@@ -133,6 +144,10 @@ class WebsiteService implements WebsiteServiceInterface
             'template_id' => $data['template_id'] ?? 0,
             'suffix' => $data['suffix'] ?? "",
             'ad_key' => $data['ad_key'] ?? "",
+            'index_img' => $data['index_img'] ?? '',
+            'qr_code' => $data['qr_code'] ?? '',
+            'web_type' => $data['web_type'] ?? 0,
+            'is_core' => $data['is_core'] ?? 0,
         ];
         $result = Website::insertGetId($insertData);
         if (empty($result)) {
@@ -167,6 +182,10 @@ class WebsiteService implements WebsiteServiceInterface
             'template_id' => $data['template_id'] ?? 0,
             'suffix' => $data['suffix'] ?? "",
             'ad_key' => $data['ad_key'] ?? "",
+            'index_img' => $data['index_img'] ?? '',
+            'qr_code' => $data['qr_code'] ?? '',
+            'web_type' => $data['web_type'] ?? 0,
+            'is_core' => $data['is_core'] ?? 0,
         ];
         // $web_templsate = WebsiteTemplateInfo::where('website_id', $data['id'])->first();
         // `status` tinyint(1) DEFAULT '0' COMMENT '0:未构建 1:未应用 2：已应用',
@@ -250,11 +269,11 @@ class WebsiteService implements WebsiteServiceInterface
     {
 
         $where = [
-            ['website.id', '=', $id],
+            ['zxt_website.id', '=', $id],
         ];
         $result = Website::where($where)
-            ->leftJoin("template", "template.id", "website.template_id")
-            ->select("website.*", "template.template_name", "template.template_img")
+            ->leftJoin("template", "template.id", "zxt_website.template_id")
+            ->select("zxt_website.*", "template.template_name", "template.template_img")
             ->first();
         if (empty($result)) {
             return Result::error("数据不存在", 0);
@@ -287,11 +306,11 @@ class WebsiteService implements WebsiteServiceInterface
     {
         $where = [];
         if (isset($data['keyword']) && $data['keyword']) {
-            array_push($where, ['website_column.column_name', 'like', '%' . $data['keyword'] . '%']);
+            array_push($where, ['zxt_website_column.column_name', 'like', '%' . $data['keyword'] . '%']);
         }
         $result = WebsiteColumn::where($where)
-            ->leftJoin("website_column as wc", "website_column.pid", "wc.id")
-            ->select("website_column.*", "wc.column_name as parent_column_name")
+            ->leftJoin("zxt_website_column as wc", "zxt_website_column.pid", "wc.id")
+            ->select("zxt_website_column.*", "wc.column_name as parent_column_name")
             ->limit($data['pageSize'])->offset(($data['page'] - 1) * $data['pageSize'])->get();
         $count = WebsiteColumn::where($where)->count();
         if (empty($result)) {
@@ -1109,7 +1128,7 @@ class WebsiteService implements WebsiteServiceInterface
     {
         $where = [];
         if (isset($data['keyword']) && !empty($data['keyword'])) {
-            array_push($where, ['website.website_name', 'like', '%' . $data['keyword'] . '%']);
+            array_push($where, ['zxt_website.website_name', 'like', '%' . $data['keyword'] . '%']);
         }
         $result = Website::where($where)->get();
 
@@ -1395,10 +1414,10 @@ class WebsiteService implements WebsiteServiceInterface
     {
         $where = [];
         if (isset($data['keyword']) && !empty($data['keyword'])) {
-            array_push($where, ['website.website_name', 'like', '%' . $data['keyword'] . '%']);
+            array_push($where, ['zxt_website.website_name', 'like', '%' . $data['keyword'] . '%']);
         }
         if (isset($data['website_column_id']) && !empty($data['website_column_id'])) {
-            array_push($where, ['website.website_column_id', '=', $data['website_column_id']]);
+            array_push($where, ['zxt_website.website_column_id', '=', $data['website_column_id']]);
         }
         $result = Website::where($where)
             ->with(["websiteCategory" => function ($query) {
@@ -1863,33 +1882,33 @@ class WebsiteService implements WebsiteServiceInterface
     public function getWebsiteintel(array $data): array
     {
         //查询所有网站模板信息
-        $query = Website::leftJoin("website_template_info", "website_template_info.website_id", "website.id")
+        $query = Website::leftJoin("website_template_info", "website_template_info.website_id", "zxt_website.id")
             ->leftJoin("template", "template.template_id", "website_template_info.template_id")
             ->leftJoin("template_class", "template_class.class_id", "template.template_class_id")
-            ->leftJoin('website_column', 'website_column.id', 'website.website_column_id')
-            ->leftJoin('website_column as parent_column', function ($join) {
-                $join->on('website_column.pid', '=', 'parent_column.id')
-                    ->where('website_column.pid', 2);
+            ->leftJoin('zxt_website_column', 'zxt_website_column.id', 'zxt_website.website_column_id')
+            ->leftJoin('zxt_website_column as parent_column', function ($join) {
+                $join->on('zxt_website_column.pid', '=', 'parent_column.id')
+                    ->where('zxt_website_column.pid', 2);
             })
             ->whereRaw('NOT JSON_CONTAINS(website_column_arr_id, \'3\')')
             ->select(
                 "website_template_info.id",
                 "template_class.name",
-                "website.id as website_id",
-                "website.website_name",
-                "website.website_url",
+                "zxt_website.id as website_id",
+                "zxt_website.website_name",
+                "zxt_website.website_url",
                 "website_template_info.action_id",
                 "website_template_info.created_at",
                 "website_template_info.updated_at",
                 "website_template_info.page_type",
-                'website_column.column_name',
+                'zxt_website_column.column_name',
                 'parent_column.column_name as parent_column_name',
                 DB::raw("COALESCE(website_template_info.status, 0) as template_status"),
                 "template.template_name"
             );
         //若存在条件；则在$query的基础上进行筛选
         if (isset($data['website_name']) && !empty($data['website_name'])) {
-            $query->where('website.website_name', 'like', '%' . $data['website_name'] . '%');
+            $query->where('zxt_website.website_name', 'like', '%' . $data['website_name'] . '%');
         }
         if (isset($data['status']) && !empty($data['status'])) {
             $query->where('website_template_info.status', $data['status']);
@@ -1927,7 +1946,7 @@ class WebsiteService implements WebsiteServiceInterface
      */
     public function checkWebsiteBuild(array $data): array
     {
-        $website = Website::where('website.id', $data['website_id'])->first();
+        $website = Website::where('zxt_website.id', $data['website_id'])->first();
         if (empty($website)) {
             return Result::error("请输入正确的网站id！", 0);
         }
@@ -2009,7 +2028,7 @@ class WebsiteService implements WebsiteServiceInterface
      */
     public function upWebsiteTemplateintel(array $data): array
     {
-        $web = Website::where('website.id', $data['website_id'])->first();
+        $web = Website::where('zxt_website.id', $data['website_id'])->first();
         if (empty($web)) {
             return Result::error("请输入正确的网站id！", 0);
         }
@@ -2072,7 +2091,7 @@ class WebsiteService implements WebsiteServiceInterface
     public function getWebsiteTemplateList(array $data): array
     {
 
-        $website = Website::where('website.id', $data['website_id'])->first();
+        $website = Website::where('zxt_website.id', $data['website_id'])->first();
         if (empty($website)) {
             return Result::error("请输入正确的网站id！", 0);
         } else {
@@ -2581,15 +2600,15 @@ class WebsiteService implements WebsiteServiceInterface
             $list = Article::where('article.id', $data['article_id'])
             ->leftJoin('website_category', 'article.catid', '=', 'website_category.category_id')
             // WebsiteCategory::query()->where($where)
-            ->leftJoin('website', 'website.id', '=', 'website_category.website_id')
+            ->leftJoin('website', 'zxt_website.id', '=', 'website_category.website_id')
             ->leftJoinSub(function ($query) use ($data) {
                 $query->from('article_ignore')
                 ->where('article_ignore.article_id', $data['article_id']);
                 }, 'article_ignore', function ($join) {
                 $join->on('website_category.website_id', '=', 'article_ignore.website_id');
                 })
-            ->select('website_category.*', 'website.website_name', DB::raw('IFNULL(article_ignore.c_show_time, "") as c_show_time')) // 选择需要的字段，不存在记录时 c_show_time 为空字符串
-            ->distinct('website.website_name') // 使用DISTINCT关键字按website_name过滤重复数据
+            ->select('website_category.*', 'zxt_website.website_name', DB::raw('IFNULL(article_ignore.c_show_time, "") as c_show_time')) // 选择需要的字段，不存在记录时 c_show_time 为空字符串
+            ->distinct('zxt_website.website_name') // 使用DISTINCT关键字按website_name过滤重复数据
             ->get();
             // ->array_map(function ($item) {
             //     $item['c_show_time'] = json_decode($item['category_arr_id'], true);
@@ -2598,8 +2617,8 @@ class WebsiteService implements WebsiteServiceInterface
             ;
         }else{
              $list = WebsiteCategory::query()->where($where)
-            ->leftJoin('website', 'website.id', '=', 'website_category.website_id')
-            ->select('website_category.*', 'website.website_name')
+            ->leftJoin('website', 'zxt_website.id', '=', 'website_category.website_id')
+            ->select('website_category.*', 'zxt_website.website_name')
             ->distinct()
             ->get();
         }
@@ -2777,8 +2796,8 @@ class WebsiteService implements WebsiteServiceInterface
         })
             ->orderBy('updated_at', 'desc');
         $count = $query->count();
-        $row = $query->leftJoin('website', 'website.id', '=', 'website_img.website_id')
-            ->select('website_img.*', 'website.website_name')
+        $row = $query->leftJoin('website', 'zxt_website.id', '=', 'website_img.website_id')
+            ->select('website_img.*', 'zxt_website.website_name')
             ->limit($data['pageSize'])
             ->offset(($data['page'] - 1) * $data['pageSize'])
             ->get();

app/Model/Article.php

@@ -41,10 +41,15 @@ class Article extends Model
     /**
      * 定义与分类的多对一关系
      */
-    public function articleIgnore()
+    public function aricleIgnore()
     {
-        return $this->hasOne(ArticleIgnore::class, 'article_id', 'id')
-                    // ->whereColumn('article_ignore.website_id', 'article.web_site_id')
-                    ;
+        return $this->belongsTo(ArticleIgnore::class, 'id', 'article_id');
     }
-}
+     /**
+     * 定义与分类的一对一关系
+     */
+    public function user()
+    {
+        return $this->hasOne(User::class, 'id', 'admin_user_id');
+    }
+}

app/Model/Website.php

@@ -13,8 +13,7 @@ class Website extends Model
     /**
      * The table associated with the model.
      */
-    protected ?string $table = 'website';
-
+    protected ?string $table = 'zxt_website';
     /**
      * The attributes that are mass assignable.
      */

app/Model/WebsiteColumn.php

@@ -13,8 +13,7 @@ class WebsiteColumn extends Model
     /**
      * The table associated with the model.
      */
-    protected ?string $table = 'website_column';
-
+    protected ?string $table = 'zxt_website_column';
     /**
      * The attributes that are mass assignable.
      */

config/autoload/server.php

@@ -20,7 +20,7 @@ return [
             'name' => 'jsonrpc-http',
             'type' => Server::SERVER_HTTP,
             'host' => '0.0.0.0',
-            'port' => 9502,
+            'port' => 9102,
             'sock_type' => SWOOLE_SOCK_TCP,
             'callbacks' => [
                 Event::ON_REQUEST => [Hyperf\JsonRpc\HttpServer::class, 'onRequest'],