gx

@@ -13,20 +13,20 @@ use App\Models\RouteMap\RouteMap;
 class BlogCategoryController extends BaseController
 class BlogCategoryController extends BaseController
 {
 {
     /**
     /**
-     * @remark :博客分类列表
-     * @name   :lists
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/18 11:06
+     * @name :博客分类列表
+     * @author :liyuhang
+     * @method
      */
      */
     public function lists(BlogCategoryModel $blogCategoryModel){
     public function lists(BlogCategoryModel $blogCategoryModel){
         //搜索条件
         //搜索条件
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
-        $filed = ['id','pid','name','num','alias','status','sort','remark','created_at','updated_at'];
-        $lists = $blogCategoryModel->lists($this->map,$this->page,$this->row,$this->order,$filed);
+        $lists = $blogCategoryModel->lists($this->map,$this->page,$this->row,$this->order,
+            ['id','pid','name','num','alias','status','sort','remark','created_at','updated_at']);
         if(!empty($lists['list'])){
         if(!empty($lists['list'])){
+            $blogModel = new BlogModel();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
-                $v['num'] = 0;
+                $v['num'] = $blogModel->formatQuery(['category_id'=>['like','%,' . $v['id'] . ',%']])->count();
+                $v['alias'] = RouteMap::getRoute(RouteMap::SOURCE_BLOG_CATE, $v['id'], $this->user['project_id']);
                 $v['url'] = $this->user['domain'] . RouteMap::PATH_BLOG_CATE . '/' . $v['alias'];
                 $v['url'] = $this->user['domain'] . RouteMap::PATH_BLOG_CATE . '/' . $v['alias'];
                 $v['hasChildren'] =  (($blogCategoryModel->read(['pid'=>$v['id']])) != false) ? true : false;
                 $v['hasChildren'] =  (($blogCategoryModel->read(['pid'=>$v['id']])) != false) ? true : false;
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
@@ -36,23 +36,20 @@ class BlogCategoryController extends BaseController
     }
     }
 
 
     /**
     /**
-     * @remark :添加/编辑时获取分类
-     * @name   :categoryTopList
+     * @name   :(添加/编辑时获取顶级分类)topList
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/10/18 11:05
+     * @time   :2023/6/13 9:03
      */
      */
     public function categoryTopList(BlogCategoryLogic $blogCategoryLogic){
     public function categoryTopList(BlogCategoryLogic $blogCategoryLogic){
-        $list = $blogCategoryLogic->getCateAllList();
+        $list = $blogCategoryLogic->categoryTopList();
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }
 
 
     /**
     /**
-     * @remark :获取详情
-     * @name   :info
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/18 11:05
+     * @name :获取当前分类详情
+     * @author :liyuhang
+     * @method
      */
      */
     public function info(BlogCategoryLogic $blogCategoryLogic){
     public function info(BlogCategoryLogic $blogCategoryLogic){
         $this->request->validate([
         $this->request->validate([
@@ -60,7 +57,8 @@ class BlogCategoryController extends BaseController
         ],[
         ],[
             'id.required' => 'ID不能为空'
             'id.required' => 'ID不能为空'
         ]);
         ]);
-        $info = $blogCategoryLogic->info();
+        $info = $blogCategoryLogic->info_blog_category();
+        $info['url'] = $this->user['domain'] . $info['alias'];
         $this->response('success',Code::SUCCESS,$info);
         $this->response('success',Code::SUCCESS,$info);
     }
     }
 
 
@@ -79,11 +77,9 @@ class BlogCategoryController extends BaseController
 
 
 
 
     /**
     /**
-     * @remark :修改状态
-     * @name   :status
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/18 15:55
+     * @name :编辑状态/与排序
+     * @author :liyuhang
+     * @method
      */
      */
     public function status(BlogCategoryLogic $blogCategoryLogic){
     public function status(BlogCategoryLogic $blogCategoryLogic){
         $this->request->validate([
         $this->request->validate([
@@ -91,7 +87,7 @@ class BlogCategoryController extends BaseController
         ],[
         ],[
             'id.required' => 'ID不能为空',
             'id.required' => 'ID不能为空',
         ]);
         ]);
-        $blogCategoryLogic->cateStatus();
+        $blogCategoryLogic->status_blog_category();
         $this->response('success');
         $this->response('success');
     }
     }
 
 

@@ -4,11 +4,13 @@ namespace App\Http\Controllers\Bside\Blog;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
+use App\Http\Logic\Bside\Blog\BlogCategoryLogic;
+use App\Http\Logic\Bside\Blog\BlogLabelLogic;
 use App\Http\Logic\Bside\Blog\BlogLogic;
 use App\Http\Logic\Bside\Blog\BlogLogic;
 use App\Http\Requests\Bside\Blog\BlogRequest;
 use App\Http\Requests\Bside\Blog\BlogRequest;
-use App\Models\Blog\Blog;
+use App\Models\Blog\Blog as BlogModel;
 use App\Models\Blog\BlogCategory;
 use App\Models\Blog\BlogCategory;
-use App\Models\Com\AssociationCate;
+use App\Models\RouteMap\RouteMap;
 use App\Models\User\User;
 use App\Models\User\User;
 
 
 class BlogController extends BaseController
 class BlogController extends BaseController
@@ -21,15 +23,17 @@ class BlogController extends BaseController
      * @method :post
      * @method :post
      * @time   :2023/9/14 10:45
      * @time   :2023/9/14 10:45
      */
      */
-    public function lists(Blog $blogModel){
+    public function lists(BlogModel $blogModel){
         $this->map = $this->searchParam();
         $this->map = $this->searchParam();
-        $filed = ['id','operator_id','status','created_at','label_id','image','updated_at','name','sort','url'];
-        $lists = $blogModel->lists($this->map,$this->page,$this->row,$this->order = 'sort', $filed);
+        $filed = ['id','category_id','operator_id','status','created_at','label_id','image','updated_at','name','sort','url'];
+        $this->order = 'sort';
+        $lists = $blogModel->lists($this->map,$this->page,$this->row,$this->order,$filed);
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
-            //获取当前数据的分类
+            //获取当前项目的所有分类
+            $data = $this->getCategoryList();
             $user = new User();
             $user = new User();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
-                $v['category_name'] = $this->getCateName($v['id']);
+                $v['category_name'] = $this->categoryName($v['category_id'],$data);
                 $v['url'] = $this->user['domain'] .$v['url'];
                 $v['url'] = $this->user['domain'] .$v['url'];
                 $v['image_link'] = getImageUrl($v['image']);
                 $v['image_link'] = getImageUrl($v['image']);
                 $v['operator_name'] = $user->getName($v['operator_id']);
                 $v['operator_name'] = $user->getName($v['operator_id']);
@@ -49,57 +53,49 @@ class BlogController extends BaseController
     public function searchParam(){
     public function searchParam(){
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
         if(isset($this->map['category_id']) && !empty($this->map['category_id'])){
         if(isset($this->map['category_id']) && !empty($this->map['category_id'])){
-            //获取当前分类下的所有子集
-            $str = $this->getAllSub($this->map['category_id'],$str);
-            //根据分类获取所有子集
-            $assCateModel = new AssociationCate();
-            $type_id = $assCateModel->formatQuery(['category_id'=>['in',$str],'type'=>$assCateModel::BLOG_CATE])->pluck('type_id')->toArray();
-            $this->map['id'] = ['in',$type_id];
-            unset($this->map['category_id']);
+            $this->map['category_id'] = ['like','%,'.$this->map['category_id'].',%'];
         }
         }
         return $this->map;
         return $this->map;
     }
     }
 
 
     /**
     /**
-     * @remark :获取当前id下的所有子集
-     * @name   :getAllSub
+     * @remark :获取所有分类名称
+     * @name   :getCategoryList
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/10/18 15:10
+     * @time   :2023/9/14 13:56
      */
      */
-    public function getAllSub($id,&$str = []){
-        $cateModel = new BlogCategory();
-        $str[] = $id;
-        $list = $cateModel->list(['pid'=>$id,'status'=>0],['id','pid']);
-        if(!empty($list)){
-            foreach ($list as $v){
-                $str[] = $v['id'];
-                $this->getAllSub($v['id'],$str);
+    public function getCategoryList(){
+        $categoryModel = new BlogCategory();
+        $data = [];
+        $cateList = $categoryModel->list(['project_id'=>$this->user['project_id']],['id','name']);
+        if(!empty($cateList)){
+            foreach ($cateList as $value){
+                $data[$value['id']] = $value['name'];
             }
             }
         }
         }
-        return $str;
+        return $data;
     }
     }
 
 
     /**
     /**
-     * @remark :获取分类名
-     * @name   :getCateName
+     * @remark :获取分类名称
+     * @name   :categoryName
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/10/18 16:43
+     * @time   :2023/9/14 13:58
      */
      */
-    public function getCateName($id){
-        //根据分类获取所有子集
-        $str = '';
-        if(!empty($id)){
-            $assCateModel = new AssociationCate();
-            $category_id = $assCateModel->formatQuery(['type_id'=>$id,'type'=>$assCateModel::BLOG_CATE])->pluck('category_id')->toArray();
-            if(!empty($category_id)){
-                $categoryModel = new BlogCategory();
-                $category_name_arr = $categoryModel->formatQuery(['id'=>['in',$category_id]])->pluck('name')->toArray();
-                $str = implode(',',$category_name_arr);
+    public function categoryName($category_id,$data){
+        $category_name = '';
+        if(!empty($category_id) && !empty($data)){
+            $arr = explode(',',trim($category_id,','));
+            foreach ($arr as $v){
+                if(isset($data[$v])){
+                    $category_name .= $data[$v].',';
                 }
                 }
             }
             }
-        return $str;
+            $category_name = trim($category_name,',');
+        }
+        return $category_name;
     }
     }
 
 
     /**
     /**
@@ -115,23 +111,21 @@ class BlogController extends BaseController
     }
     }
 
 
     /**
     /**
-     * @remark :添加博客时获取分类列表
+     * @remark :获取分类
      * @name   :get_category_list
      * @name   :get_category_list
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/10/18 16:51
+     * @time   :2023/10/19 15:08
      */
      */
-    public function getCategoryList(BlogLogic $blogLogic){
-        $list = $blogLogic->getCategoryList();
+    public function get_category_list(BlogLogic $blogLogic){
+        $list = $blogLogic->blog_get_category_list();
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }
 
 
     /**
     /**
-     * @remark :获取详情
-     * @name   :info
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/18 16:58
+     * @name :获取当前博客详情
+     * @author :liyuhang
+     * @method
      */
      */
     public function info(BlogLogic $blogLogic){
     public function info(BlogLogic $blogLogic){
         $this->request->validate([
         $this->request->validate([

@@ -26,7 +26,9 @@ class NewsCategoryController extends BaseController
             $newsModel = new NewsModel();
             $newsModel = new NewsModel();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $v['num'] = $newsModel->formatQuery(['category_id'=>['like','%,' . $v['id'] . ',%']])->count();
                 $v['num'] = $newsModel->formatQuery(['category_id'=>['like','%,' . $v['id'] . ',%']])->count();
+                $v['alias'] = RouteMap::getRoute(RouteMap::SOURCE_NEWS_CATE, $v['id'], $this->user['project_id']);
                 $v['url'] = $this->user['domain'] . RouteMap::PATH_NEWS_CATE . '/' . $v['alias'];
                 $v['url'] = $this->user['domain'] . RouteMap::PATH_NEWS_CATE . '/' . $v['alias'];
+                $v['hasChildren'] =  (($newsCategory->read(['pid'=>$v['id']])) != false) ? true : false;
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }
@@ -34,14 +36,13 @@ class NewsCategoryController extends BaseController
     }
     }
 
 
     /**
     /**
-     * @remark :添加/编辑时获取分类
-     * @name   :categoryTopList
+     * @name   :(添加/编辑时获取顶级分类)topList
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/10/18 11:05
+     * @time   :2023/6/13 9:03
      */
      */
     public function categoryTopList(NewsCategoryLogic $newsCategoryLogic){
     public function categoryTopList(NewsCategoryLogic $newsCategoryLogic){
-        $list = $newsCategoryLogic->getCateAllList();
+        $list = $newsCategoryLogic->categoryTopList();
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }
 
 
@@ -56,7 +57,8 @@ class NewsCategoryController extends BaseController
         ],[
         ],[
             'id.required' => 'ID不能为空'
             'id.required' => 'ID不能为空'
         ]);
         ]);
-        $info = $newsCategoryLogic->cateInfo();
+        $info = $newsCategoryLogic->info_news_category();
+        $info['url'] = $this->user['domain'] . $info['alias'];
         $this->response('success',Code::SUCCESS,$info);
         $this->response('success',Code::SUCCESS,$info);
     }
     }
 
 
@@ -69,7 +71,7 @@ class NewsCategoryController extends BaseController
      */
      */
     public function save(NewsCategoryRequest $request,NewsCategoryLogic $newsCategoryLogic){
     public function save(NewsCategoryRequest $request,NewsCategoryLogic $newsCategoryLogic){
         $request->validated();
         $request->validated();
-        $newsCategoryLogic->categorySave();
+        $newsCategoryLogic->newsCategorySave();
         $this->response('success');
         $this->response('success');
     }
     }
 
 

@@ -19,23 +19,23 @@ use App\Models\User\User;
  */
  */
 class NewsController extends BaseController
 class NewsController extends BaseController
 {
 {
+    public $updateModelView = 'news';
     /**
     /**
-     * @remark :博客列表
-     * @name   :lists
-     * @author :lyh
-     * @method :post
-     * @time   :2023/9/14 10:45
+     * @name :获取新闻列表
+     * @author :liyuhang
+     * @method
      */
      */
-    public function lists(NewsModel $newsModel){
+    public function lists(NewsModel $news,NewsCategoryLogic $newsCategoryLogic){
         $this->map = $this->searchParam();
         $this->map = $this->searchParam();
-        $filed = ['id','operator_id','status','created_at','label_id','image','updated_at','name','sort','url'];
-        $lists = $newsModel->lists($this->map,$this->page,$this->row,$this->order = 'sort', $filed);
+        $lists = $news->lists($this->map,$this->page,$this->row,$this->order = 'sort',
+            ['id','category_id','operator_id','status','created_at','updated_at','image','name','sort','url']);
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
-            //获取当前数据的分类
+            //获取当前项目的所有分类
+            $data = $this->getCategoryList();
             $user = new User();
             $user = new User();
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
-                $v['category_name'] = $this->getCateName($v['id']);
-                $v['url'] = $this->user['domain'] .$v['url'];
+                $v['category_name'] = $this->categoryName($v['category_id'],$data);
+                $v['url'] = $this->user['domain'] . $v['url'];
                 $v['image_link'] = getImageUrl($v['image']);
                 $v['image_link'] = getImageUrl($v['image']);
                 $v['operator_name'] = $user->getName($v['operator_id']);
                 $v['operator_name'] = $user->getName($v['operator_id']);
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
@@ -54,57 +54,49 @@ class NewsController extends BaseController
     public function searchParam(){
     public function searchParam(){
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
         if(isset($this->map['category_id']) && !empty($this->map['category_id'])){
         if(isset($this->map['category_id']) && !empty($this->map['category_id'])){
-            //获取当前分类下的所有子集
-            $str = $this->getAllSub($this->map['category_id'],$str);
-            //根据分类获取所有子集
-            $assCateModel = new AssociationCate();
-            $type_id = $assCateModel->formatQuery(['category_id'=>['in',$str],'type'=>$assCateModel::BLOG_CATE])->pluck('type_id')->toArray();
-            $this->map['id'] = ['in',$type_id];
-            unset($this->map['category_id']);
+            $this->map['category_id'] = ['like','%,'.$this->map['category_id'].',%'];
         }
         }
         return $this->map;
         return $this->map;
     }
     }
 
 
     /**
     /**
-     * @remark :获取当前id下的所有子集
-     * @name   :getAllSub
+     * @remark :获取所有分类
+     * @name   :getCategoryList
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/10/18 15:10
+     * @time   :2023/9/14 13:56
      */
      */
-    public function getAllSub($id,&$str = []){
-        $cateModel = new NewsCategory();
-        $str[] = $id;
-        $list = $cateModel->list(['pid'=>$id,'status'=>0],['id','pid']);
-        if(!empty($list)){
-            foreach ($list as $v){
-                $str[] = $v['id'];
-                $this->getAllSub($v['id'],$str);
+    public function getCategoryList(){
+        $categoryModel = new NewsCategory();
+        $data = [];
+        $cateList = $categoryModel->list(['project_id'=>$this->user['project_id']],['id','name']);
+        if(!empty($cateList)){
+            foreach ($cateList as $value){
+                $data[$value['id']] = $value['name'];
             }
             }
         }
         }
-        return $str;
+        return $data;
     }
     }
 
 
     /**
     /**
-     * @remark :获取分类名
-     * @name   :getCateName
+     * @remark :获取分类名称
+     * @name   :categoryName
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/10/18 16:43
+     * @time   :2023/9/14 13:58
      */
      */
-    public function getCateName($id){
-        //根据分类获取所有子集
-        $str = '';
-        if(!empty($id)){
-            $assCateModel = new AssociationCate();
-            $category_id = $assCateModel->formatQuery(['type_id'=>$id,'type'=>$assCateModel::BLOG_CATE])->pluck('category_id')->toArray();
-            if(!empty($category_id)){
-                $categoryModel = new NewsCategory();
-                $category_name_arr = $categoryModel->formatQuery(['id'=>['in',$category_id]])->pluck('name')->toArray();
-                $str = implode(',',$category_name_arr);
+    public function categoryName($category_id,$data){
+        $category_name = '';
+        if(!empty($category_id) && !empty($data)){
+            $arr = explode(',',trim($category_id,','));
+            foreach ($arr as $v){
+                if(isset($data[$v])){
+                    $category_name .= $data[$v].',';
                 }
                 }
             }
             }
-        return $str;
+            $category_name = trim($category_name,',');
+        }
+        return $category_name;
     }
     }
 
 
     /**
     /**
@@ -121,14 +113,12 @@ class NewsController extends BaseController
 
 
 
 
     /**
     /**
-     * @remark :添加博客时获取分类列表
-     * @name   :get_category_list
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/18 16:51
+     * @name :添加新闻时获取分类列表
+     * @author :liyuhang
+     * @method
      */
      */
-    public function getCategoryList(NewsLogic $newsLogic){
-        $list = $newsLogic->getCategoryList();
+    public function get_category_list(NewsLogic $newsLogic){
+        $list = $newsLogic->news_get_category_list();
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }
     /**
     /**
@@ -143,6 +133,7 @@ class NewsController extends BaseController
             'id.required' => 'ID不能为空',
             'id.required' => 'ID不能为空',
         ]);
         ]);
         $info = $newsLogic->newsInfo();
         $info = $newsLogic->newsInfo();
+
         $this->response('success',Code::SUCCESS,$info);
         $this->response('success',Code::SUCCESS,$info);
     }
     }
 
 

@@ -5,7 +5,6 @@ namespace App\Http\Logic\Bside\Blog;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Blog\Blog as BlogModel;
 use App\Models\Blog\Blog as BlogModel;
 use App\Models\Blog\BlogCategory as BlogCategoryModel;
 use App\Models\Blog\BlogCategory as BlogCategoryModel;
-use App\Models\Com\AssociationCate;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 
 
@@ -14,72 +13,27 @@ class BlogCategoryLogic extends BaseLogic
     public function __construct()
     public function __construct()
     {
     {
         parent::__construct();
         parent::__construct();
+
         $this->model = new BlogCategoryModel();
         $this->model = new BlogCategoryModel();
         $this->param = $this->requestAll;
         $this->param = $this->requestAll;
     }
     }
 
 
     /**
     /**
-     * @remark :添加/编辑时获取分类
-     * @name   :categoryTopList
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/18 11:05
-     */
-    public function getCateAllList(){
-        $this->param['project_id'] = $this->user['project_id'];
-        $this->param['status'] = 0;
-        if(isset($this->param['id']) && !empty($this->param['id'])){
-            $str = [];
-            //排序掉当前id下所有子集
-            $str = $this->getAllSub($this->param['id'],$str);
-            $str[] = (int)$this->param['id'];
-            $this->param['id'] = ['not in',$str];
-        }
-        $menu = array();
-        $list = $this->model->list($this->param);
-        if(!empty($list)){
-            foreach ($list as $k => $v){
-                if($v['pid'] == 0){
-                    $v['sub'] = _get_child($v['id'],$list);
-                    $menu[]   = $v;
-                }
-            }
-        }
-        return $this->success($menu);
-    }
-
-    /**
-     * @remark :获取当前id下所有子集
-     * @name   :getAllSub
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/18 15:10
-     */
-    public function getAllSub($id,&$str = []){
-        $list = $this->model->list(['pid'=>$id,'status'=>0],['id','pid']);
-        if(!empty($list)){
-            foreach ($list as $v){
-                $str[] = $v['id'];
-                $this->getAllSub($v['id'],$str);
-            }
-        }
-        return $str;
-    }
-
-    /**
-     * @remark :获取数据详情
-     * @name   :info
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/18 15:37
+     * @param $v
+     * @name :获取分类名称
+     * @return void
+     * @author :liyuhang
+     * @method
      */
      */
-    public function info(){
-        $info = $this->model->read($this->param);
-        if($info === false){
-            $this->fail('当前数据不存在或者已被删除');
+    public function get_category_name($v){
+        //获取用户已读还是未读
+        $category_info = $this->model->list(['id'=>['in',explode(',',trim($v['category_id'],','))]],'id',['name']);
+        $str = '';
+        foreach ($category_info as $v1){
+            $str .= $v1['name'].',';
         }
         }
-        $info['url'] = $this->user['domain'] . $info['alias'];
-        return $this->success($info);
+        $v['category_name'] = trim($str,',');
+        return $this->success($v);
     }
     }
 
 
     /**
     /**
@@ -92,87 +46,35 @@ class BlogCategoryLogic extends BaseLogic
     public function categorySave(){
     public function categorySave(){
         //验证名称是否存在
         //验证名称是否存在
         $this->verifyParamName($this->param['name']);
         $this->verifyParamName($this->param['name']);
+        DB::beginTransaction();
+        try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
-            $id = $this->cateEdit();
+                //验证参数是否可编辑
+                $this->verifyParamEdit($this->param['id'],$this->param['pid']);
+                //查看路由是否更新
+                $id = $this->editCategoryRoute($this->param['id'],
+                    isset($this->param['alias']) ?? RouteMap::setRoute(isset($this->param['alias']) ? $this->param['alias'] : $this->param['name'],
+                    RouteMap::SOURCE_BLOG_CATE, $this->param['id'], $this->user['project_id']));
+                $this->param['operator_id'] = $this->user['id'];
+                $this->edit($this->param,['id'=>$this->param['id']]);
             }else{
             }else{
-            $id = $this->cateAdd();
-        }
-        //更新路由
-        $route = RouteMap::setRoute(isset($this->param['alias']) ? $this->param['alias'] : $this->param['name'],
-            RouteMap::SOURCE_BLOG_CATE, $id, $this->user['project_id']);
-        $this->model->edit(['alias'=>$route],['id'=>$id]);
-        //通知更新
-        $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_BLOG_CATE, 'route'=>$route]);
-        return $this->success();
-    }
-
-    /**
-     * @remark :添加数据
-     * @name   :add
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/18 11:07
-     */
-    public function cateAdd(){
                 //拼接参数
                 //拼接参数
                 $this->param = $this->addParamProcessing($this->param);
                 $this->param = $this->addParamProcessing($this->param);
-//        try {
                 $id = $this->model->addReturnId($this->param);
                 $id = $this->model->addReturnId($this->param);
-            //非顶级菜单处理子集
-            if($this->param['pid'] != 0){
-                //查看当前上级分类下是否有其他下级
-                $otherInfo = $this->model->read(['pid'=>$this->param['pid'],'id'=>['!=',$id]]);
-                if($otherInfo === false){
-                    //无其他下级时，查看当前上级分类下是否有博客
-                    $associationCateModel = new AssociationCate();
-                    $id_arr = $associationCateModel->where(['type'=>$associationCateModel::BLOG_CATE,'category_id'=>$id])->pluck('type_id')->toArray();
-                    if(!empty($id_arr)){
-                        $data = [];
-                        foreach ($id_arr as $v){
-                            $data[] = [
-                                'type'=>$associationCateModel::BLOG_CATE,
-                                'type_id'=>$v,
-                                'category_id'=>$id,
-                            ];
-                        }
-                        $associationCateModel->insert($data);
-                    }
-                }
-            }
-//        }catch (\Exception $e){
-//            $this->fail('系统错误请联系管理员');
-//        }
-        return $this->success($id);
-    }
-
-    /**
-     * @remark :修改数据
-     * @name   :edit
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/18 11:08
-     */
-    public function cateEdit(){
-        $this->param['operator_id'] = $this->user['id'];
-        try {
-            $this->model->edit($this->param,['id'=>$this->param['id']]);
-            if($this->param['pid'] != 0){
-                //查看当前上级分类下是否有博客
-                $associationCateModel = new AssociationCate();
-                $num = $associationCateModel->where(['category_id'=>$this->param['pid'],'type'=>$associationCateModel::BLOG_CATE])->count();
-                if($num > 0){
-                    //获取当前分类下的最后一级
-                    $lastId = $this->getLastCateId($this->param['id']);
-                    //更新所有博客到当前分类下
-                    $associationCateModel->edit(['category_id'=>$lastId],['category_id'=>$this->param['pid'],'type'=>$associationCateModel::BLOG_CATE]);
-                }
+                //处理子集
+                $this->addProcessingSon($id);
             }
             }
+            $route = RouteMap::setRoute(isset($this->param['alias']) ? $this->param['alias'] : $this->param['name'],
+                RouteMap::SOURCE_BLOG_CATE, $id, $this->user['project_id']);
+            $this->edit(['alias'=>$route],['id'=>$id]);
+            DB::commit();
         }catch (\Exception $e){
         }catch (\Exception $e){
-            $this->fail('系统错误请联系管理员');
+            DB::rollBack();
+            $this->fail('系统错误，请联系管理');
         }
         }
-        //查看路由是否更新
-        $id = $this->editCategoryRoute($this->param['id'],$this->param['alias']);
-        return $this->success($id);
+        //通知更新
+        $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_BLOG_CATE, 'route'=>$route]);
+        return $this->success();
     }
     }
 
 
     /**
     /**
@@ -195,20 +97,43 @@ class BlogCategoryLogic extends BaseLogic
         return $this->success();
         return $this->success();
     }
     }
 
 
+
     /**
     /**
-     * @remark :获取当前分类下最后一级分类的id
-     * @name   :getLastCateId
+     * @remark :查看参数是否可编辑
+     * @name   :verifyParamEdit
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/10/18 14:37
+     * @time   :2023/7/31 16:31
      */
      */
-    public function getLastCateId($id){
-        $info = $this->model->read(['pid'=>$id],['id']);
-        if($info === false){
-            return $this->success($id);
-        }else{
-            $this->getLastCateId($info['id']);
+    public function verifyParamEdit($id,$pid){
+        $info = $this->model->read(['id'=>$id]);
+        if($info['id'] == $pid){
+            $this->fail('不能成为自己的上级');
+        }
+        if($info['pid'] != $pid){
+            $info = $this->model->read(['pid'=>$id]);
+            if($info !== false){
+                $this->fail('当前分类拥有子分类不允许修改父级');
+            }
+            //查询当前分类下是否有商品
+            $blogModel = new BlogModel();
+            $info = $blogModel->read(['id'=>['like','%,'.$id.',%']]);
+            if($info !== false){
+                $this->fail('当前分类下已存在博客，不允许修改上级');
+            }
         }
         }
+        return $this->success();
+    }
+
+    /**
+     * @name :详情
+     * @return array
+     * @author :liyuhang
+     * @method
+     */
+    public function info_blog_category(){
+        $info = $this->model->read($this->param);
+        return $this->success($info);
     }
     }
 
 
     /**
     /**
@@ -217,7 +142,7 @@ class BlogCategoryLogic extends BaseLogic
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
      */
      */
-    public function cateStatus(){
+    public function status_blog_category(){
         $this->param['operator_id'] = $this->user['id'];
         $this->param['operator_id'] = $this->user['id'];
         $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
         $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
         if($rs ===  false){
         if($rs ===  false){
@@ -263,6 +188,21 @@ class BlogCategoryLogic extends BaseLogic
         return $this->success();
         return $this->success();
     }
     }
 
 
+    /**
+     * @name   :(添加分类时获取1级分类)categoryTopList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/13 9:09
+     */
+    public function categoryTopList(){
+        $map = [
+            'project_id'=>$this->user['project_id'],
+            'pid'=>0,
+            'status'=>0,
+        ];
+        $list = $this->model->list($map);
+        return $this->success($list);
+    }
 
 
     /**
     /**
      * @name   :(参数处理)paramProcessing
      * @name   :(参数处理)paramProcessing
@@ -300,6 +240,37 @@ class BlogCategoryLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @param $cate_id
+     * @name   :(处理子集)addProcessingSon
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/13 11:59
+     */
+    public function addProcessingSon($cate_id){
+        if(!isset($this->param['pid'])){
+            $this->param['pid'] = 0;
+        }
+        //判断为子分类时
+        if($this->param['pid'] != 0){
+            //查看当前上级分类下是否有其他子分类
+            $cate_info = $this->model->read(['pid' => $this->param['pid'], 'id' => ['!=', $cate_id]]);
+            if ($cate_info === false) {
+                //查看当前上一级分类下是否有新闻
+                $blogModel = new BlogModel();
+                $blog_count = $blogModel->where('category_id','like', '%,' . $this->param['pid'] . ',%')->count();
+                if ($blog_count > 0) {
+                    $replacement = ','. $this->param['pid'] . ',' . $cate_id . ',';
+                    $old = ',' . $this->param['pid'] . ',';
+                    //更新所有商品到当前分类
+                    $blogModel->where('category_id', 'like', '%' . $old . '%')
+                        ->update(['category_id' => DB::raw("REPLACE(category_id, '$old', '$replacement')")]);
+                }
+            }
+        }
+        return $this->success();
+    }
+
+    /**
      * @remark :删除路由
      * @remark :删除路由
      * @name   :delRoute
      * @name   :delRoute
      * @author :lyh
      * @author :lyh

@@ -14,26 +14,31 @@ use Illuminate\Support\Facades\DB;
 
 
 class BlogLogic extends BaseLogic
 class BlogLogic extends BaseLogic
 {
 {
+    const STATUS_TWO = 2;
 
 
     public function __construct()
     public function __construct()
     {
     {
         parent::__construct();
         parent::__construct();
+
         $this->model = new Blog();
         $this->model = new Blog();
         $this->param = $this->requestAll;
         $this->param = $this->requestAll;
     }
     }
 
 
     /**
     /**
-     * @remark :添加时获取分类数据
-     * @name   :getCategoryList
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/18 17:00
+     * @name :获取分类列表
+     * @return array
+     * @throws \App\Exceptions\BsideGlobalException
+     * @author :liyuhang
+     * @method
      */
      */
-    public function getCategoryList(){
-        $this->param['status'] = 0;
-        $this->param['project_id'] = $this->user['project_id'];
+    public function blog_get_category_list(){
+        $this->map['status'] = 0;
+        $this->map['project_id'] = $this->user['project_id'];
         $blogCategoryModel = new BlogCategoryModel();
         $blogCategoryModel = new BlogCategoryModel();
-        $cate_list = $blogCategoryModel->list($this->param,'sort');
+        $cate_list = $blogCategoryModel->list($this->map,'sort');
+        if($cate_list === false){
+            $this->fail('error',Code::USER_ERROR);
+        }
         $list = [];
         $list = [];
         foreach ($cate_list as $v){
         foreach ($cate_list as $v){
             $v = (array)$v;
             $v = (array)$v;
@@ -56,24 +61,16 @@ class BlogLogic extends BaseLogic
         //拼接参数
         //拼接参数
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
-            $category = $this->param['category_id'];
-            unset($this->param['category_id']);
+            $this->param = $this->paramProcessing($this->param);
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
-                $this->param['operator_id'] = $this->user['id'];
                 //是否更新路由
                 //是否更新路由
                 $id = $this->editNewsRoute($this->param['id'],$this->param['url']);
                 $id = $this->editNewsRoute($this->param['id'],$this->param['url']);
-                $this->model->edit($this->param,['id'=>$this->param['id']]);
+                $this->edit($this->param,['id'=>$this->param['id']]);
             }else{
             }else{
-                $this->param['create_id'] = $this->user['id'];
-                $this->param['operator_id'] = $this->user['id'];
-                $this->param['project_id'] = $this->user['project_id'];
                 $id = $this->model->addReturnId($this->param);
                 $id = $this->model->addReturnId($this->param);
             }
             }
             $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $id, $this->user['project_id']);
             $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $id, $this->user['project_id']);
-            $this->model->edit(['url'=>$route],['id'=>$id]);
-            if(!empty($category)){
-                $this->saveAssociationCate($id,$category);
-            }
+            $this->edit(['url'=>$route],['id'=>$id]);
             DB::commit();
             DB::commit();
         }catch (\Exception $e){
         }catch (\Exception $e){
             DB::rollBack();
             DB::rollBack();
@@ -85,28 +82,6 @@ class BlogLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
-     * @remark :保存分类数据
-     * @name   :saveAssociationCate
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/18 17:01
-     */
-    public function saveAssociationCate($id,$category_arr){
-        //先删除产品与分类关联表
-        $assCateModel = new AssociationCate();
-        $assCateModel->del(['type_id'=>$id]);
-        $data = [];
-        foreach ($category_arr as $v){
-            $data[] = [
-               'type'=>$assCateModel::BLOG_CATE,
-               'type_id'=> $id,
-               'category_id'=>$v
-            ];
-        }
-        return $assCateModel->insert($data);
-    }
-
-    /**
      * @remark :查看是否编辑路由
      * @remark :查看是否编辑路由
      * @name   :editCategoryRoute
      * @name   :editCategoryRoute
      * @author :lyh
      * @author :lyh
@@ -149,17 +124,23 @@ class BlogLogic extends BaseLogic
      * @method
      * @method
      */
      */
     public function blogInfo(){
     public function blogInfo(){
+        //读取缓存
+        $info = Common::get_user_cache($this->model->getTable(),$this->param['id']);
+        if(empty($info)){
             $info = $this->model->read($this->param);
             $info = $this->model->read($this->param);
             if($info === false){
             if($info === false){
                 $this->fail('error');
                 $this->fail('error');
             }
             }
-        //获取所有分类
-        $assCateModel = new AssociationCate();
-        $info['category_id'] = $assCateModel->where(['type_id'=>$info['id']])->pluck('category_id')->toArray();
+            //获取分类名称
+            $blogCategoryLogic = new BlogCategoryLogic();
+            $info = $blogCategoryLogic->get_category_name($info);
             //获取标签名称
             //获取标签名称
             $blogLabelLogic = new BlogLabelLogic();
             $blogLabelLogic = new BlogLabelLogic();
-        $info['label_name'] = $blogLabelLogic->getLabelName($info['label_id']);
+            $info = $blogLabelLogic->get_label_name($info);
             $info['image_link'] = getImageUrl($info['image']);
             $info['image_link'] = getImageUrl($info['image']);
+            //写入缓存
+            Common::set_user_cache($info,$this->model->getTable(),$this->param['id']);
+        }
         return $this->success($info);
         return $this->success($info);
     }
     }
 
 
@@ -223,6 +204,31 @@ class BlogLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @name   :(参数处理)paramProcessing
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/13 11:30
+     */
+    public function paramProcessing($param){
+        if(isset($this->param['id'])){
+            $param['operator_id'] = $this->user['id'];
+            if(isset($param['category_id']) && !empty($param['category_id'])){
+                $param['category_id'] = explode(',',$param['category_id']);
+                $param['category_id'] = ','.trim($param['category_id'],',').',';
+            }
+        }else{
+            $param['create_id'] = $this->user['id'];
+            $param['operator_id'] = $this->user['id'];
+            $param['project_id'] = $this->user['project_id'];
+            if(isset($param['category_id']) && !empty($param['category_id'])){
+                $param['category_id'] = explode(',',$param['category_id']);
+                $param['category_id'] = ','.$param['category_id'].',';
+            }
+        }
+        return $this->success($param);
+    }
+
+    /**
      * @remark :根据状态获取数量
      * @remark :根据状态获取数量
      * @name   :getStatusNumber
      * @name   :getStatusNumber
      * @author :lyh
      * @author :lyh

@@ -18,50 +18,6 @@ class NewsCategoryLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
-     * @remark :添加/编辑时获取分类
-     * @name   :categoryTopList
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/18 11:05
-     */
-    public function getCateAllList(){
-        $this->param['project_id'] = $this->user['project_id'];
-        $this->param['status'] = 0;
-        if(isset($this->param['id']) && !empty($this->param['id'])){
-            //排序掉当前id下所有子集
-            $str = $this->getAllSub($this->param['id'],$str);
-            $this->param['id'] = ['!=',$str];
-        }
-        $list = $this->model->list($this->param);
-        if(!empty($list)){
-            foreach ($list as $k => $v){
-                $v['sub'] = _get_child($v['id'],$list);
-                $list[$k] = $v;
-            }
-        }
-        $this->success($list);
-    }
-
-    /**
-     * @remark :获取当前id下所有子集
-     * @name   :getAllSub
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/18 15:10
-     */
-    public function getAllSub($id,&$str = []){
-        $str[] = $id;
-        $list = $this->model->list(['pid'=>$id,'status'=>0],['id','pid']);
-        if(!empty($list)){
-            foreach ($list as $v){
-                $str[] = $v['id'];
-                $this->getAllSub($v['id'],$str);
-            }
-        }
-        return $this->success($str);
-    }
-
-    /**
      * @param $v
      * @param $v
      * @name :获取分类名称
      * @name :获取分类名称
      * @return void
      * @return void
@@ -83,97 +39,53 @@ class NewsCategoryLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
-     * @remark :获取详情
-     * @name   :cateInfo
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/18 14:50
+     * @name :详情
+     * @return array
+     * @throws \App\Exceptions\BsideGlobalException
+     * @author :liyuhang
+     * @method
      */
      */
-    public function cateInfo(){
+    public function info_news_category(){
         $info = $this->model->read($this->param);
         $info = $this->model->read($this->param);
-        if($info === false){
-            $this->fail('当前数据不存在或者已被删除');
-        }
-        $info['url'] = $this->user['domain'] . $info['alias'];
         return $this->success($info);
         return $this->success($info);
     }
     }
 
 
     /**
     /**
      * @remark :保存数据
      * @remark :保存数据
-     * @name   :categorySave
+     * @name   :newsCategorySave
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/9/7 13:42
+     * @time   :2023/9/7 14:53
      */
      */
-    public function categorySave(){
+    public function newsCategorySave(){
         //验证名称是否存在
         //验证名称是否存在
         $this->verifyParamName($this->param['name']);
         $this->verifyParamName($this->param['name']);
+        DB::beginTransaction();
+        try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
-            $id = $this->cateEdit();
+                //验证是否可编辑
+                $this->verifyEditParam($this->param['id'],$this->param['pid']);
+                $this->param['operator_id'] = $this->user['id'];
+                //查看路由是否更新
+                $id = $this->editCategoryRoute($this->param['id'],$this->param['alias'] ?? RouteMap::setRoute(isset($this->param['alias']) ? $this->param['alias'] : $this->param['name'],
+                    RouteMap::SOURCE_NEWS_CATE, $this->param['id'], $this->user['project_id']));
+                $this->edit($this->param,['id'=>$this->param['id']]);
             }else{
             }else{
-            $id = $this->cateAdd();
-        }
-        //更新路由
-        $route = RouteMap::setRoute(isset($this->param['alias']) ? $this->param['alias'] : $this->param['name'],
-            RouteMap::SOURCE_NEWS_CATE, $id, $this->user['project_id']);
-        $this->model->edit(['alias'=>$route],['id'=>$id]);
-        //通知更新
-        $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_NEWS_CATE, 'route'=>$route]);
-        return $this->success();
-    }
-
-    /**
-     * @remark :添加数据
-     * @name   :add
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/18 11:07
-     */
-    public function cateAdd(){
-        //拼接参数
                 $this->param = $this->addParamProcessing($this->param);
                 $this->param = $this->addParamProcessing($this->param);
-        try {
                 $id = $this->model->addReturnId($this->param);
                 $id = $this->model->addReturnId($this->param);
-            //非顶级菜单处理子集
-            if($this->param['pid'] != 0){
-                //把所有上级博客移动到下级
-                $newsModel = new NewsModel();
-                $newsModel->edit(['category_id'=>$id],['category_id'=>$this->param['pid']]);
-            }
-        }catch (\Exception $e){
-            $this->fail('系统错误请联系管理员');
-        }
-        return $this->success($id);
-    }
-
-    /**
-     * @remark :修改数据
-     * @name   :edit
-     * @author :lyh
-     * @method :post
-     * @time   :2023/10/18 11:08
-     */
-    public function cateEdit(){
-        $this->param['operator_id'] = $this->user['id'];
-        try {
-            $this->model->edit($this->param,['id'=>$this->param['id']]);
-            if($this->param['pid'] != 0){
-                //查看当前上级分类下是否有博客
-                $newsModel = new NewsModel();
-                $num = $newsModel->where(['category_id'=>$this->param['pid']])->count();
-                if($num > 0){
-                    //获取当前分类下的最后一级
-                    $lastId = $this->getLastCateId($this->param['id']);
-                    //更新所有博客到当前分类下
-                    $newsModel->edit(['category_id'=>$lastId],['category_id'=>$this->param['pid']]);
-                }
+                //当父级分类拥有产品时，处理子集
+                $this->addProcessingSon($id);
             }
             }
+            $route = RouteMap::setRoute(isset($this->param['alias']) ? $this->param['alias'] : $this->param['name'], RouteMap::SOURCE_NEWS_CATE, $id, $this->user['project_id']);
+            $this->model->edit(['alias'=>$route],['id'=>$id]);
+            DB::commit();
         }catch (\Exception $e){
         }catch (\Exception $e){
-            $this->fail('系统错误请联系管理员');
+            DB::rollBack();
+            $this->fail('error');
         }
         }
-        //查看路由是否更新
-        $id = $this->editCategoryRoute($this->param['id'],$this->param['alias']);
-        return $this->success($id);
+        //更新通知记录表
+        $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_NEWS_CATE, 'route'=>$route]);
+        return $this->success();
     }
     }
 
 
 
 
@@ -194,23 +106,34 @@ class NewsCategoryLogic extends BaseLogic
             ];
             ];
             $this->setRouteDeleteSave($data);
             $this->setRouteDeleteSave($data);
         }
         }
