Merge remote-tracking branch 'origin/master' into akun

@@ -91,6 +91,7 @@ class ReplaceHtml extends Command
                 'source_id'=>$v['id'],
                 'source_id'=>$v['id'],
                 'is_custom'=>$info['is_custom'],
                 'is_custom'=>$info['is_custom'],
                 'is_list'=>$info['is_list'],
                 'is_list'=>$info['is_list'],
+                'is_rollback'=>$info['rollback'],
                 'created_at'=>date('Y-m-d H:i:s'),
                 'created_at'=>date('Y-m-d H:i:s'),
                 'updated_at'=>date('Y-m-d H:i:s')
                 'updated_at'=>date('Y-m-d H:i:s')
             ];
             ];

@@ -78,7 +78,22 @@ class ReplaceHtmlController extends BaseController
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
-
+    /**
+     * @remark :获取替换子记录
+     * @name   :replaceTemplateSonLog
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/11 11:09
+     */
+    public function replaceTemplateSonLog(TemplateReplaceHtmlLog $replaceHtmlLog){
+        $this->request->validate([
+            'replace_id'=>'required',
+        ],[
+            'replace_id.required' => '主id不能为空',
+        ]);
+        $lists = $replaceHtmlLog->lists($this->map,$this->page,$this->row,$this->order);
+        $this->response('success',Code::SUCCESS,$lists);
+    }
 
 
     /**
     /**
      * @remark :还原
      * @remark :还原
@@ -96,4 +111,21 @@ class ReplaceHtmlController extends BaseController
         $data = $logic->reductionHtml();
         $data = $logic->reductionHtml();
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
+
+    /**
+     * @remark :根据id还原html
+     * @name   :rollbackIdHtml
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/11 11:22
+     */
+    public function rollbackIdHtml(ReplaceHtmlLogic $logic){
+        $this->request->validate([
+            'id'=>'required',
+        ],[
+            'id.required' => 'id不能为空',
+        ]);
+        $data = $logic->rollbackIdHtml();
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }
 }

@@ -258,4 +258,32 @@ class ReplaceHtmlLogic extends BaseLogic
         }
         }
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @remark :根据id还原
+     * @name   :rollbackIdHtml
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/11 11:31
+     */
+    public function rollbackIdHtml(){
+        $replaceHtmlLogModel = new TemplateReplaceHtmlLog();
+        $info = $replaceHtmlLogModel->read(['id'=>$this->param['id']]);
+        ProjectServer::useProject($info['project_id']);
+        $bTemplateModel = new BTemplate();
+        $condition = ['source'=>$info['source'],'source_id'=>$info['source_id'],
+            'template_id'=>$info['template_id'],'is_custom'=>$info['is_custom'],'is_list'=>$info['is_list']];
+        $old_html = $info['old_html'];
+        $html = $info['html'];
+        if($info['template_id'] == 0){
+            $bTemplateModel->formatQuery($condition)->update(['html' => DB::raw("REPLACE(html, '$old_html', '$html')")]);
+        }else{
+            $bTemplateModel->formatQuery($condition)->update(['main_html' => DB::raw("REPLACE(main_html, '$old_html', '$html')")]);
+        }
+        //修改当前数据为还原数据
+        $replaceHtmlLogModel->edit(['is_rollback'=>1],['id'=>$this->param['id']]);
+        DB::disconnect('custom_mysql');
+        return $this->success();
+    }
+
 }
 }

@@ -380,6 +380,7 @@ Route::middleware(['aloginauth'])->group(function () {
     Route::prefix('replace')->group(function () {
     Route::prefix('replace')->group(function () {
         Route::any('/replaceTemplateMainHtml', [Aside\Template\ReplaceHtmlController::class, 'replaceTemplateMainHtml'])->name('admin.replace_replaceTemplateMainHtml');
         Route::any('/replaceTemplateMainHtml', [Aside\Template\ReplaceHtmlController::class, 'replaceTemplateMainHtml'])->name('admin.replace_replaceTemplateMainHtml');
         Route::any('/replaceTemplateLog', [Aside\Template\ReplaceHtmlController::class, 'replaceTemplateLog'])->name('admin.replace_replaceTemplateLog');
         Route::any('/replaceTemplateLog', [Aside\Template\ReplaceHtmlController::class, 'replaceTemplateLog'])->name('admin.replace_replaceTemplateLog');
+        Route::any('/replaceTemplateSonLog', [Aside\Template\ReplaceHtmlController::class, 'replaceTemplateSonLog'])->name('admin.replace_replaceTemplateSonLog');
         Route::any('/reductionHtml', [Aside\Template\ReplaceHtmlController::class, 'reductionHtml'])->name('admin.replace_reductionHtml');
         Route::any('/reductionHtml', [Aside\Template\ReplaceHtmlController::class, 'reductionHtml'])->name('admin.replace_reductionHtml');
         Route::any('/pageType', [Aside\Template\ReplaceHtmlController::class, 'pageType'])->name('admin.replace_pageType');
         Route::any('/pageType', [Aside\Template\ReplaceHtmlController::class, 'pageType'])->name('admin.replace_pageType');
     });
     });