Explorar el Código

Merge branch '20250306_jobrecuiting_fr' into dev

15313670163 hace 2 meses
padre
commit
8be57eb3d4

+ 1333 - 1054
app/JsonRpc/NewsService.php

@@ -1,1054 +1,1333 @@
-<?php
-namespace App\JsonRpc;
-
-use App\Model\Article;
-use App\Model\ArticleData;
-use App\Model\Category;
-use App\Model\Website;
-use App\Model\WebsiteCategory;
-use App\Model\ArticleSurvey;
-use App\Model\Good;
-
-use Hyperf\DbConnection\Db;
-use Hyperf\RpcServer\Annotation\RpcService;
-use App\Tools\Result;
-use Ramsey\Uuid\Uuid;
-use Hyperf\Utils\Random;
-#[RpcService(name: "NewsService", protocol: "jsonrpc-http", server: "jsonrpc-http")]
-class NewsService implements NewsServiceInterface
-{
-
-    /**
-     * 获取导航池列表
-     * @param array $data
-     * @return array
-     */
-    public function getCategoryList(array $data): array
-    {
-        $where = [];
-        if (isset($data['name']) && $data['name']) {
-            array_push($where, ['category.name', 'like', '%' . $data['name'] . '%']);
-        }
-        if (isset($data['department_id']) && $data['department_id']) {
-            array_push($where, ['category.department_id', '=', $data['department_id']]);
-        }
-        $city_id = '';
-        if (isset($data['city_id']) && $data['city_id']) {
-            $city_id = intval($data['city_id']);
-        }
-        $rep = Category::where($where)
-            ->when($city_id, function ($query) use ($city_id) {
-                if (isset($city_id) && $city_id) {
-                    $query->whereJsonContains("category.city_arr_id", $city_id);
-                }
-            })
-            ->leftJoin('district', 'category.city_id', 'district.id')
-            ->leftJoin('department', 'category.department_id', 'department.id')
-            ->select("category.*", "district.name as city_name", "department.name as department_name")
-            ->limit($data['pageSize'])->orderByDesc('category.updated_at')->offset(($data['page'] - 1) * $data['pageSize'])->get();
-        $count = Category::where($where)->when($city_id, function ($query) use ($city_id) {
-            if (isset($city_id) && $city_id) {
-                $query->whereJsonContains("category.city_arr_id", $city_id);
-            }
-        })->count();
-        $data = [
-            'rows' => $rep->toArray(),
-            'count' => $count,
-        ];
-        if (empty($rep->toArray())) {
-            return Result::error("没有导航池数据");
-        }
-        return Result::success($data);
-    }
-    public function myCategoryList(array $data): array
-    {
-        $sszq = $data['sszq'] ?? '';
-        unset($data['sszq']);
-        //1,2,3 根据这些webid,。从website_category表中取出对应的分类id,然后从category表中取出分类信息
-        $catorytids = WebsiteCategory::whereIn('website_id', explode(',', $sszq))->get()->pluck('category_id')->toArray();
-        $where[] = [
-            'pid', '=', $data['pid'],
-        ];
-        if (isset($data['name'])) {
-            array_push($where, ['category.name', 'like', '%' . $data['name'] . '%']);
-        }
-        var_dump($where);
-        //根据分类id,从category表中取出分类信息
-        $result = Category::where($where)
-            ->whereIn('category.id', $catorytids)
-            ->select('category.*', 'category.id as category_id')->get();
-        if (empty($result)) {
-            return Result::error("没有栏目数据");
-        }
-        return Result::success($result);
-    }
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function categoryList(array $data): array
-    {
-        $where[] = [
-            'pid', '=', $data['pid'],
-        ];
-        if (isset($data['name'])) {
-            array_push($where, ['category.name', 'like', '%' . $data['name'] . '%']);
-        }
-        var_dump($where);
-        $result = Category::where($where)->select('category.*', 'category.id as category_id')->get();
-        if (empty($result)) {
-            return Result::error("没有栏目数据");
-        }
-        return Result::success($result);
-    }
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function addCategory(array $data): array
-    {
-        $id = Category::insertGetId($data);
-        if (empty($id)) {
-            return Result::error("添加失败");
-        }
-        return Result::success(['id' => $id]);
-    }
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function delCategory(array $data): array
-    {
-        $categoryList = Category::where(['pid' => $data['id']])->get();
-        var_dump("分类列表:", $data, $categoryList);
-        if ($categoryList->toArray()) {
-            return Result::error("分类下面有子分类不能删除");
-        }
-        $articleList = Article::where(['catid' => $data['id']])->get();
-        var_dump("文章列表:", $articleList);
-        if ($articleList->toArray()) {
-            return Result::error("分类下面有资讯不能删除");
-        }
-        $result = Category::where($data)->delete();
-        if (!$result) {
-            return Result::error("删除失败");
-        }
-        return Result::success($result);
-    }
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function updateCategory(array $data): array
-    {
-        $where = [
-            'id' => $data['id'],
-        ];
-        $result = Category::where($where)->update($data);
-        if ($result) {
-            return Result::success($result);
-        } else {
-            return Result::error("更新失败");
-        }
-    }
-
-    /**
-     * 获取导航池信息
-     * @param array $data
-     * @return array
-     */
-    public function getCategoryInfo(array $data): array
-    {
-        $where = [
-            'id' => $data['id'],
-        ];
-        $result = Category::where($where)->first();
-        if ($result) {
-            return Result::success($result);
-        } else {
-            return Result::error("更新失败");
-        }
-    }
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function getArticleList(array $data): array
-    {
-        //判断是否是管理员'1:个人会员 2:政务会员 3:企业会员 4:调研员 10000:管理员 20000:游客(小程序)'
-        $type_id = $data['type_id'];
-        unset($data['type_id']);
-        $user_id = $data['user_id'];
-        unset($data['user_id']);
-
-        $where = [];
-
-        if (isset($data['title']) && $data['title']) {
-            array_push($where, ['article.title', 'like', '%' . $data['title'] . '%']);
-        }
-        if (isset($data['category_name']) && $data['category_name']) {
-            array_push($where, ['category.name', 'like', '%' . $data['category_name'] . '%']);
-        }
-        if (isset($data['author']) && $data['author']) {
-            array_push($where, ['article.author', '=', $data['author']]);
-        }
-        if (isset($data['islink']) && $data['islink'] !== "") {
-            array_push($where, ['article.islink', '=', $data['islink']]);
-        }
-        if (isset($data['status']) && $data['status'] !== "") {
-            array_push($where, ['article.status', '=', $data['status']]);
-        }
-        //不是管理员展示个人数据;
-        if ($type_id != 10000) {
-            $where[] = ['article.admin_user_id', '=', $user_id];
-        }
-
-        $rep = Article::where($where)
-            ->whereNotIn('article.status', [404])
-            ->leftJoin('category', 'article.catid', 'category.id')
-            ->select("article.*", "category.name as category_name")
-            ->orderBy("article.id", "desc")
-            ->limit($data['pageSize'])
-            ->offset(($data['page'] - 1) * $data['pageSize'])->get();
-        $count = Article::where($where)->whereNotIn('article.status', [404])
-            ->leftJoin('category', 'article.catid', 'category.id')->count();
-        $data = [
-            'rows' => $rep->toArray(),
-            'count' => $count,
-        ];
-        if (empty($rep)) {
-            return Result::error("没有信息数据");
-        }
-        return Result::success($data);
-    }
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function addArticle(array $data): array
-    {
-        var_dump($data, '----------12-----------1');
-        var_dump($data, '----------12-----------1');
-        unset($data['user_type']);
-        // unset($data['web_site_id']);
-        unset($data['nav_add_pool_id']);
-        // $data['cat_arr_id'] = is_string($data['cat_arr_id']) ? json_encode($data['cat_arr_id']) : '';
-        Db::beginTransaction();
-        try {
-            //处理投票
-            $is_survey = isset($data['is_survey']) ? $data['is_survey'] : 0;
-            $survey_name = isset($data['survey_name']) ? $data['survey_name'] : '';
-            $suvey_array = isset($data['suvey_array']) ? $data['suvey_array'] : '';
-            $website_id = isset($data['website_id']) ? $data['website_id'] : 2;
-            unset($data['is_survey']);
-            unset($data['survey_name']);
-            unset($data['suvey_array']);
-            unset($data['website_id']);
-
-            if ($data['hits'] == '') {
-                $data['hits'] = 0;
-            }
-            if ($data['is_original'] == '') {
-                $data['is_original'] = 0;
-            }
-            if ($data['status'] == '') {
-                $data['status'] = 0;
-            }
-
-            $articleData = $data;
-            unset($articleData['content']);
-            $id = Article::insertGetId($articleData);
-            $articleDataContent = [
-                'article_id' => $id,
-                'content' => $data['content'],
-            ];
-            ArticleData::insertGetId($articleDataContent);
-
-            //处理投票
-            if ($is_survey == 1) {
-                //生成年月日时分秒+8位随机数
-                $uuid = date('YmdHis') . rand(10000000, 99999999);
-                var_dump($suvey_array, 'suvey_array________');
-                $suveys_array = is_array($suvey_array) ? $suvey_array : json_decode($suvey_array);
-                var_dump($suveys_array, '---------------------1');
-                var_dump($suvey_array, '---------------------2');
-                $suvey_data = [];
-                foreach ($suveys_array as $key => $value) {
-                    if ($value == '') {
-                        continue;
-                    }
-                    if (is_array($value)) {
-                        $suvey_data[] = [
-                            'sur_id' => $uuid,
-                            'art_id' => $id,
-                            'website_id' => $website_id ?? 2,
-                            'survey_name' => $survey_name,
-                            'choice_name' => $value[1],
-                            'is_other' => 1,
-                            'other_id' => 0,
-                            'results' => 0,
-
-                        ];
-                    } else {
-                        $suvey_data[] = [
-                            'sur_id' => $uuid,
-                            'art_id' => $id,
-                            'website_id' => $website_id ?? 2,
-                            'survey_name' => $survey_name,
-                            'choice_name' => $value,
-                            'is_other' => 0,
-                            'other_id' => 0,
-                            'results' => 0,
-
-                        ];
-                    }
-                    if (empty($suvey_data)) {
-                        throw new \Exception("投票数据为空");
-                    }
-
-                }
-                $result = ArticleSurvey::insert($suvey_data);
-                if (!$result) {
-                    throw new \Exception("投票失败,ArticleSurvey插入失败");
-                }
-                $result = Article::where('id', $id)->update(['survey_id' => $uuid, 'survey_name' => $survey_name, 'is_survey' => $is_survey]);
-                if (!$result) {
-                    throw new \Exception("投票失败,更新主表失败");
-                }
-            }
-
-            Db::commit();
-            return Result::success(['id' => $id]);
-        } catch (\Throwable $ex) {
-            Db::rollBack();
-            var_dump($ex->getMessage());
-            return Result::error("创建失败", 0);
-        }
-    }
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function delArticle(array $data): array
-    {
-        $result = Article::where($data)->delete();
-        //survey投票删除
-        articleSurvey::where(['art_id' => $data['id']])->delete();
-        if (!$result) {
-            return Result::error("删除失败");
-        }
-        return Result::success($result);
-    }
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function updateArticle(array $data): array
-    {
-        var_dump($data, '----------12-----------1');
-        Db::beginTransaction();
-        unset($data['user_type']);
-        // unset($data['web_site_id']);
-        unset($data['nav_add_pool_id']);
-        try {
-            //处理投票
-            $is_survey = isset($data['is_survey']) ? $data['is_survey'] : 0;
-            $survey_name = isset($data['survey_name']) ? $data['survey_name'] : '';
-            $suvey_array = isset($data['suvey_array']) ? $data['suvey_array'] : '';
-            $website_id = isset($data['website_id']) ? $data['website_id'] : 2;
-            unset($data['is_survey']);
-            unset($data['survey_name']);
-            unset($data['suvey_array']);
-            unset($data['website_id']);
-            if ($data['hits'] == '') {
-                $data['hits'] = 0;
-            }
-            if ($data['is_original'] == '') {
-                $data['is_original'] = 0;
-            }
-            if ($data['status'] == '') {
-                $data['status'] = 0;
-            }
-
-            $data['cat_arr_id'] = isset($data['cat_arr_id']) ? json_encode($data['cat_arr_id']) : '';
-            $data['tag'] = isset($data['tag']) ? json_encode($data['tag']) : '';
-            $articleData = $data;
-            unset($articleData['content']);
-            unset($articleData['status_name']);
-            unset($articleData['name']);
-            unset($articleData['content']);
-            unset($articleData['pid_arr']);
-            unset($articleData['pid']);
-            $id = Article::where(['id' => $data['id']])->update($articleData);
-            $articleDataContent = [
-                'content' => $data['content'],
-            ];
-            ArticleData::where(['article_id' => $data['id']])->update($articleDataContent);
-            //处理投票
-            $id = $data['id'];
-            $surveydata = ArticleSurvey::where(['art_id' => $data['id']])->delete();
-            var_dump($suvey_array, 'suvey_array________delete');
-
-            //处理投票
-            if ($is_survey == 1) {
-                //生成年月日时分秒+8位随机数
-                $uuid = date('YmdHis') . rand(10000000, 99999999);
-                $suveys_array = is_array($suvey_array) ? $suvey_array : json_decode($suvey_array);
-                var_dump($suveys_array, '---------------------1');
-                var_dump($suvey_array, '---------------------2');
-                $suvey_data = [];
-
-                if (is_array($suveys_array)) {
-                    foreach ($suveys_array as $key => $value) {
-                        if ($value == '') {
-                            continue;
-                        }
-                        if (is_array($value)) {
-                            $suvey_data[] = [
-                                'sur_id' => $uuid,
-                                'art_id' => $id,
-                                'website_id' => $website_id ?? 2,
-                                'survey_name' => $survey_name,
-                                'choice_name' => $value[1],
-                                'is_other' => 1,
-                                'other_id' => 0,
-                                'results' => 0,
-
-                            ];
-                        } else {
-                            $suvey_data[] = [
-                                'sur_id' => $uuid,
-                                'art_id' => $id,
-                                'website_id' => $website_id ?? 2,
-                                'survey_name' => $survey_name,
-                                'choice_name' => $value,
-                                'is_other' => 0,
-                                'other_id' => 0,
-                                'results' => 0,
-                            ];
-                        }
-                        if (empty($suvey_data)) {
-                            throw new \Exception("投票数据为空");
-                        }
-
-                    }
-                }
-                $result = ArticleSurvey::insert($suvey_data);
-                if (!$result) {
-                    throw new \Exception("投票失败");
-                }
-                $result = Article::where('id', $id)->update(['survey_id' => $uuid, 'survey_name' => $survey_name, 'is_survey' => $is_survey]);
-                if (!$result) {
-                    throw new \Exception("投票失败");
-                }
-            } else {
-                $result = Article::where('id', $id)->update(['survey_id' => '', 'survey_name' => '', 'is_survey' => 0]);
-            }
-            Db::commit();
-            return Result::success([]);
-        } catch (\Throwable $ex) {
-            Db::rollBack();
-            var_dump($ex->getMessage());
-            return Result::error("更新失败1" . $ex->getMessage(), 0);
-        }
-    }
-
-    /**
-     * 更新资讯状态
-     * @param array $data
-     * @return array
-     */
-    public function upArticleStatus(array $data): array
-    {
-        $result = Article::where(['id' => $data['id']])->update($data);
-        if ($result) {
-            return Result::success();
-        } else {
-            return Result::error("更新状态失败", 0);
-        }
-    }
-    /**
-     * 获取新闻详情
-     * @param array $data
-     * @return array
-     */
-    public function getArticleInfo(array $data): array
-    {
-        $where = [
-            'article.id' => $data['id'],
-
-            // 'article.status' => 1,
-        ];
-        $result = Article::where($where)->leftJoin("article_data", "article.id", "article_data.article_id")->first();
-        $articleSurvey = ArticleSurvey::where(['art_id' => $data['id']])->get()->all();
-        var_dump($articleSurvey, 'articleSurvey');
-        $info = $result;
-        var_dump($info, 'info');
-        // $info['survey_array'] = $articleSurvey == null ? [] : $info['survey_array'];
-        if ($result) {
-            return Result::success($info);
-        } else {
-            return Result::error("查询失败", 0);
-        }
-        return Result::success($result);
-    }
-    /**
-     *  获取头条新闻
-     * @param array $data
-     * @return array
-     */
-    public function getWebsiteArticlett(array $data): array
-    {
-
-        $category = WebsiteCategory::where('website_id', $data['website_id'])->select('category_id')->get();
-        $category = $category->toArray();
-        $result = [];
-        if ($category) {
-            $category_ids = [];
-            foreach ($category as $val) {
-                array_push($category_ids, $val['category_id']);
-            }
-            if (isset($data['placeid'])) {
-                $placeid = $data['placeid'] - 1;
-                $result = Article::where('status', 1)->where('level', $data['level'])->whereIn("catid", $category_ids)->orderBy("updated_at", "desc")->offset($placeid)->limit($data['pageSize'])->get();
-            } else {
-                $result = Article::where('status', 1)->where('level', $data['level'])->whereIn("catid", $category_ids)->orderBy("updated_at", "desc")->offset(0)->limit($data['pageSize'])->get();
-            }
-            if (empty($result)) {
-                return Result::error("暂无头条新闻", 0);
-            }
-            return Result::success($result);
-        } else {
-            return Result::error("本网站下暂无相关栏目", 0);
-        }
-    }
-    /**
-     * 获取模块新闻
-     * @param array $data
-     * @return array
-     */
-
-    public function getWebsiteModelArticles(array $data): array
-    {
-        $catid = $data['catid'];
-        $category = WebsiteCategory::where('website_id', $data['website_id'])->where('category_id', $catid)->select('category_id')->get();
-        $category = $category->toArray();
-        if (!empty($category)) {
-            $where = [
-                'status' => 1,
-                'catid' => $catid,
-            ];
-            if ($data['level'] == 1) {
-                $level = [
-                    0 => '1',
-                    1 => '4',
-                    2 => '5',
-                    3 => '0',
-                ];
-
-                $result = Article::where($where)->whereIn('level', $level)->orderBy("updated_at", "desc")->limit($data['pagesize'])->get();
-            } elseif ($data['level'] == 2) {
-                $level = '2';
-                $result = Article::where($where)->where('level', $level)->orderBy("updated_at", "desc")->limit($data['pagesize'])->get();
-
-            } else {
-                $level = '3';
-                $result = Article::where($where)->where('level', $level)->orderBy("updated_at", "desc")->limit($data['pagesize'])->get();
-            }
-            $result = $result->toArray();
-            if (!empty($result) && isset($data['placeid']) && !empty($data['placeid'])) {
-                $placeid = $data['placeid'] - 1;
-                if ($level == 2 || $level == 3) {
-                    $where = [
-                        'level' => $level,
-                    ];
-                    $result = Article::where($where)
-                        ->orderBy("updated_at", "desc")
-                        ->offset($placeid)
-                        ->limit($data['pagesize'])->get();
-                } else {
-                    $result = Article::where($where)
-                        ->whereIn('level', $level)
-                        ->offset($placeid)
-                        ->orderBy("updated_at", "desc")
-                        ->limit($data['pagesize'])->get();
-                }
-            }
-            if (empty($result)) {
-                return Result::error("此栏目暂无相关新闻", 0);
-            }
-        } else {
-            return Result::error("此网站暂无此栏目", 0);
-
-        }
-        return Result::success($result);
-
-    }
-
-    /**
-     *获取新闻列表
-     * @param array $data
-     * @return array
-     */
-    public function getWebsiteArticleList(array $data): array
-    {
-        $where[] = ['status', '=', 1];
-        if (isset($data['keyword']) && !empty($data['keyword'])) {
-            array_push($where, ['article.title', 'like', '%' . $data['keyword'] . '%']);
-        }
-        if (isset($data['catid']) && !empty($data['catid'])) {
-            if (is_array($data['catid'])) {
-                $category = WebsiteCategory::where('website_id', $data['website_id'])->whereIn('category_id', $data['catid'])->pluck('category_id');
-                array_push($where, ['catid', 'in', $data['catid']]);
-            } else {
-                $category = WebsiteCategory::where('website_id', $data['website_id'])->where('category_id', $data['catid'])->pluck('category_id');
-                array_push($where, ['catid', '=', $data['catid']]);
-            }
-            if (empty($category)) {
-                return Result::error("此网站暂无此栏目", 0);
-            }
-        }
-        // return Result::success($where);
-
-        $rep = Article::where(function ($query) use ($where) {
-            foreach ($where as $condition) {
-                if ($condition[1] === 'in') {
-                    $query->whereIn($condition[0], $condition[2]);
-                } else {
-                    $query->where($condition[0], $condition[1], $condition[2]);
-                }
-            }
-        })
-            ->orderBy("updated_at", "desc")
-            ->limit($data['pageSize'])
-            ->offset(($data['page'] - 1) * $data['pageSize'])
-            ->get();
-
-        $count = Article::where(function ($query) use ($where) {
-            foreach ($where as $condition) {
-                if ($condition[1] === 'in') {
-                    $query->whereIn($condition[0], $condition[2]);
-                } else {
-                    $query->where($condition[0], $condition[1], $condition[2]);
-                }
-            }
-        })->count();
-
-        $data = [
-            'rows' => $rep->toArray(),
-            'count' => $count,
-        ];
-
-        if (empty($rep)) {
-            return Result::error("没有信息数据");
-        }
-        return Result::success($data);
-
-    }
-    /**
-     * 前端-获取新闻详情
-     * @param array $data
-     * @return array
-     */
-    public function selectWebsiteArticleInfo(array $data): array
-    {
-        $where = [
-            'article.id' => $data['id'],
-            'article.status' => 1,
-        ];
-        $result = Article::where($where)->leftJoin("article_data", "article.id", "article_data.article_id")->first();
-        if (empty($result)) {
-            return Result::error("查询失败", 0);
-        }
-        $category = WebsiteCategory::where('website_id', $data['website_id'])->where(['category_id' => $result['catid']])->first();
-        if (empty($category)) {
-            return Result::error("查询失败", 0);
-        }
-        $result['category_id'] = $category['category_id'];
-        $result['cat_name'] = $category['name'];
-        return Result::success($result);
-    }
-    /**
-     * 前端-获取网站调查问卷
-     * @param array $data
-     * @return array
-     */
-    public function getWebsiteSurvey(array $data): array
-    {
-        if (isset($data['website_id']) && !empty($data['website_id'])) {
-            $website = Website::where('id', $data['website_id'])->first();
-            if (empty($website)) {
-                return Result::error("暂无此网站", 0);
-            }
-        }
-        if (isset($data['art_id']) && !empty($data['art_id'])) {
-            $article = Article::where('id', $data['art_id'])->where('status', 1)->first();
-            if (empty($article)) {
-                return Result::error("暂无此文章", 0);
-            }
-            // return Result::error($data,0);
-            $where['art_id'] = $data['art_id'];
-            // $query = ArticleSurvey::where('art_id',$data['art_id']);
-
-        } else {
-            $survey = ArticleSurvey::where('website_id', $data['website_id'])->orderBy('created_at')->first();
-            if (empty($survey)) {
-                return Result::error("暂无调查问卷", 0);
-            }
-            $where['sur_id'] = $survey['sur_id'];
-            // $query = ArticleSurvey::where('sur_id',$survey['sur_id']);
-        }
-        $result['survey'] = ArticleSurvey::where($where)->where('is_other', 0)
-            ->leftJoin('article', 'article_survey.art_id', 'article.id')
-            ->select('article_survey.*', 'article.survey_type')
-            ->get()->all();
-        $result['other'] = ArticleSurvey::where($where)->where('is_other', 1)->where('other_id', 0)->first();
-        $result['others'] = ArticleSurvey::where($where)->where('is_other', 1)->where('other_id', '!=', 0)->orderByDesc('created_at')->first();
-        if (empty($result)) {
-            return Result::error("此文章暂无调查问卷", 0);
-        }
-        return Result::success($result);
-    }
-    /**
-     * 前端-添加网站调查问卷选项
-     * @param array $data
-     * @return array
-     */
-    public function addWebsiteSurveyOption(array $data): array
-    {
-        if (isset($data['website_id']) && !empty($data['website_id'])) {
-            $website = Website::where('id', $data['website_id'])->first();
-            if (empty($website)) {
-                return Result::error("暂无此网站", 0);
-            }
-            if (isset($data['sur_id']) && !empty($data['sur_id'])) {
-                $survey = ArticleSurvey::where('sur_id', $data['sur_id'])->where('website_id', $data['website_id'])->where('is_other', 1)->where('other_id', 0)->first();
-                if (empty($survey)) {
-                    return Result::error("此调查问卷不可添加选项", 0);
-                }
-                if (isset($data['choice_name']) && !empty($data['choice_name'])) {
-                    $choice = [
-                        'art_id' => $survey['art_id'],
-                        'website_id' => $data['website_id'],
-                        'survey_name' => $survey['survey_name'],
-                        'choice_name' => $data['choice_name'],
-                        'sur_id' => $survey['sur_id'],
-                        'is_other' => 1,
-                        'other_id' => $survey['id'],
-
-                    ];
-                    $result = ArticleSurvey::insertGetId($choice);
-                    if (empty($result)) {
-                        return Result::error("添加失败", 0);
-                    }
-                    return Result::success($result);
-                }
-            }
-            return Result::error("添加失败", 0);
-        }
-        return Result::error("添加失败", 0);
-
-    }
-    /**
-     * 前端-调查问卷投票
-     * @param array $data
-     * @return array
-     */
-    public function addWebsiteSurveyVote(array $data): array
-    {
-
-        if (isset($data['website_id']) && !empty($data['website_id'])) {
-            $website = Website::where('id', $data['website_id'])->first();
-            if (empty($website)) {
-                return Result::error("暂无此网站", 0);
-            }
-            if (isset($data['sur_id']) && !empty($data['sur_id'])) {
-                $survey = ArticleSurvey::where('sur_id', $data['sur_id'])->where('website_id', $data['website_id'])->pluck('sur_id');
-                if (empty($survey)) {
-                    return Result::error("此调查问卷不存在", 0);
-                }
-                // return Result::success($survey);
-                // 调查问卷类型   0:单选 1:多选
-                $type = Article::where('survey_id', $data['sur_id'])->pluck('survey_type');
-                // return Result::success($type);
-                if (empty($type) || ($type[0] != 1 && $type[0] != 0)) {
-                    return Result::error("此调查问卷不可投票", 0);
-                }
-                // return Result::success($type[0]);
-                if (isset($data['choice_id']) && !empty($data['choice_id'])) {
-                    if ($type[0] == 0) {
-                        if (is_array($data['choice_id'])) {
-                            return Result::error("请选择一个选项!", 0);
-                        }
-                        $data['choice_id'] = [$data['choice_id']];
-                    } else {
-                        if (!is_array($data['choice_id'])) {
-                            return Result::error("请传递数组!", 0);
-                        }
-                    }
-                    // return Result::success($data['choice_id']);
-                    $other = ArticleSurvey::whereIn('id', $data['choice_id'])
-                        ->where('website_id', $data['website_id'])
-                        ->where('is_other', 1)
-                        ->where('other_id', 0)
-                        ->first();
-                    if (!empty($other)) {
-                        return Result::error("请选择已有的选项!", 0);
-                    }
-                    $choice['other'] = ArticleSurvey::whereIn('id', $data['choice_id'])
-                        ->where('website_id', $data['website_id'])
-                        ->where('is_other', 1)
-                        ->where('other_id', '!=', 0)
-                        ->first();
-                    // return Result::success($data);
-                    if (!empty($choice['other'])) {
-                        array_push($data['choice_id'], $choice['other']['other_id']);
-                        // return Result::success($data['choice_id']);
-                    }
-                    // return Result::success($data);
-                    $choice = ArticleSurvey::whereIn('id', $data['choice_id'])
-                        ->where('website_id', $data['website_id'])
-                        ->increment('results', 1);
-                    if (empty($choice)) {
-                        return Result::error("请选择已有的选项!", 0);
-                    }
-
-                    return Result::success($choice);
-
-                }
-                return Result::error("参数必填!");
-                // if(isset($data['choice_id']) && !empty($data['choice_id'])){
-                //     $choice = ArticleSurvey::whereIn('id',$data['choice_id'])->where('website_id',$data['website_id'])->where('is_other',1)->where('other_id',0)->first();
-                // }
-            }
-            return Result::error("此调查问卷不存在", 0);
-        }
-        return Result::error("参数必填!");
-    }
-    /**
-     * 验证导航名称是否重复
-     * @return void
-     */
-    public function checkCategoryName(array $data): array
-    {
-        $result = Category::when($data, function ($query) use ($data) {
-            if (isset($data['name']) && $data['name']) {
-                $query->where("name", $data['name']);
-            }
-            if (isset($data['id']) && $data['id']) {
-                $query->where("id", "!=", $data['id']);
-            }
-        })->first();
-        if ($result) {
-            return Result::error("已存在");
-        } else {
-            return Result::success();
-        }
-    }
-
-    //20250226  产品列表
-
-    public function getGoodList(array $data): array
-    {
-        $where = [];
-        //类型
-        if (isset($data['type_id']) && $data['type_id']) {
-            $where = [
-                'type_id' => $data['type_id'],
-            ];
-        }
-        //名称
-        if (isset($data['name']) && $data['name']) {
-            $where = [
-                'good.name' => $data['name'],
-            ];
-        }
-        $where1 = [];
-        //website_id
-        // if (isset($data['website_id']) && $data['website_id']) {
-        //     $where1 = [
-        //         'good.website_id', 'like', '%' . $data['website_id'] . '%',
-        //     ];
-        // }
-        // website_name
-        if (isset($data['website_name']) && $data['website_name']) {
-            $where1[] = ['website.website_name', 'like', '%' . $data['website_name'] . '%'];
-        }
-
-        // catid
-        if (isset($data['category_name']) && $data['category_name']) {
-            $where1[] = ['category.name', 'like', '%' . $data['category_name'] . '%'];
-        }
-
-        // $result = Good::where($where)
-        // ->orderBy("updated_at", "desc")->paginate($data['pige_size'], ['*'], 'page', $data['page']);
-        $result = Good::where($where)
-            ->when(!empty($where1), function ($query) use ($where1) {
-                return $query->where($where1);
-            })
-            ->leftJoin('district', 'good.city_id', '=', 'district.id')
-            ->leftJoin('website', 'good.website_id', '=', 'website.id')
-            ->leftJoin('category', 'good.catid', '=', 'category.id')
-            ->select('good.*', 'district.name as cityname', 'website.website_name as website_name', 'category.name as category_name')
-            ->orderBy("id", "desc")
-            ->limit($data['page_size'])
-            ->offset(($data['page'] - 1) * $data['page_size'])
-            ->get();
-        $count = Good::where($where)
-            ->leftJoin('district', 'good.city_id', '=', 'district.id')
-            ->leftJoin('website', 'good.website_id', '=', 'website.id')
-            ->leftJoin('category', 'good.catid', '=', 'category.id')
-            ->select('good.*', 'district.name as cityname', 'website.website_name as website_name', 'category.name as category_name')
-            ->orderBy("updated_at", "desc")->count();
-        $data = [
-            'rows' => $result->toArray(),
-            'count' => $count,
-        ];
-
-        if (empty($result)) {
-            return Result::error("此栏目暂无相关产品", 0);
-        }
-        return Result::success($data);
-    }
-    public function getGoodInfo(array $data): array
-    {
-        $result = Good::where('id', $data['id'])->first();
-        if (empty($result)) {
-            return Result::error("此产品不存在", 0);
-        }
-        return Result::success($result);
-    }
-    public function addGood(array $data): array
-    {
-        // unset($data['city_arr_id']);
-        // unset($data['cat_arr_id']);
-        $data['city_id'] = end($data['city_arr_id']);
-        $data['catid'] = end($data['cat_arr_id']);
-        $data['city_arr_id'] = isset($data['city_arr_id']) ? json_encode($data['city_arr_id']) : '';
-        $data['cat_arr_id'] = isset($data['cat_arr_id']) ? json_encode($data['cat_arr_id']) : '';
-        $data['imgurl'] = isset($data['imgurl']) ? json_encode($data['imgurl']) : '';
-        unset($data['imgUrl']);
-        $result = Good::insert($data);
-        if (empty($result)) {
-            return Result::error("添加失败", 0);
-        }
-        return Result::success($result);
-    }
-    public function updateGood(array $data): array
-    {
-        $data['city_id'] = end($data['city_arr_id']);
-        $data['catid'] = end($data['cat_arr_id']);
-        $data['city_arr_id'] = isset($data['city_arr_id']) ? json_encode($data['city_arr_id']) : '';
-        $data['cat_arr_id'] = isset($data['cat_arr_id']) ? json_encode($data['cat_arr_id']) : '';
-        $data['imgurl'] = isset($data['imgurl']) ? json_encode($data['imgurl']) : '';
-        //设置东八区
-        date_default_timezone_set('Asia/Shanghai');
-        $data['updated_at'] = date('Y-m-d H:i:s');
-        $result = Good::where('id', $data['id'])->update($data);
-        if (empty($result)) {
-            return Result::error("更新失败", 0);
-        }
-        return Result::success($result);
-    }
-    public function delGood(array $data): array
-    {
-        $result = Good::where('id', $data['id'])->delete();
-        if (empty($result)) {
-            return Result::error("删除失败", 0);
-        }
-        return Result::success($result);
-    }
-
-    //20250226  产品列表
-
-    /**
-     * 后端-获取网站调查问卷列表
-     * @param array $data
-     * @return array
-     */
-    public function getSurveyList(array $data): array
-    {
-        $where = [];
-        if (isset($data['survey_name']) && !empty($data['survey_name'])) {
-            array_push($where, ['survey_name', 'like', '%' . $data['survey_name'] . '%']);
-        }
-        if (isset($data['survey_type']) && $data['survey_type'] != null) {
-            array_push($where, ['survey_type', '=', $data['survey_type']]);
-        }
-        if (isset($data['is_survey']) && $data['is_survey'] != null) {
-            array_push($where, ['is_survey', '=', $data['is_survey']]);
-        }
-        // return Result::success($where);
-        if (!empty($where)) {
-            $query = Article::where($where)->whereNotNull('survey_name');
-        } else {
-            $query = Article::whereNotNull('survey_name');
-        }
-        $count = $query->count();
-        $survey = $query->orderByDesc('id')
-            ->limit($data['pageSize'])
-            ->offset(($data['page'] - 1) * $data['pageSize'])
-            ->get();
-        if (empty($survey->toArray())) {
-            return Result::error("暂无调查问卷!", 0);
-        }
-        $result = [
-            'rows' => $survey,
-            'count' => $count,
-        ];
-        return Result::success($result);
-    }
-    /**
-     * 后端-获取网站调查问卷详情
-     * @param array $data
-     * @return array
-     */
-    public function getSurveyInfo(array $data): array
-    {
-        if (isset($data['sur_id']) && !empty($data['sur_id'])) {
-            $where = ['sur_id' => $data['sur_id']];
-            $choose = ArticleSurvey::where($where)->where('is_other', 0)
-                ->leftJoin('article', 'article_survey.art_id', 'article.id')
-                ->select('article_survey.*', 'article.survey_type')
-                ->get()->all();
-            if (empty($choose)) {
-                return Result::error("此调查问卷不存在", 0);
-            }
-            $resultsArray = array_column($choose, 'results');
-            $total = array_sum($resultsArray);
-            $other = ArticleSurvey::where($where)->where('is_other', 1)->where('other_id', 0)->first();
-            $others = ArticleSurvey::where($where)->where('is_other', 1)->where('other_id', '!=', 0)->orderByDesc('created_at')->get()->all();
-            // $total = 0;
-            if (!empty($other)) {
-                $total = $total + $other['results'];
-                $other['choice_name'] = $other['choice_name'] . '(其他)';
-                if (!empty($others)) {
-                    $other['hasChildren'] = true;
-                    // array_push($other,['hasChildren','=',true]);
-                    $other['children'] = $others;
-                    $other_choices = [$other->toArray()];
-                    $mer_choice = array_merge($choose, $other_choices);
-                    $value_choice = array_values($mer_choice);
-                } else {
-                    // return Result::error('1111');
-                    $other_choices = [$other->toArray()];
-                    $other_choices = array_merge($choose, $other_choices);
-                    $value_choice = array_values($other_choices);
-                    // return Result::success($result);
-                }
-            } else {
-                $value_choice = $choose;
-            }
-            $result = [
-                'choose' => $value_choice,
-                'total' => $total,
-            ];
-        }
-        return Result::success($result);
-    }
-}
+<?php
+namespace App\JsonRpc;
+
+use App\Model\Article;
+use App\Model\ArticleData;
+use App\Model\Category;
+use App\Model\Website;
+use App\Model\WebsiteCategory;
+use App\Model\ArticleSurvey;
+use App\Model\District;
+use App\Model\Good;
+
+use App\Model\JobRecruiting;
+use App\Model\JobIndustry;
+use App\Model\JobPosition;
+use App\Model\JobNature;
+use App\Model\JobEnum;
+use App\Model\User;
+use App\Model\UserRole;
+use App\Model\News;
+use App\Model\UserInfo;
+use App\Model\WebsiteGroup;
+use Hyperf\DbConnection\Db;
+use Hyperf\RpcServer\Annotation\RpcService;
+use App\Tools\Result;
+use Directory;
+use Ramsey\Uuid\Uuid;
+use Hyperf\Utils\Random;
+#[RpcService(name: "NewsService", protocol: "jsonrpc-http", server: "jsonrpc-http")]
+class NewsService implements NewsServiceInterface
+{
+
+    /**
+     * 获取导航池列表
+     * @param array $data
+     * @return array
+     */
+    public function getCategoryList(array $data): array
+    {
+        $where = [];
+        if (isset($data['name']) && $data['name']) {
+            array_push($where, ['category.name', 'like', '%' . $data['name'] . '%']);
+        }
+        if (isset($data['department_id']) && $data['department_id']) {
+            array_push($where, ['category.department_id', '=', $data['department_id']]);
+        }
+        $city_id = '';
+        if (isset($data['city_id']) && $data['city_id']) {
+            $city_id = intval($data['city_id']);
+        }
+        $rep = Category::where($where)
+            ->when($city_id, function ($query) use ($city_id) {
+                if (isset($city_id) && $city_id) {
+                    $query->whereJsonContains("category.city_arr_id", $city_id);
+                }
+            })
+            ->leftJoin('district', 'category.city_id', 'district.id')
+            ->leftJoin('department', 'category.department_id', 'department.id')
+            ->select("category.*", "district.name as city_name", "department.name as department_name")
+            ->limit($data['pageSize'])->orderByDesc('category.updated_at')->offset(($data['page'] - 1) * $data['pageSize'])->get();
+        $count = Category::where($where)->when($city_id, function ($query) use ($city_id) {
+            if (isset($city_id) && $city_id) {
+                $query->whereJsonContains("category.city_arr_id", $city_id);
+            }
+        })->count();
+        $data = [
+            'rows' => $rep->toArray(),
+            'count' => $count,
+        ];
+        if (empty($rep->toArray())) {
+            return Result::error("没有导航池数据");
+        }
+        return Result::success($data);
+    }
+    public function myCategoryList(array $data): array
+    {
+        $sszq = $data['sszq'] ?? '';
+        unset($data['sszq']);
+        //1,2,3 根据这些webid,。从website_category表中取出对应的分类id,然后从category表中取出分类信息
+        $catorytids = WebsiteCategory::whereIn('website_id', explode(',', $sszq))->get()->pluck('category_id')->toArray();
+        $where[] = [
+            'pid', '=', $data['pid'],
+        ];
+        if (isset($data['name'])) {
+            array_push($where, ['category.name', 'like', '%' . $data['name'] . '%']);
+        }
+        var_dump($where);
+        //根据分类id,从category表中取出分类信息
+        $result = Category::where($where)
+            ->whereIn('category.id', $catorytids)
+            ->select('category.*', 'category.id as category_id')->get();
+        if (empty($result)) {
+            return Result::error("没有栏目数据");
+        }
+        return Result::success($result);
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function categoryList(array $data): array
+    {
+        $where[] = [
+            'pid', '=', $data['pid'],
+        ];
+        if (isset($data['name'])) {
+            array_push($where, ['category.name', 'like', '%' . $data['name'] . '%']);
+        }
+        var_dump($where);
+        $result = Category::where($where)->select('category.*', 'category.id as category_id')->get();
+        if (empty($result)) {
+            return Result::error("没有栏目数据");
+        }
+        return Result::success($result);
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function addCategory(array $data): array
+    {
+        $id = Category::insertGetId($data);
+        if (empty($id)) {
+            return Result::error("添加失败");
+        }
+        return Result::success(['id' => $id]);
+    }
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function delCategory(array $data): array
+    {
+        $categoryList = Category::where(['pid' => $data['id']])->get();
+        var_dump("分类列表:", $data, $categoryList);
+        if ($categoryList->toArray()) {
+            return Result::error("分类下面有子分类不能删除");
+        }
+        $articleList = Article::where(['catid' => $data['id']])->get();
+        var_dump("文章列表:", $articleList);
+        if ($articleList->toArray()) {
+            return Result::error("分类下面有资讯不能删除");
+        }
+        $result = Category::where($data)->delete();
+        if (!$result) {
+            return Result::error("删除失败");
+        }
+        return Result::success($result);
+    }
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function updateCategory(array $data): array
+    {
+        $where = [
+            'id' => $data['id'],
+        ];
+        $result = Category::where($where)->update($data);
+        if ($result) {
+            return Result::success($result);
+        } else {
+            return Result::error("更新失败");
+        }
+    }
+
+    /**
+     * 获取导航池信息
+     * @param array $data
+     * @return array
+     */
+    public function getCategoryInfo(array $data): array
+    {
+        $where = [
+            'id' => $data['id'],
+        ];
+        $result = Category::where($where)->first();
+        if ($result) {
+            return Result::success($result);
+        } else {
+            return Result::error("更新失败");
+        }
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getArticleList(array $data): array
+    {
+        //判断是否是管理员'1:个人会员 2:政务会员 3:企业会员 4:调研员 10000:管理员 20000:游客(小程序)'
+        $type_id = $data['type_id'];
+        unset($data['type_id']);
+        $user_id = $data['user_id'];
+        unset($data['user_id']);
+
+        $where = [];
+
+        if (isset($data['title']) && $data['title']) {
+            array_push($where, ['article.title', 'like', '%' . $data['title'] . '%']);
+        }
+        if (isset($data['category_name']) && $data['category_name']) {
+            array_push($where, ['category.name', 'like', '%' . $data['category_name'] . '%']);
+        }
+        if (isset($data['author']) && $data['author']) {
+            array_push($where, ['article.author', '=', $data['author']]);
+        }
+        if (isset($data['islink']) && $data['islink'] !== "") {
+            array_push($where, ['article.islink', '=', $data['islink']]);
+        }
+        if (isset($data['status']) && $data['status'] !== "") {
+            array_push($where, ['article.status', '=', $data['status']]);
+        }
+        //不是管理员展示个人数据;
+        if ($type_id != 10000) {
+            $where[] = ['article.admin_user_id', '=', $user_id];
+        }
+
+        $rep = Article::where($where)
+            ->whereNotIn('article.status', [404])
+            ->leftJoin('category', 'article.catid', 'category.id')
+            ->select("article.*", "category.name as category_name")
+            ->orderBy("article.id", "desc")
+            ->limit($data['pageSize'])
+            ->offset(($data['page'] - 1) * $data['pageSize'])->get();
+        $count = Article::where($where)->whereNotIn('article.status', [404])
+            ->leftJoin('category', 'article.catid', 'category.id')->count();
+        $data = [
+            'rows' => $rep->toArray(),
+            'count' => $count,
+        ];
+        if (empty($rep)) {
+            return Result::error("没有信息数据");
+        }
+        return Result::success($data);
+    }
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function addArticle(array $data): array
+    {
+        var_dump($data, '----------12-----------1');
+        var_dump($data, '----------12-----------1');
+        unset($data['user_type']);
+        // unset($data['web_site_id']);
+        unset($data['nav_add_pool_id']);
+        // $data['cat_arr_id'] = is_string($data['cat_arr_id']) ? json_encode($data['cat_arr_id']) : '';
+        Db::beginTransaction();
+        try {
+            //处理投票
+            $is_survey = isset($data['is_survey']) ? $data['is_survey'] : 0;
+            $survey_name = isset($data['survey_name']) ? $data['survey_name'] : '';
+            $suvey_array = isset($data['suvey_array']) ? $data['suvey_array'] : '';
+            $website_id = isset($data['website_id']) ? $data['website_id'] : 2;
+            unset($data['is_survey']);
+            unset($data['survey_name']);
+            unset($data['suvey_array']);
+            unset($data['website_id']);
+
+            if ($data['hits'] == '') {
+                $data['hits'] = 0;
+            }
+            if ($data['is_original'] == '') {
+                $data['is_original'] = 0;
+            }
+            if ($data['status'] == '') {
+                $data['status'] = 0;
+            }
+
+            $articleData = $data;
+            unset($articleData['content']);
+            $id = Article::insertGetId($articleData);
+            $articleDataContent = [
+                'article_id' => $id,
+                'content' => $data['content'],
+            ];
+            ArticleData::insertGetId($articleDataContent);
+
+            //处理投票
+            if ($is_survey == 1) {
+                //生成年月日时分秒+8位随机数
+                $uuid = date('YmdHis') . rand(10000000, 99999999);
+                var_dump($suvey_array, 'suvey_array________');
+                $suveys_array = is_array($suvey_array) ? $suvey_array : json_decode($suvey_array);
+                var_dump($suveys_array, '---------------------1');
+                var_dump($suvey_array, '---------------------2');
+                $suvey_data = [];
+                foreach ($suveys_array as $key => $value) {
+                    if ($value == '') {
+                        continue;
+                    }
+                    if (is_array($value)) {
+                        $suvey_data[] = [
+                            'sur_id' => $uuid,
+                            'art_id' => $id,
+                            'website_id' => $website_id ?? 2,
+                            'survey_name' => $survey_name,
+                            'choice_name' => $value[1],
+                            'is_other' => 1,
+                            'other_id' => 0,
+                            'results' => 0,
+
+                        ];
+                    } else {
+                        $suvey_data[] = [
+                            'sur_id' => $uuid,
+                            'art_id' => $id,
+                            'website_id' => $website_id ?? 2,
+                            'survey_name' => $survey_name,
+                            'choice_name' => $value,
+                            'is_other' => 0,
+                            'other_id' => 0,
+                            'results' => 0,
+
+                        ];
+                    }
+                    if (empty($suvey_data)) {
+                        throw new \Exception("投票数据为空");
+                    }
+
+                }
+                $result = ArticleSurvey::insert($suvey_data);
+                if (!$result) {
+                    throw new \Exception("投票失败,ArticleSurvey插入失败");
+                }
+                $result = Article::where('id', $id)->update(['survey_id' => $uuid, 'survey_name' => $survey_name, 'is_survey' => $is_survey]);
+                if (!$result) {
+                    throw new \Exception("投票失败,更新主表失败");
+                }
+            }
+
+            Db::commit();
+            return Result::success(['id' => $id]);
+        } catch (\Throwable $ex) {
+            Db::rollBack();
+            var_dump($ex->getMessage());
+            return Result::error("创建失败", 0);
+        }
+    }
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function delArticle(array $data): array
+    {
+        $result = Article::where($data)->delete();
+        //survey投票删除
+        articleSurvey::where(['art_id' => $data['id']])->delete();
+        if (!$result) {
+            return Result::error("删除失败");
+        }
+        return Result::success($result);
+    }
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function updateArticle(array $data): array
+    {
+        var_dump($data, '----------12-----------1');
+        Db::beginTransaction();
+        unset($data['user_type']);
+        // unset($data['web_site_id']);
+        unset($data['nav_add_pool_id']);
+        try {
+            //处理投票
+            $is_survey = isset($data['is_survey']) ? $data['is_survey'] : 0;
+            $survey_name = isset($data['survey_name']) ? $data['survey_name'] : '';
+            $suvey_array = isset($data['suvey_array']) ? $data['suvey_array'] : '';
+            $website_id = isset($data['website_id']) ? $data['website_id'] : 2;
+            unset($data['is_survey']);
+            unset($data['survey_name']);
+            unset($data['suvey_array']);
+            unset($data['website_id']);
+            if ($data['hits'] == '') {
+                $data['hits'] = 0;
+            }
+            if ($data['is_original'] == '') {
+                $data['is_original'] = 0;
+            }
+            if ($data['status'] == '') {
+                $data['status'] = 0;
+            }
+
+            $data['cat_arr_id'] = isset($data['cat_arr_id']) ? json_encode($data['cat_arr_id']) : '';
+            $data['tag'] = isset($data['tag']) ? json_encode($data['tag']) : '';
+            $articleData = $data;
+            unset($articleData['content']);
+            unset($articleData['status_name']);
+            unset($articleData['name']);
+            unset($articleData['content']);
+            unset($articleData['pid_arr']);
+            unset($articleData['pid']);
+            $id = Article::where(['id' => $data['id']])->update($articleData);
+            $articleDataContent = [
+                'content' => $data['content'],
+            ];
+            ArticleData::where(['article_id' => $data['id']])->update($articleDataContent);
+            //处理投票
+            $id = $data['id'];
+            $surveydata = ArticleSurvey::where(['art_id' => $data['id']])->delete();
+            var_dump($suvey_array, 'suvey_array________delete');
+
+            //处理投票
+            if ($is_survey == 1) {
+                //生成年月日时分秒+8位随机数
+                $uuid = date('YmdHis') . rand(10000000, 99999999);
+                $suveys_array = is_array($suvey_array) ? $suvey_array : json_decode($suvey_array);
+                var_dump($suveys_array, '---------------------1');
+                var_dump($suvey_array, '---------------------2');
+                $suvey_data = [];
+
+                if (is_array($suveys_array)) {
+                    foreach ($suveys_array as $key => $value) {
+                        if ($value == '') {
+                            continue;
+                        }
+                        if (is_array($value)) {
+                            $suvey_data[] = [
+                                'sur_id' => $uuid,
+                                'art_id' => $id,
+                                'website_id' => $website_id ?? 2,
+                                'survey_name' => $survey_name,
+                                'choice_name' => $value[1],
+                                'is_other' => 1,
+                                'other_id' => 0,
+                                'results' => 0,
+
+                            ];
+                        } else {
+                            $suvey_data[] = [
+                                'sur_id' => $uuid,
+                                'art_id' => $id,
+                                'website_id' => $website_id ?? 2,
+                                'survey_name' => $survey_name,
+                                'choice_name' => $value,
+                                'is_other' => 0,
+                                'other_id' => 0,
+                                'results' => 0,
+                            ];
+                        }
+                        if (empty($suvey_data)) {
+                            throw new \Exception("投票数据为空");
+                        }
+
+                    }
+                }
+                $result = ArticleSurvey::insert($suvey_data);
+                if (!$result) {
+                    throw new \Exception("投票失败");
+                }
+                $result = Article::where('id', $id)->update(['survey_id' => $uuid, 'survey_name' => $survey_name, 'is_survey' => $is_survey]);
+                if (!$result) {
+                    throw new \Exception("投票失败");
+                }
+            } else {
+                $result = Article::where('id', $id)->update(['survey_id' => '', 'survey_name' => '', 'is_survey' => 0]);
+            }
+            Db::commit();
+            return Result::success([]);
+        } catch (\Throwable $ex) {
+            Db::rollBack();
+            var_dump($ex->getMessage());
+            return Result::error("更新失败1" . $ex->getMessage(), 0);
+        }
+    }
+
+    /**
+     * 更新资讯状态
+     * @param array $data
+     * @return array
+     */
+    public function upArticleStatus(array $data): array
+    {
+        $result = Article::where(['id' => $data['id']])->update($data);
+        if ($result) {
+            return Result::success();
+        } else {
+            return Result::error("更新状态失败", 0);
+        }
+    }
+    /**
+     * 获取新闻详情
+     * @param array $data
+     * @return array
+     */
+    public function getArticleInfo(array $data): array
+    {
+        $where = [
+            'article.id' => $data['id'],
+
+            // 'article.status' => 1,
+        ];
+        $result = Article::where($where)->leftJoin("article_data", "article.id", "article_data.article_id")->first();
+        $articleSurvey = ArticleSurvey::where(['art_id' => $data['id']])->get()->all();
+        var_dump($articleSurvey, 'articleSurvey');
+        $info = $result;
+        var_dump($info, 'info');
+        // $info['survey_array'] = $articleSurvey == null ? [] : $info['survey_array'];
+        if ($result) {
+            return Result::success($info);
+        } else {
+            return Result::error("查询失败", 0);
+        }
+        return Result::success($result);
+    }
+    /**
+     *  获取头条新闻
+     * @param array $data
+     * @return array
+     */
+    public function getWebsiteArticlett(array $data): array
+    {
+
+        $category = WebsiteCategory::where('website_id', $data['website_id'])->select('category_id')->get();
+        $category = $category->toArray();
+        $result = [];
+        if ($category) {
+            $category_ids = [];
+            foreach ($category as $val) {
+                array_push($category_ids, $val['category_id']);
+            }
+            if (isset($data['placeid'])) {
+                $placeid = $data['placeid'] - 1;
+                $result = Article::where('status', 1)->where('level', $data['level'])->whereIn("catid", $category_ids)->orderBy("updated_at", "desc")->offset($placeid)->limit($data['pageSize'])->get();
+            } else {
+                $result = Article::where('status', 1)->where('level', $data['level'])->whereIn("catid", $category_ids)->orderBy("updated_at", "desc")->offset(0)->limit($data['pageSize'])->get();
+            }
+            if (empty($result)) {
+                return Result::error("暂无头条新闻", 0);
+            }
+            return Result::success($result);
+        } else {
+            return Result::error("本网站下暂无相关栏目", 0);
+        }
+    }
+    /**
+     * 获取模块新闻
+     * @param array $data
+     * @return array
+     */
+
+    public function getWebsiteModelArticles(array $data): array
+    {
+        $catid = $data['catid'];
+        $category = WebsiteCategory::where('website_id', $data['website_id'])->where('category_id', $catid)->select('category_id')->get();
+        $category = $category->toArray();
+        if (!empty($category)) {
+            $where = [
+                'status' => 1,
+                'catid' => $catid,
+            ];
+            if ($data['level'] == 1) {
+                $level = [
+                    0 => '1',
+                    1 => '4',
+                    2 => '5',
+                    3 => '0',
+                ];
+
+                $result = Article::where($where)->whereIn('level', $level)->orderBy("updated_at", "desc")->limit($data['pagesize'])->get();
+            } elseif ($data['level'] == 2) {
+                $level = '2';
+                $result = Article::where($where)->where('level', $level)->orderBy("updated_at", "desc")->limit($data['pagesize'])->get();
+
+            } else {
+                $level = '3';
+                $result = Article::where($where)->where('level', $level)->orderBy("updated_at", "desc")->limit($data['pagesize'])->get();
+            }
+            $result = $result->toArray();
+            if (!empty($result) && isset($data['placeid']) && !empty($data['placeid'])) {
+                $placeid = $data['placeid'] - 1;
+                if ($level == 2 || $level == 3) {
+                    $where = [
+                        'level' => $level,
+                    ];
+                    $result = Article::where($where)
+                        ->orderBy("updated_at", "desc")
+                        ->offset($placeid)
+                        ->limit($data['pagesize'])->get();
+                } else {
+                    $result = Article::where($where)
+                        ->whereIn('level', $level)
+                        ->offset($placeid)
+                        ->orderBy("updated_at", "desc")
+                        ->limit($data['pagesize'])->get();
+                }
+            }
+            if (empty($result)) {
+                return Result::error("此栏目暂无相关新闻", 0);
+            }
+        } else {
+            return Result::error("此网站暂无此栏目", 0);
+
+        }
+        return Result::success($result);
+
+    }
+
+    /**
+     *获取新闻列表
+     * @param array $data
+     * @return array
+     */
+    public function getWebsiteArticleList(array $data): array
+    {
+        $where[] = ['status', '=', 1];
+        if (isset($data['keyword']) && !empty($data['keyword'])) {
+            array_push($where, ['article.title', 'like', '%' . $data['keyword'] . '%']);
+        }
+        if (isset($data['catid']) && !empty($data['catid'])) {
+            if (is_array($data['catid'])) {
+                $category = WebsiteCategory::where('website_id', $data['website_id'])->whereIn('category_id', $data['catid'])->pluck('category_id');
+                array_push($where, ['catid', 'in', $data['catid']]);
+            } else {
+                $category = WebsiteCategory::where('website_id', $data['website_id'])->where('category_id', $data['catid'])->pluck('category_id');
+                array_push($where, ['catid', '=', $data['catid']]);
+            }
+            if (empty($category)) {
+                return Result::error("此网站暂无此栏目", 0);
+            }
+        }
+        // return Result::success($where);
+
+        $rep = Article::where(function ($query) use ($where) {
+            foreach ($where as $condition) {
+                if ($condition[1] === 'in') {
+                    $query->whereIn($condition[0], $condition[2]);
+                } else {
+                    $query->where($condition[0], $condition[1], $condition[2]);
+                }
+            }
+        })
+            ->orderBy("updated_at", "desc")
+            ->limit($data['pageSize'])
+            ->offset(($data['page'] - 1) * $data['pageSize'])
+            ->get();
+
+        $count = Article::where(function ($query) use ($where) {
+            foreach ($where as $condition) {
+                if ($condition[1] === 'in') {
+                    $query->whereIn($condition[0], $condition[2]);
+                } else {
+                    $query->where($condition[0], $condition[1], $condition[2]);
+                }
+            }
+        })->count();
+
+        $data = [
+            'rows' => $rep->toArray(),
+            'count' => $count,
+        ];
+
+        if (empty($rep)) {
+            return Result::error("没有信息数据");
+        }
+        return Result::success($data);
+
+    }
+    /**
+     * 前端-获取新闻详情
+     * @param array $data
+     * @return array
+     */
+    public function selectWebsiteArticleInfo(array $data): array
+    {
+        $where = [
+            'article.id' => $data['id'],
+            'article.status' => 1,
+        ];
+        $result = Article::where($where)->leftJoin("article_data", "article.id", "article_data.article_id")->first();
+        if (empty($result)) {
+            return Result::error("查询失败", 0);
+        }
+        $category = WebsiteCategory::where('website_id', $data['website_id'])->where(['category_id' => $result['catid']])->first();
+        if (empty($category)) {
+            return Result::error("查询失败", 0);
+        }
+        $result['category_id'] = $category['category_id'];
+        $result['cat_name'] = $category['name'];
+        return Result::success($result);
+    }
+    /**
+     * 前端-获取网站调查问卷
+     * @param array $data
+     * @return array
+     */
+    public function getWebsiteSurvey(array $data): array
+    {
+        if (isset($data['website_id']) && !empty($data['website_id'])) {
+            $website = Website::where('id', $data['website_id'])->first();
+            if (empty($website)) {
+                return Result::error("暂无此网站", 0);
+            }
+        }
+        if (isset($data['art_id']) && !empty($data['art_id'])) {
+            $article = Article::where('id', $data['art_id'])->where('status', 1)->first();
+            if (empty($article)) {
+                return Result::error("暂无此文章", 0);
+            }
+            // return Result::error($data,0);
+            $where['art_id'] = $data['art_id'];
+            // $query = ArticleSurvey::where('art_id',$data['art_id']);
+
+        } else {
+            $survey = ArticleSurvey::where('website_id', $data['website_id'])->orderBy('created_at')->first();
+            if (empty($survey)) {
+                return Result::error("暂无调查问卷", 0);
+            }
+            $where['sur_id'] = $survey['sur_id'];
+            // $query = ArticleSurvey::where('sur_id',$survey['sur_id']);
+        }
+        $result['survey'] = ArticleSurvey::where($where)->where('is_other', 0)
+            ->leftJoin('article', 'article_survey.art_id', 'article.id')
+            ->select('article_survey.*', 'article.survey_type')
+            ->get()->all();
+        $result['other'] = ArticleSurvey::where($where)->where('is_other', 1)->where('other_id', 0)->first();
+        $result['others'] = ArticleSurvey::where($where)->where('is_other', 1)->where('other_id', '!=', 0)->orderByDesc('created_at')->first();
+        if (empty($result)) {
+            return Result::error("此文章暂无调查问卷", 0);
+        }
+        return Result::success($result);
+    }
+    /**
+     * 前端-添加网站调查问卷选项
+     * @param array $data
+     * @return array
+     */
+    public function addWebsiteSurveyOption(array $data): array
+    {
+        if (isset($data['website_id']) && !empty($data['website_id'])) {
+            $website = Website::where('id', $data['website_id'])->first();
+            if (empty($website)) {
+                return Result::error("暂无此网站", 0);
+            }
+            if (isset($data['sur_id']) && !empty($data['sur_id'])) {
+                $survey = ArticleSurvey::where('sur_id', $data['sur_id'])->where('website_id', $data['website_id'])->where('is_other', 1)->where('other_id', 0)->first();
+                if (empty($survey)) {
+                    return Result::error("此调查问卷不可添加选项", 0);
+                }
+                if (isset($data['choice_name']) && !empty($data['choice_name'])) {
+                    $choice = [
+                        'art_id' => $survey['art_id'],
+                        'website_id' => $data['website_id'],
+                        'survey_name' => $survey['survey_name'],
+                        'choice_name' => $data['choice_name'],
+                        'sur_id' => $survey['sur_id'],
+                        'is_other' => 1,
+                        'other_id' => $survey['id'],
+
+                    ];
+                    $result = ArticleSurvey::insertGetId($choice);
+                    if (empty($result)) {
+                        return Result::error("添加失败", 0);
+                    }
+                    return Result::success($result);
+                }
+            }
+            return Result::error("添加失败", 0);
+        }
+        return Result::error("添加失败", 0);
+
+    }
+    /**
+     * 前端-调查问卷投票
+     * @param array $data
+     * @return array
+     */
+    public function addWebsiteSurveyVote(array $data): array
+    {
+
+        if (isset($data['website_id']) && !empty($data['website_id'])) {
+            $website = Website::where('id', $data['website_id'])->first();
+            if (empty($website)) {
+                return Result::error("暂无此网站", 0);
+            }
+            if (isset($data['sur_id']) && !empty($data['sur_id'])) {
+                $survey = ArticleSurvey::where('sur_id', $data['sur_id'])->where('website_id', $data['website_id'])->pluck('sur_id');
+                if (empty($survey)) {
+                    return Result::error("此调查问卷不存在", 0);
+                }
+                // return Result::success($survey);
+                // 调查问卷类型   0:单选 1:多选
+                $type = Article::where('survey_id', $data['sur_id'])->pluck('survey_type');
+                // return Result::success($type);
+                if (empty($type) || ($type[0] != 1 && $type[0] != 0)) {
+                    return Result::error("此调查问卷不可投票", 0);
+                }
+                // return Result::success($type[0]);
+                if (isset($data['choice_id']) && !empty($data['choice_id'])) {
+                    if ($type[0] == 0) {
+                        if (is_array($data['choice_id'])) {
+                            return Result::error("请选择一个选项!", 0);
+                        }
+                        $data['choice_id'] = [$data['choice_id']];
+                    } else {
+                        if (!is_array($data['choice_id'])) {
+                            return Result::error("请传递数组!", 0);
+                        }
+                    }
+                    // return Result::success($data['choice_id']);
+                    $other = ArticleSurvey::whereIn('id', $data['choice_id'])
+                        ->where('website_id', $data['website_id'])
+                        ->where('is_other', 1)
+                        ->where('other_id', 0)
+                        ->first();
+                    if (!empty($other)) {
+                        return Result::error("请选择已有的选项!", 0);
+                    }
+                    $choice['other'] = ArticleSurvey::whereIn('id', $data['choice_id'])
+                        ->where('website_id', $data['website_id'])
+                        ->where('is_other', 1)
+                        ->where('other_id', '!=', 0)
+                        ->first();
+                    // return Result::success($data);
+                    if (!empty($choice['other'])) {
+                        array_push($data['choice_id'], $choice['other']['other_id']);
+                        // return Result::success($data['choice_id']);
+                    }
+                    // return Result::success($data);
+                    $choice = ArticleSurvey::whereIn('id', $data['choice_id'])
+                        ->where('website_id', $data['website_id'])
+                        ->increment('results', 1);
+                    if (empty($choice)) {
+                        return Result::error("请选择已有的选项!", 0);
+                    }
+
+                    return Result::success($choice);
+
+                }
+                return Result::error("参数必填!");
+                // if(isset($data['choice_id']) && !empty($data['choice_id'])){
+                //     $choice = ArticleSurvey::whereIn('id',$data['choice_id'])->where('website_id',$data['website_id'])->where('is_other',1)->where('other_id',0)->first();
+                // }
+            }
+            return Result::error("此调查问卷不存在", 0);
+        }
+        return Result::error("参数必填!");
+    }
+    /**
+     * 验证导航名称是否重复
+     * @return void
+     */
+    public function checkCategoryName(array $data): array
+    {
+        $result = Category::when($data, function ($query) use ($data) {
+            if (isset($data['name']) && $data['name']) {
+                $query->where("name", $data['name']);
+            }
+            if (isset($data['id']) && $data['id']) {
+                $query->where("id", "!=", $data['id']);
+            }
+        })->first();
+        if ($result) {
+            return Result::error("已存在");
+        } else {
+            return Result::success();
+        }
+    }
+
+    //20250226  产品列表
+
+    public function getGoodList(array $data): array
+    {
+        $where = [];
+        //类型
+        if (isset($data['type_id']) && $data['type_id']) {
+            $where = [
+                'type_id' => $data['type_id'],
+            ];
+        }
+        //名称
+        if (isset($data['name']) && $data['name']) {
+            $where = [
+                'good.name' => $data['name'],
+            ];
+        }
+        $where1 = [];
+        //website_id
+        // if (isset($data['website_id']) && $data['website_id']) {
+        //     $where1 = [
+        //         'good.website_id', 'like', '%' . $data['website_id'] . '%',
+        //     ];
+        // }
+        // website_name
+        if (isset($data['website_name']) && $data['website_name']) {
+            $where1[] = ['website.website_name', 'like', '%' . $data['website_name'] . '%'];
+        }
+
+        // catid
+        if (isset($data['category_name']) && $data['category_name']) {
+            $where1[] = ['category.name', 'like', '%' . $data['category_name'] . '%'];
+        }
+
+        // $result = Good::where($where)
+        // ->orderBy("updated_at", "desc")->paginate($data['pige_size'], ['*'], 'page', $data['page']);
+        $result = Good::where($where)
+            ->when(!empty($where1), function ($query) use ($where1) {
+                return $query->where($where1);
+            })
+            ->leftJoin('district', 'good.city_id', '=', 'district.id')
+            ->leftJoin('website', 'good.website_id', '=', 'website.id')
+            ->leftJoin('category', 'good.catid', '=', 'category.id')
+            ->select('good.*', 'district.name as cityname', 'website.website_name as website_name', 'category.name as category_name')
+            ->orderBy("id", "desc")
+            ->limit($data['page_size'])
+            ->offset(($data['page'] - 1) * $data['page_size'])
+            ->get();
+        $count = Good::where($where)
+            ->leftJoin('district', 'good.city_id', '=', 'district.id')
+            ->leftJoin('website', 'good.website_id', '=', 'website.id')
+            ->leftJoin('category', 'good.catid', '=', 'category.id')
+            ->select('good.*', 'district.name as cityname', 'website.website_name as website_name', 'category.name as category_name')
+            ->orderBy("updated_at", "desc")->count();
+        $data = [
+            'rows' => $result->toArray(),
+            'count' => $count,
+        ];
+
+        if (empty($result)) {
+            return Result::error("此栏目暂无相关产品", 0);
+        }
+        return Result::success($data);
+    }
+    public function getGoodInfo(array $data): array
+    {
+        $result = Good::where('id', $data['id'])->first();
+        if (empty($result)) {
+            return Result::error("此产品不存在", 0);
+        }
+        return Result::success($result);
+    }
+    public function addGood(array $data): array
+    {
+        // unset($data['city_arr_id']);
+        // unset($data['cat_arr_id']);
+        $data['city_id'] = end($data['city_arr_id']);
+        $data['catid'] = end($data['cat_arr_id']);
+        $data['city_arr_id'] = isset($data['city_arr_id']) ? json_encode($data['city_arr_id']) : '';
+        $data['cat_arr_id'] = isset($data['cat_arr_id']) ? json_encode($data['cat_arr_id']) : '';
+        $data['imgurl'] = isset($data['imgurl']) ? json_encode($data['imgurl']) : '';
+        unset($data['imgUrl']);
+        $result = Good::insert($data);
+        if (empty($result)) {
+            return Result::error("添加失败", 0);
+        }
+        return Result::success($result);
+    }
+    public function updateGood(array $data): array
+    {
+        $data['city_id'] = end($data['city_arr_id']);
+        $data['catid'] = end($data['cat_arr_id']);
+        $data['city_arr_id'] = isset($data['city_arr_id']) ? json_encode($data['city_arr_id']) : '';
+        $data['cat_arr_id'] = isset($data['cat_arr_id']) ? json_encode($data['cat_arr_id']) : '';
+        $data['imgurl'] = isset($data['imgurl']) ? json_encode($data['imgurl']) : '';
+        //设置东八区
+        date_default_timezone_set('Asia/Shanghai');
+        $data['updated_at'] = date('Y-m-d H:i:s');
+        $result = Good::where('id', $data['id'])->update($data);
+        if (empty($result)) {
+            return Result::error("更新失败", 0);
+        }
+        return Result::success($result);
+    }
+    public function delGood(array $data): array
+    {
+        $result = Good::where('id', $data['id'])->delete();
+        if (empty($result)) {
+            return Result::error("删除失败", 0);
+        }
+        return Result::success($result);
+    }
+
+    //20250226  产品列表
+
+    /**
+     * 后端-获取网站调查问卷列表
+     * @param array $data
+     * @return array
+     */
+    public function getSurveyList(array $data): array
+    {
+        $where = [];
+        if (isset($data['survey_name']) && !empty($data['survey_name'])) {
+            array_push($where, ['survey_name', 'like', '%' . $data['survey_name'] . '%']);
+        }
+        if (isset($data['survey_type']) && $data['survey_type'] != null) {
+            array_push($where, ['survey_type', '=', $data['survey_type']]);
+        }
+        if (isset($data['is_survey']) && $data['is_survey'] != null) {
+            array_push($where, ['is_survey', '=', $data['is_survey']]);
+        }
+        // return Result::success($where);
+        if (!empty($where)) {
+            $query = Article::where($where)->whereNotNull('survey_name');
+        } else {
+            $query = Article::whereNotNull('survey_name');
+        }
+        $count = $query->count();
+        $survey = $query->orderByDesc('id')
+            ->limit($data['pageSize'])
+            ->offset(($data['page'] - 1) * $data['pageSize'])
+            ->get();
+        if (empty($survey->toArray())) {
+            return Result::error("暂无调查问卷!", 0);
+        }
+        $result = [
+            'rows' => $survey,
+            'count' => $count,
+        ];
+        return Result::success($result);
+    }
+    /**
+     * 后端-获取网站调查问卷详情
+     * @param array $data
+     * @return array
+     */
+    public function getSurveyInfo(array $data): array
+    {
+        if (isset($data['sur_id']) && !empty($data['sur_id'])) {
+            $where = ['sur_id' => $data['sur_id']];
+            $choose = ArticleSurvey::where($where)->where('is_other', 0)
+                ->leftJoin('article', 'article_survey.art_id', 'article.id')
+                ->select('article_survey.*', 'article.survey_type')
+                ->get()->all();
+            if (empty($choose)) {
+                return Result::error("此调查问卷不存在", 0);
+            }
+            $resultsArray = array_column($choose, 'results');
+            $total = array_sum($resultsArray);
+            $other = ArticleSurvey::where($where)->where('is_other', 1)->where('other_id', 0)->first();
+            $others = ArticleSurvey::where($where)->where('is_other', 1)->where('other_id', '!=', 0)->orderByDesc('created_at')->get()->all();
+            // $total = 0;
+            if (!empty($other)) {
+                $total = $total + $other['results'];
+                $other['choice_name'] = $other['choice_name'] . '(其他)';
+                if (!empty($others)) {
+                    $other['hasChildren'] = true;
+                    // array_push($other,['hasChildren','=',true]);
+                    $other['children'] = $others;
+                    $other_choices = [$other->toArray()];
+                    $mer_choice = array_merge($choose, $other_choices);
+                    $value_choice = array_values($mer_choice);
+                } else {
+                    // return Result::error('1111');
+                    $other_choices = [$other->toArray()];
+                    $other_choices = array_merge($choose, $other_choices);
+                    $value_choice = array_values($other_choices);
+                    // return Result::success($result);
+                }
+            } else {
+                $value_choice = $choose;
+            }
+            $result = [
+                'choose' => $value_choice,
+                'total' => $total,
+            ];
+        }
+        return Result::success($result);
+    }
+    // 20250306 招聘
+    /*
+    * 招聘列表
+    * */
+    public function getJobRecruitingList(array $data): array
+    {
+        $where = [];
+        if(isset($data['keyword']) && !empty($data['keyword'])){
+            array_push($where, ['job_recruiting.title', 'like', '%'. $data['keyword']. '%']);
+        }
+        $user = User::where('id', $data['user_id'])->first();
+        if(empty($user)){
+            return Result::error("用户不存在", 0);
+        }
+        //   3:企业会员
+        if($user['type_id'] == 3){
+            array_push($where,['user_id', $data['user_id']]);
+        }
+        $result = JobRecruiting::where($where)
+                ->leftJoin('website', 'job_recruiting.website_id', '=', 'website.id')
+                ->leftJoin('user', 'job_recruiting.user_id', '=', 'user.id')
+                ->select('job_recruiting.*', 'website.website_name as website_name', 'user.user_name as user_name')
+                ->orderBy("updated_at", "desc")
+                ->offset(($data['page'] - 1) * $data['page_size'])
+                ->limit($data['page_size'])
+                ->get()
+                ->all();
+        if (empty($result)) {
+            return Result::error("暂无招聘信息", 0);
+        }
+        return Result::success($result);
+    }
+    /*
+    * 招聘信息详情
+    * */
+    public function getJobRecruitingInfo(array $data): array
+    {
+        $result = JobRecruiting::where('job_recruiting.id', $data['id'])
+        ->leftJoin('user_info', 'job_recruiting.user_id', 'user_info.id')
+        ->leftJoin('user', 'job_recruiting.user_id', 'user.id')
+        ->select(
+            'job_recruiting.*',
+            'user_info.business_name',          // 企业名称
+            'user_info.address_arr_id',         // 企业地址
+            'user_info.address',                // 企业地址
+            'user.mobile',                      // 企业联系电话
+            'user_info.real_name',            // 企业联系人
+            // 'user_info.industry_name',          // 企业行业名称
+        )
+        ->orderBy("updated_at", "desc")
+        ->first();
+        if (empty($result)) {
+            return Result::error("暂无招聘信息", 0);
+        }
+        return Result::success($result);
+    }
+    /*
+    * 招聘信息添加
+    * */
+    public function addJobRecruiting(array $data): array
+    {
+        $user = User::where('id', $data['user_id'])->first();
+        if(empty($user)){
+            return Result::error("用户不存在", 0);
+        }
+        //   3:企业会员
+        if($user['type_id'] != 3){
+            if($data['website_id'] == 0){
+                return Result::error("请选择所属网站", 0);
+            }
+            $website = Website::where('id', $data['website_id'])->first();
+            if(empty($website)){
+                return Result::error("网站不存在", 0);
+            }
+            $data['website_id'] = $website['id'];
+        }
+        $data['cat_arr_id'] = array_values(array_unique($data['cat_arr_id']));
+        $data['city_arr_id'] = array_values(array_unique($data['city_arr_id']));
+        $data['cat_arr_id'] = isset($data['cat_arr_id'])? json_encode($data['cat_arr_id']) : '';
+        $data['city_arr_id'] = isset($data['city_arr_id'])? json_encode($data['city_arr_id']) : '';
+        $result = JobRecruiting::insertGetId($data);
+        if (empty($result)) {
+            return Result::error("添加失败", 0);   
+        }
+        return Result::success($result);   
+
+    }
+    /*
+    * 招聘信息更新
+    * */
+    public function upJobRecruiting(array $data): array
+    {
+        $job = JobRecruiting::where('id', $data['id'])->first();
+        if(empty($job)){
+            return Result::error("招聘信息不存在", 0);
+        }
+        $user = User::where('id', $data['user_id'])->first();
+        if(empty($user)){
+            return Result::error("用户不存在", 0);
+        }
+         //   3:企业会员
+         if($user['type_id'] != 3){
+            if($data['website_id'] == 0){
+                return Result::error("请选择所属网站", 0);
+            }
+            $website = Website::where('id', $data['website_id'])->first();
+            if(empty($website)){
+                return Result::error("网站不存在", 0);
+            }
+            $data['website_id'] = $website['id'];
+        }
+        $data['cat_arr_id'] = array_values(array_unique($data['cat_arr_id']));
+        $data['city_arr_id'] = array_values(array_unique($data['city_arr_id']));
+        $data['cat_arr_id'] = isset($data['cat_arr_id'])? json_encode($data['cat_arr_id']) : '';
+        $data['city_arr_id'] = isset($data['city_arr_id'])? json_encode($data['city_arr_id']) : '';
+        $result = JobRecruiting::where('id', $data['id'])->update($data);
+        if (empty($result)) {
+            return Result::error("更新失败", 0);   
+        }
+        return Result::success($data);
+    }
+    /*
+    * 招聘信息删除
+    * */
+    public function delJobRecruiting(array $data): array
+    {
+        $job = JobRecruiting::where('id', $data['id'])->first();
+        if(empty($job)){
+            return Result::error("招聘信息不存在", 0);
+        }
+        $result = JobRecruiting::where('id',$data['id'])->delete();
+        if (empty($result)) {
+            return Result::error("删除失败", 0);
+        }
+        return Result::success($data);   
+    }
+    /*
+    * 获取省-市
+    * */
+    public function getJobRecruitingArea(array $data): array
+    {
+        if(isset($data['province_id']) && $data['province_id']!=null){
+            $result = District::where('pid',$data['pid'])->get()->all();
+        }else{
+            $result = District::where('level',1)->get()->all();
+        }
+        if (empty($result)) {
+            return Result::error("暂无此省市", 0);
+        }
+        return Result::success($result);
+    }
+    /*
+    * 获取行业分类
+    * */
+    public function getIndustry(array $data): array
+    {
+        $result = JobIndustry::get()->all();
+        if (empty($result)) {
+            return Result::error("暂无行业分类", 0);
+        }
+        return Result::success($result);
+    }
+    /*
+    * 获取职位
+    * */
+    public function getPositionList(array $data): array
+    {
+        if(isset($data['zwpid']) && $data['zwpid']!=null){
+            $result = JobPosition::where('zwpid',$data['zwpid'])->get()->all();
+        }else{
+            $result = JobPosition::where('zwpid',0)->get()->all();
+        }
+        if (empty($result)) {
+            return Result::error("暂无此职位", 0);
+        }
+        return Result::success($result);
+    }
+    /*
+    * 获取工作性质-菜单
+    * */
+    public function getJobNature(array $data): array
+    {
+        $result = JobEnum::where('egroup','nature')->get()->all();
+        if (empty($result)) {
+            return Result::error("暂无工作性质", 0);
+        }
+        return Result::success($result);
+    } 
+    /*
+    * 获取工作经验-菜单
+    * */
+    public function getExperience(array $data): array
+    {
+        $result = JobEnum::where('egroup','years')->get()->all();
+        if (empty($result)) {
+            return Result::error("暂无工作经验", 0);
+        }
+        return Result::success($result);
+    }
+    /*
+    * 获取学历-菜单
+    * */
+    public function getEducation(array $data): array
+    {
+        $result = JobEnum::where('egroup','education')->get()->all();
+        if (empty($result)) {
+            return Result::error("暂无学历", 0);
+        }
+        return Result::success($result);
+    }
+    /*
+    * 获取薪资-菜单
+    * */
+    public function getSalary(array $data): array
+    {
+        $result = JobEnum::where('egroup','income')->get()->all();
+        if (empty($result)) {
+            return Result::error("暂无薪资", 0);
+        }
+        return Result::success($result);   
+    }
+    /*
+    * 获取语言-菜单
+    * */
+    public function getLanguage(array $data): array
+    {
+        $result = JobEnum::where('egroup','language')->get()->all();
+        if (empty($result)) {
+            return Result::error("暂无语言", 0);
+        }
+        return Result::success($result);
+    }
+    /*
+    * 获取掌握程度-菜单
+    * */
+    public function getLevel(array $data): array
+    {
+        $result = JobEnum::where('egroup','languagetype')->get()->all();
+        if (empty($result)) {
+            return Result::error("暂无工作性质", 0);
+        }
+        return Result::success($result);
+    }
+    // 公司信息
+    /*
+    * 获取公司性质-菜单
+    * */
+    public function getCompanyNature(array $data): array
+    {
+        $result = JobNature::get()->all();
+        if (empty($result)) {
+            return Result::error("暂无公司性质", 0);
+        }
+        return Result::success($result);
+    }
+    /*
+    * 获取公司规模-菜单
+    * */
+    public function getCompanySize(array $data): array
+    {
+        $result = JobEnum::where('egroup','cosize')->get()->all();
+        if (empty($result)) {
+            return Result::error("暂无公司规模", 0);
+        }
+        return Result::success($result);
+    }
+    // 20250306 招聘
+}

+ 80 - 0
app/JsonRpc/NewsServiceInterface.php

@@ -140,4 +140,84 @@ interface NewsServiceInterface
      * @return array
      */
     public function getSurveyInfo(array $data):array;
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getJobRecruitingList(array $data):array;
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getJobRecruitingInfo(array $data):array;
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function addJobRecruiting(array $data):array;
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function upJobRecruiting(array $data):array;
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function delJobRecruiting(array $data):array;
+     /**
+     * @param array $data
+     * @return array
+     */
+    public function getJobRecruitingArea(array $data):array;
+     /**
+     * @param array $data
+     * @return array
+     */
+    public function getIndustry(array $data):array;
+     /**
+     * @param array $data
+     * @return array
+     */
+    public function getPositionList(array $data):array;
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getJobNature(array $data):array;
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getExperience(array $data):array;
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getEducation(array $data):array;
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getSalary(array $data):array;
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getLanguage(array $data):array;
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getLevel(array $data):array;
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getCompanySize(array $data):array;
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getCompanyNature(array $data):array;
 }

+ 27 - 0
app/Model/JobEnum.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model;
+
+use Hyperf\DbConnection\Model\Model;
+
+/**
+ */
+class JobEnum extends Model
+{
+    /**
+     * The table associated with the model.
+     */
+    protected ?string $table = 'job_enum';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected array $fillable = [];
+
+    /**
+     * The attributes that should be cast to native types.
+     */
+    protected array $casts = [];
+}

+ 27 - 0
app/Model/JobIndustry.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model;
+
+use Hyperf\DbConnection\Model\Model;
+
+/**
+ */
+class JobIndustry extends Model
+{
+    /**
+     * The table associated with the model.
+     */
+    protected ?string $table = 'job_industry';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected array $fillable = [];
+
+    /**
+     * The attributes that should be cast to native types.
+     */
+    protected array $casts = [];
+}

+ 27 - 0
app/Model/JobNature.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model;
+
+use Hyperf\DbConnection\Model\Model;
+
+/**
+ */
+class JobNature extends Model
+{
+    /**
+     * The table associated with the model.
+     */
+    protected ?string $table = 'job_nature';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected array $fillable = [];
+
+    /**
+     * The attributes that should be cast to native types.
+     */
+    protected array $casts = [];
+}

+ 27 - 0
app/Model/JobPosition.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model;
+
+use Hyperf\DbConnection\Model\Model;
+
+/**
+ */
+class JobPosition extends Model
+{
+    /**
+     * The table associated with the model.
+     */
+    protected ?string $table = 'job_position';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected array $fillable = [];
+
+    /**
+     * The attributes that should be cast to native types.
+     */
+    protected array $casts = [];
+}

+ 27 - 0
app/Model/JobRecruiting.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model;
+
+use Hyperf\DbConnection\Model\Model;
+
+/**
+ */
+class JobRecruiting extends Model
+{
+    /**
+     * The table associated with the model.
+     */
+    protected ?string $table = 'job_recruiting';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected array $fillable = [];
+
+    /**
+     * The attributes that should be cast to native types.
+     */
+    protected array $casts = [];
+}

+ 27 - 0
app/Model/User.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model;
+
+use Hyperf\DbConnection\Model\Model;
+
+/**
+ */
+class User extends Model
+{
+    /**
+     * The table associated with the model.
+     */
+    protected ?string $table = 'user';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected array $fillable = [];
+
+    /**
+     * The attributes that should be cast to native types.
+     */
+    protected array $casts = [];
+}

+ 27 - 0
app/Model/UserInfo.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model;
+
+use Hyperf\DbConnection\Model\Model;
+
+/**
+ */
+class UserInfo extends Model
+{
+    /**
+     * The table associated with the model.
+     */
+    protected ?string $table = 'user_info';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected array $fillable = [];
+
+    /**
+     * The attributes that should be cast to native types.
+     */
+    protected array $casts = [];
+}

+ 27 - 0
app/Model/WebsiteGroup.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model;
+
+use Hyperf\DbConnection\Model\Model;
+
+/**
+ */
+class WebsiteGroup extends Model
+{
+    /**
+     * The table associated with the model.
+     */
+    protected ?string $table = 'website_group';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected array $fillable = [];
+
+    /**
+     * The attributes that should be cast to native types.
+     */
+    protected array $casts = [];
+}