-        return $this->success($id);
+        return $id;
     }
     }
 
 
     /**
     /**
-     * @remark :获取当前分类下最后一级分类的id
-     * @name   :getLastCateId
+     * @remark :验证是否可编辑
+     * @name   :verifyEditParam
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/10/18 14:37
+     * @time   :2023/7/31 15:41
      */
      */
-    public function getLastCateId($id){
-        $info = $this->model->read(['pid'=>$id],['id']);
-        if($info === false){
-            return $this->success($id);
-        }else{
-            $this->getLastCateId($info['id']);
+    public function verifyEditParam($id,$pid){
+        $info = $this->model->read(['id'=>$id]);
+        if($info['id'] == $pid){
+            $this->fail('不能成为自己的上级');
+        }
+        if($info['pid'] != $pid){
+            $info = $this->model->read(['pid'=>$id]);
+            if($info !== false){
+                $this->fail('当前分类拥有子分类不允许修改父级');
+            }
+            //查询当前分类下是否有商品
+            $newsModel = new NewsModel();
+            $info = $newsModel->read(['id'=>['like','%,'.$id.',%']]);
+            if($info !== false){
+                $this->fail('当前分类下已存在新闻，不允许修改上级');
+            }
         }
         }
+        return $this->success();
     }
     }
 
 
     /**
     /**
@@ -252,6 +175,22 @@ class NewsCategoryLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @name   :(添加分类时获取1级分类)categoryTopList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/13 9:09
+     */
+    public function categoryTopList(){
+        $map = [
+            'project_id'=>$this->user['project_id'],
+            'pid'=>0,
+            'status'=>0,
+        ];
+        $list = $this->model->list($map);
+        return $this->success($list);
+    }
+
+    /**
      * @name   :(验证名称是否存在)verifyParamName
      * @name   :(验证名称是否存在)verifyParamName
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
@@ -284,6 +223,36 @@ class NewsCategoryLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @name   :(添加分类时处理子集分类)addProcessingSon
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/13 11:34
+     */
+    public function addProcessingSon($cate_id){
+        if(isset($this->param['pid']) && !empty($this->param['pid'])) {
+            $this->param['pid'] = 0;
+        }
+        //判断为子分类时
+        if($this->param['pid'] != 0) {
+            //查看当前上级分类下是否有其他分类
+            $cate_info = $this->model->read(['pid' => $this->param['pid'], 'id' => ['!=', $cate_id]]);
+            if ($cate_info === false) {
+                //查看当前上一级分类下是否有新闻
+                $newsModel = new NewsModel();
+                $news_count = $newsModel->where('category_id','like', '%,' . $this->param['pid'] . ',%')->count();
+                if ($news_count > 0) {
+                    $replacement = ','. $this->param['pid'] .','. $cate_id . ',';
+                    $old = ',' . $this->param['pid'] . ',';
+                    //更新所有商品到当前分类
+                    $newsModel->where('category_id', 'like', '%' . $old . '%')
+                        ->update(['category_id' => DB::raw("REPLACE(category_id, '$old', '$replacement')")]);
+                }
+            }
+        }
+        return $this->success();
+    }
+
+    /**
      * @remark :删除路由
      * @remark :删除路由
      * @name   :delRoute
      * @name   :delRoute
      * @author :lyh
      * @author :lyh

@@ -30,7 +30,7 @@ class NewsLogic extends BaseLogic
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
      */
      */
