Merge branch 'lyh_edit' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -170,29 +170,4 @@ class BTemplateController extends BaseController
         $info = $bTemplateModel->sourceMap();
         $info = $bTemplateModel->sourceMap();
         $this->response('success',Code::SUCCESS,$info);
         $this->response('success',Code::SUCCESS,$info);
     }
     }
-
-    /**
-     * @remark :替换同一种类型的html代码
-     * @name   :replaceTemplateMainHtml
-     * @author :lyh
-     * @method :post
-     * @time   :2024/5/7 14:39
-     */
-    public function replaceTemplateMainHtml(BTemplateLogic $BTemplateLogic){
-        $this->request->validate([
-            'old_html'=>'required',
-            'html'=>'required',
-            'type'=>'required',
-            'is_list'=>'required',
-            'is_custom'=>'required',
-        ],[
-            'old_html.required' => '需替换的html不能为空',
-            'html.required' => 'html不能为空',
-            'type.required' => '类型type不能为空',
-            'is_custom.required' => '类型is_custom不能为空',
-            'is_list.required' => '类型is_list不能为空',
-        ]);
-        $BTemplateLogic->replaceHtml();
-        $this->response('success');
-    }
 }
 }

+<?php
+/**
+ * @remark :
+ * @name   :ReplaceHtmlController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/5/8 10:02
+ */
+
+namespace App\Http\Controllers\Bside\Template;
+
+use App\Http\Controllers\Bside\BaseController;
+use App\Http\Logic\Bside\BTemplate\BTemplateLogic;
+use App\Http\Logic\Bside\BTemplate\ReplaceHtmlLogic;
+
+class ReplaceHtmlController extends BaseController
+{
+    /**
+     * @remark :替换同一种类型的html代码
+     * @name   :replaceTemplateMainHtml
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/7 14:39
+     */
+    public function replaceTemplateMainHtml(ReplaceHtmlLogic $logic){
+        $this->request->validate([
+            'old_html'=>'required',
+            'html'=>'required',
+            'type'=>'required',
+            'is_list'=>'required',
+            'is_custom'=>'required',
+        ],[
+            'old_html.required' => '需替换的html不能为空',
+            'html.required' => 'html不能为空',
+            'type.required' => '类型type不能为空',
+            'is_custom.required' => '类型is_custom不能为空',
+            'is_list.required' => '类型is_list不能为空',
+        ]);
+        $logic->replaceHtml();
+        $this->response('success');
+    }
+}

@@ -917,74 +917,4 @@ class BTemplateLogic extends BaseLogic
         }
         }
         return $this->success();
         return $this->success();
     }
     }
-
-    /**
-     * @remark :替换可视化的html代码（按类型）
-     * @name   :replaceHtml
-     * @author :lyh
-     * @method :post
-     * @time   :2024/5/7 15:52
-     */
-    public function replaceHtml(){
-        $type = $this->getCustomizedType($this->param['type'], $this->param['is_list']);//获取定制界面类型
-        //查看当前页面是否定制，是否开启可视化
-        $page_array = (array)$this->user['is_visualization']->page_array;//获取所有定制界面
-        if (in_array($type, $page_array)) {//当前页面是定制界面
-            $this->param['template_id'] = 0;
-        }
-        $replaceId = $this->saveReplaceHtml($this->param);
-        //TODO::生成一条任务记录
-        //查询当前所有装修的
-        $condition = ['source'=>$this->param['type'],'is_custom'=>$this->param['is_custom'],'is_list'=>$this->param['is_list'],
-            'template_id'=>$this->param['template_id']];
-        $list = $this->model->list($condition);
-        foreach ($list as $v){
-            if($v['type'] == 0){
-                $main_html = str_replace($this->param['old_html'],$this->param['html'],$v['main_html']);
-                $this->model->edit(['main_html'=>$main_html],['id'=>$v['id']]);
-            }else{
-                $html = str_replace($this->param['old_html'],$this->param['html'],$v['html']);
-                $this->model->edit(['html'=>$html],['id'=>$v['id']]);
-            }
-            $this->saveReplaceHtmlLog($replaceId,$v['id']);
-        }
-        return $this->success();
-    }
-
-    /**
-     * @remark :生成一条记录
-     * @name   :saveTemplateLog
-     * @author :lyh
-     * @method :post
-     * @time   :2024/5/8 9:23
-     */
-    public function saveReplaceHtml($data,$template_id){
-        $logData = [
-            'type'=>$data['type'],
-            'is_custom'=>$data['is_custom'],
-            'is_list'=>$data['is_list'],
-            'template_id'=>$template_id,
-            'old_html'=>$data['old_html'],
-            'html'=>$data['html'],
-        ];
-        $replaceHtmlModel = new TemplateReplaceHtml();
-        return $replaceHtmlModel->addReturnId($logData);
-    }
-
-    /**
-     * @remark :保存每条替换记录
-     * @name   :saveReplaceHtmlLog
-     * @author :lyh
-     * @method :post
-     * @time   :2024/5/8 9:37
-     */
-    public function saveReplaceHtmlLog($replace_id,$replace_template_id){
-        $logData = [
-            'replace_id'=>$replace_id,
-            'replace_template_id'=>$replace_template_id,
-            'uid'=>$this->user['manager_id'],
-        ];
-        $replaceHtmlModel = new TemplateReplaceHtmlLog();
-        return $replaceHtmlModel->add($logData);
-    }
 }
 }

