gx脚本更新路由

@@ -12,6 +12,7 @@ use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Facades\Redis;
 
 
 define('HTTP_OPENAI_URL', 'http://openai.waimaoq.com/');
 define('HTTP_OPENAI_URL', 'http://openai.waimaoq.com/');
+
 /**
 /**
  * 生成路由标识
  * 生成路由标识
  * @param $string
  * @param $string
@@ -26,6 +27,13 @@ if (!function_exists('generateRoute')) {
         if(is_array($string)){
         if(is_array($string)){
             $string = $string[0];
             $string = $string[0];
         }
         }
+        $length = strlen($string);
+        if($length >= 5){
+            $last5Chars = substr($string, -5);
+            if($last5Chars == '.html'){
+                return strtolower($string);
+            }
+        }
         return str_replace(".", "", trim(strtolower(preg_replace('/[^\w.]+/', '-', trim($string))), '-'));
         return str_replace(".", "", trim(strtolower(preg_replace('/[^\w.]+/', '-', trim($string))), '-'));
     }
     }
 }
 }

@@ -73,91 +73,4 @@ class DetailController extends BaseController
         $data = $column->list($this->map,'id',['*'],'asc');
         $data = $column->list($this->map,'id',['*'],'asc');
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
-
-    /**
-     * @remark :保存切换栏
-     * @name   :saveColumn
-     * @author :lyh
-     * @method :post
-     * @time   :2024/11/12 15:13
-     */
-    public function saveColumn(DetailLogic $logic){
-        $this->request->validate([
-            'column_name'=>'required',
-            'product_id'=>'required'
-        ],[
-            'column_name.required' => '栏目名称不能为空',
-            'product_id.required' => '产品id不能为空'
-        ]);
-        $data = $logic->saveColumn();
-        $this->response('success',Code::SUCCESS,$data);
-    }
-
-    /**
-     * @remark :保存数据
-     * @name   :saveDetail
-     * @author :lyh
-     * @method :post
-     * @time   :2024/11/12 16:24
-     */
-    public function saveDetail(DetailLogic $logic){
-        $this->request->validate([
-            'product_id'=>'required',
-            'data'=>'required',
-        ],[
-            'product_id.required' => '产品id不能为空',
-            'data.required' => 'data不能为空',
-        ]);
-        $data = $logic->saveDetail($this->param['product_id'],$this->param['data']);
-        $this->response('success',Code::SUCCESS,$data);
-    }
-
-    /**
-     * @remark :删除切换栏
-     * @name   :delColumn
-     * @author :lyh
-     * @method :post
-     * @time   :2024/11/13 10:40
-     */
-    public function delColumn(Column $column,Detail $detail){
-        $this->request->validate([
-            'id'=>'required',
-        ],[
-            'id.required' => 'id不能为空',
-        ]);
-        $info = $column->read($this->map);
-        if($info === false){
-            $this->fail('当前数据不存在或已被删除');
-        }
-        if($info['id'] == 1){
-            $this->fail('当前默认模块不允许删除');
-        }
-        DB::beginTransaction();
-        try {
-            $column->del(['id'=>$this->param['id']]);
-            $detail->del(['column_id'=>$info['id']]);
-            DB::commit();
-        }catch (\Exception $e){
-            DB::rollBack();
-            $this->fail('删除失败，请联系管理员');
-        }
-        $this->response('success');
-    }
-
-    /***
-     * @remark :删除模块
-     * @name   :delDetail
-     * @author :lyh
-     * @method :post
-     * @time   :2024/11/13 10:24
-     */
-    public function delDetail(Detail $detail){
-        $this->request->validate([
-            'id'=>'required',
-        ],[
-            'id.required' => 'id不能为空',
-        ]);
-        $detail->del($this->map);
-        $this->response('success');
-    }
 }
 }

@@ -7,6 +7,8 @@ use App\Helper\Common;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Product\Category;
 use App\Models\Product\Category;
 use App\Models\Product\CategoryRelated;
 use App\Models\Product\CategoryRelated;
+use App\Models\Product\Column;
+use App\Models\Product\Detail;
 use App\Models\Product\ExtendInfo;
 use App\Models\Product\ExtendInfo;
 use App\Models\Product\Keyword;
 use App\Models\Product\Keyword;
 use App\Models\Product\KeywordRelated;
 use App\Models\Product\KeywordRelated;