-    public function getCategoryList()
+    public function news_get_category_list()
     {
     {
         $this->map['status'] = 0;
         $this->map['status'] = 0;
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
@@ -148,13 +148,9 @@ class NewsLogic extends BaseLogic
     public function newsInfo()
     public function newsInfo()
     {
     {
         $info = $this->model->read($this->param);
         $info = $this->model->read($this->param);
-        if($info === false){
-            $this->fail('error');
-        }
-        //获取所有分类
-        $assCateModel = new AssociationCate();
-        $info['category_id'] = $assCateModel->where(['type_id'=>$info['id']])->pluck('category_id')->toArray();
         $info['image_link'] = getImageUrl($info['image']);
         $info['image_link'] = getImageUrl($info['image']);
+        $newsCategoryLogic = new NewsCategoryLogic();
+        $info = $newsCategoryLogic->get_category_name($info);
         return $this->success($info);
         return $this->success($info);
     }
     }
 
 

@@ -74,7 +74,7 @@ Route::middleware(['bloginauth'])->group(function () {
     Route::prefix('blog')->group(function () {
     Route::prefix('blog')->group(function () {
         //博客
         //博客
         Route::any('/', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'lists'])->name('blog_lists');
         Route::any('/', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'lists'])->name('blog_lists');
-        Route::any('/get_category_list', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'getCategoryList'])->name('blog_get_category_list');
+        Route::any('/get_category_list', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'get_category_list'])->name('blog_get_category_list');
         Route::any('/add', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'save'])->name('blog_add');
         Route::any('/add', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'save'])->name('blog_add');
         Route::any('/info', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'info'])->name('blog_info');
         Route::any('/info', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'info'])->name('blog_info');
         Route::any('/edit', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'save'])->name('blog_edit');
         Route::any('/edit', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'save'])->name('blog_edit');