+<?php
+/**
+ * @remark :
+ * @name   :ReplaceHtmlLogic.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/5/8 10:03
+ */
+
+namespace App\Http\Logic\Bside\BTemplate;
+
+use App\Http\Logic\Bside\BaseLogic;
+use App\Models\Template\BTemplate;
+use App\Models\Template\TemplateReplaceHtml;
+use App\Models\Template\TemplateReplaceHtmlLog;
+
+class ReplaceHtmlLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new TemplateReplaceHtml();
+        $this->param = $this->requestAll;
+    }
+
+    /**
+     * @remark :替换可视化的html代码（按类型）
+     * @name   :replaceHtml
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/7 15:52
+     */
+    public function replaceHtml(){
+        $type = $this->getCustomizedType($this->param['type'], $this->param['is_list']);//获取定制界面类型
+        //查看当前页面是否定制，是否开启可视化
+        $page_array = (array)$this->user['is_visualization']->page_array;//获取所有定制界面
+        if (in_array($type, $page_array)) {//当前页面是定制界面
+            $this->param['template_id'] = 0;
+        }
+        $replaceId = $this->saveReplaceHtml($this->param);
+        //TODO::生成一条任务记录
+        //查询当前所有装修的
+        $condition = ['source'=>$this->param['type'],'is_custom'=>$this->param['is_custom'],'is_list'=>$this->param['is_list'],
+            'template_id'=>$this->param['template_id']];
+        $list = $this->model->list($condition);
+        foreach ($list as $v){
+            if($v['type'] == 0){
+                $main_html = str_replace($this->param['old_html'],$this->param['html'],$v['main_html']);
+                $this->model->edit(['main_html'=>$main_html],['id'=>$v['id']]);
+            }else{
+                $html = str_replace($this->param['old_html'],$this->param['html'],$v['html']);
+                $this->model->edit(['html'=>$html],['id'=>$v['id']]);
+            }
+            $this->saveReplaceHtmlLog($replaceId,$v['id']);
+        }
+        return $this->success();
+    }
+
+    /**
+     * @remark :生成一条记录
+     * @name   :saveTemplateLog
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/8 9:23
+     */
+    public function saveReplaceHtml($data,$template_id){
+        $logData = [
+            'type'=>$data['type'],
+            'is_custom'=>$data['is_custom'],
+            'is_list'=>$data['is_list'],
+            'template_id'=>$template_id,
+            'old_html'=>$data['old_html'],
+            'html'=>$data['html'],
+        ];
+        return $this->model->addReturnId($logData);
+    }
+
+    /**
+     * @remark :保存每条替换记录
+     * @name   :saveReplaceHtmlLog
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/8 9:37
+     */
+    public function saveReplaceHtmlLog($replace_id,$replace_template_id){
+        $logData = [
+            'replace_id'=>$replace_id,
+            'replace_template_id'=>$replace_template_id,
+            'uid'=>$this->user['manager_id'],
+        ];
+        $replaceHtmlModel = new TemplateReplaceHtmlLog();
+        return $replaceHtmlModel->add($logData);
+    }
+}