@@ -39,115 +41,178 @@ class ProductLogic extends  BaseLogic
      * @time   :2023/8/21 18:35
      * @time   :2023/8/21 18:35
      */
      */
     public function productSave(){
     public function productSave(){
-        //处理扩展字段
-        $extend = $this->handleExtent();
-        //单独处理分类
-        $category_ids = $this->handleCategory();
-        $keyword_arr = $this->param['keyword_id'] ?? [];
-        //处理其他字段
-        $this->param = $this->handleSaveParam($this->param);
         try {
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
-                $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
-                $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
-                if($is_upgrade == 0 || $six_read == 0){
-                    $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
-                }
-                $route = $this->param['route'];
-                $this->model->edit($this->param,['id'=>$this->param['id']]);
-                $id = $this->param['id'];
+                $data = $this->editProduct();
             }else{
             }else{
-                $this->param = $this->addHandleParam($this->param);
-                if($this->user['project_id'] != 2059){//2059项目不处理排序
-                    $this->param['sort'] = $this->setProductSort();
-                }
-                $id = $this->model->addReturnId($this->param);
-                $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']);
-                $this->model->edit(['route'=>$route],['id'=>$id]);
+                $data = $this->addProduct();
             }
             }
-            //产品分类关联
-            CategoryRelated::saveRelated($id, $category_ids);
-            KeywordRelated::saveRelated($id,$keyword_arr);
-            //更新产品新描述
-            $detailLogic = new DetailLogic();
-            $detailLogic->saveDetail($id,$this->param['data'] ?? []);
-            //保存扩展字段
-            $this->saveExtendInfo($id,$extend);
+            CategoryRelated::saveRelated($data['id'], $this->param['category_id'] ?? []);//分类关联
+            KeywordRelated::saveRelated($data['id'],$this->param['keyword_id'] ?? []);//关键字关联
+            $this->saveExtendInfo($data['id'],$this->param['extend'] ?? []);//扩展字段
+            $this->saveDetail($data['id'],$this->param['detail'] ?? []);
         }catch (\Exception $e){
         }catch (\Exception $e){
             Log::info('错误信息---'.$e->getMessage());
             Log::info('错误信息---'.$e->getMessage());
             $this->fail('系统错误,请联系管理员');
             $this->fail('系统错误,请联系管理员');
         }
         }
-        $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route);
-        $this->curlDelRoute(['new_route'=>$route]);
-        return $this->success(['id'=>$id]);
+        $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$data['route'] ?? '');
+        $this->curlDelRoute(['new_route'=>$data['route'] ?? '']);
+        return $this->success(['id'=>$data['id']]);
     }
     }
 
 
     /**
     /**
-     * @remark :设置最新产品的sort排序
-     * @name   :setNewsSort
+     * @remark :新增产品
+     * @name   :saveProduct
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/12/25 9:27
+     * @time   :2024/12/18 9:48
      */
      */
-    public function setProductSort(){
-        $info = $this->model->orderBy('sort','desc')->first();
-        if(empty($info)){
-            return 1;
+    public function addProduct(){
+        //处理字段
+        $param = $this->handleSaveParam($this->param);
+        //新增时所需默认参数
+        $param['project_id'] = $this->user['project_id'];
+        if($this->user['project_id'] != 2059){//2059项目不处理排序
+            $param['sort'] = $this->setProductSort();
         }
         }
-        $sort = $info['sort']+1;
-        return $sort;
+        try {
+            $id = $this->model->addReturnId($param);
+            $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']);
+            $this->model->edit(['route'=>$route],['id'=>$id]);
+            //保存新描述
+        }catch (\Exception $e){
+            $this->fail('操作失败，请联系管理员:'.$e->getMessage());
+        }
+        return $this->success(['id'=>$id,'route'=>$route]);
     }
     }
 
 
     /**
     /**
-     * @remark :处理扩展字段
-     * @name   :handleExtent
+     * @remark :编辑产品
+     * @name   :editProduct
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/12/6 15:06
+     * @time   :2024/12/18 10:09
      */
      */
-    public function handleExtent(){
-        //扩展字段
-        $extend = [];
-        if(!empty($this->param['extend'])){
-            $extend = $this->param['extend'];
-            unset($this->param['extend']);
-        }
-        return $extend;
+    public function editProduct(){
+        //处理字段
+        $param = $this->handleSaveParam($this->param);
+        $route = $param['route'];
+        $is_upgrade = $param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
+        $six_read = $param['six_read'] ?? 0;//是否按6.0显示
+        try {
+            if($six_read == 0 && $is_upgrade == 1){
+                unset($param['route']);
+            }else{
+                $param['route'] = RouteMap::setRoute($param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
+            }
+            $this->model->edit($param,['id'=>$this->param['id']]);
+            //保存新描述
+        }catch (\Exception $e){
+            $this->fail('操作失败，请联系管理员:'.$e->getMessage());
+        }
+        return $this->success(['id'=>$this->param['id'],'route'=>$route]);
     }
     }
 
 
     /**
     /**
-     * @remark :处理分类数据
-     * @name   :handleCategory
+     * @remark :保存产品描述切换栏
+     * @name   :saveDetail
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/12/6 15:01
+     * @time   :2024/12/18 10:25
      */
      */
-    public function handleCategory(){
-        $category_ids = [];
-        if(isset($this->param['category_id']) && !empty($this->param['category_id'])) {
-            $category_ids = $this->param['category_id'];
-            $this->param['category_id'] = ','.implode(',',$category_ids).',';
+    public function saveDetail($product_id,$detail){
+        $this->delProductDetail($product_id);
+        if(!empty($detail)){
+            try {
+                foreach ($detail as $val){
+                    foreach ($val as $v){
+                        if(empty($v['column_name'])){
+                            continue;
+                        }
+                        //查看当前栏目是否存在
+                        $columnId = $this->getColumnId($product_id,$v['column_name']);
+                        $save_data = $this->handleDetailParam($columnId['column_id'],$product_id,$v);
+                        $this->model->add($save_data);
+                    }
+                }
+            }catch (\Exception $e){
+                $this->fail('保存失败，请联系管理员.错误：'.$e->getMessage());
+            }
+        }
+        return $this->success(['product_id'=>$product_id]);
+    }
+
+    /**
+     * @remark :删除当前产品的所有detail
+     * @name   :delProductDetail
+     * @author :lyh
+     * @method :post
+     * @time   :2024/12/18 10:50
+     */
+    public function delProductDetail($product_id){
+        $columnModel = new Column();
+        $columnModel->del(['product_id'=>$product_id]);
+        $detailModel= new Detail();
+        $detailModel->del(['product_id'=>$product_id]);
+        return $this->success();
+    }
+
+    /**
+     * @remark :获取当前栏目id
+     * @name   :getColumnId
+     * @author :lyh
+     * @method :post
+     * @time   :2024/12/18 10:42
+     */
+    public function getColumnId($product_id,$column_name){
+        $columnModel = new Column();
+        $columnInfo = $columnModel->read(['column_name'=>strtolower($column_name),'product_id'=>$product_id]);
+        if($columnInfo['id'] != 1){
+            $column_id = $columnModel->addReturnId(['column_name'=>$column_name,'product_id'=>$product_id]);
         }else{
         }else{
-            $this->param['category_id'] = '';
+            $column_id = 1;
         }
         }
-        return $category_ids;
+        return $this->success(['column_id'=>$column_id]);
     }
     }
 
 
     /**
     /**
-     * @remark :新增时处理字段
-     * @name   :addHandleParam
+     * @remark :保存时处理描述数据
+     * @name   :handleDetailParam
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/11/9 14:48
+     * @time   :2024/12/18 10:47
      */
      */
-    public function addHandleParam($param){
-        $param['project_id'] = $this->user['project_id'];
-        $param['created_at'] = date('Y-m-d H:i:s');
-        $param['updated_at'] = $param['created_at'];
-        return $param;
+    public function handleDetailParam($column_id,$product_id,$info){
+        $save_data = [
+            'sort'=>$info['sort'],
+            'column_id'=>$column_id,
+            'product_id'=>$product_id,
+            'text_type'=>$info['text_type'],
+            'title'=>$info['title'] ?? '',
+            'content'=>json_encode($info['content'] ?? [],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
+            'css'=>json_encode($info['css'] ?? [],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
+        ];
+        return $this->success(['data'=>$save_data]);
     }
     }
 
 
     /**
     /**
+     * @remark :设置最新产品的sort排序
+     * @name   :setNewsSort
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/25 9:27
+     */
+    public function setProductSort(){
+        $info = $this->model->orderBy('sort','desc')->first();
+        if(empty($info)){
+            return 1;
+        }
+        $sort = $info['sort']+1;
+        return $sort;
+    }
+
+
+    /**
      * @remark :保存扩展字段
      * @remark :保存扩展字段
      * @name   :saveExtend
      * @name   :saveExtend
      * @author :lyh
      * @author :lyh
@@ -282,6 +347,12 @@ class ProductLogic extends  BaseLogic
      * @time   :2023/8/21 17:03
      * @time   :2023/8/21 17:03
      */
      */
     public function handleSaveParam(&$param){
     public function handleSaveParam(&$param){
+        if(isset($this->param['category_id']) && !empty($this->param['category_id'])) {
+            $category_ids = $this->param['category_id'];
+            $param['category_id'] = ','.implode(',',$category_ids).',';
+        }else{
+            $param['category_id'] = '';
+        }
         //产品图
         //产品图
         if(isset($param['gallery']) && !empty($param['gallery'])){
         if(isset($param['gallery']) && !empty($param['gallery'])){
             foreach ($param['gallery'] as $k => $v){
             foreach ($param['gallery'] as $k => $v){