周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 d92452f0bd86584fe47b6119911e4a18289cbc3c 1 个父辈 e17f6843

gx

内嵌 并排对比
正在显示 2 个修改的文件 包含 228 行增加 和 14 行删除
... ... @@ -9,6 +9,17 @@
namespace App\Console\Commands\ReplaceHtml;
use App\Models\Blog\Blog;
use App\Models\Blog\BlogCategory;
use App\Models\CustomModule\CustomModule;
use App\Models\CustomModule\CustomModuleCategory;
use App\Models\CustomModule\CustomModuleContent;
use App\Models\News\News;
use App\Models\News\NewsCategory;
use App\Models\Product\Category;
use App\Models\Product\Product;
use App\Models\RouteMap\RouteMap;
use App\Models\Template\BCustomTemplate;
use App\Models\Template\BTemplate;
use App\Models\Template\TemplateReplaceHtmlLog;
use App\Services\ProjectServer;
... ... @@ -52,10 +63,14 @@ class ReplaceHtml extends Command
$replaceHtmlModel = new TemplateReplaceHtml();
$replaceHtmlList = $replaceHtmlModel->list(['status'=>$replaceHtmlModel::STATUS]);
if(!empty($replaceHtmlList)){
foreach ($replaceHtmlList as $k => $v){
foreach ($replaceHtmlList as $v){
ProjectServer::useProject($v['project_id']);
echo '开始,任务id:'.$v['id'].PHP_EOL;
if($v['source'] == 9){//单页面
$this->createReplacePageHtmlLog($v);
}else{
$this->createReplaceHtmlLog($v);
}
//修改当前主任务状态为待执行
$replaceHtmlModel->edit(['status'=>$replaceHtmlModel::STATUS_START],['id'=>$v['id']]);
echo '结束'.PHP_EOL;
... ... @@ -68,6 +83,40 @@ class ReplaceHtml extends Command
}
/**
* @remark :生成单页面记录
* @name :createReplacePageHtmlLog
* @author :lyh
* @method :post
* @time :2024/5/13 11:40
*/
public function createReplacePageHtmlLog($info){
$saveData = [];
$customTemplateModel = new BCustomTemplate();
$list = $customTemplateModel->list(['status'=>BCustomTemplate::STATUS_ACTIVE]);
foreach ($list as $v){
$saveData[] = [
'replace_id'=>$info['id'],
'project_id'=>$info['project_id'],
'status'=>0,
'old_html'=>$info['old_html'],
'html'=>$info['html'],
'source'=>9,
'source_id'=>$v['id'],
'is_rollback'=>$info['is_rollback'],
'template_id'=>$info['template_id'],
'name'=>$v['name'],
'created_at'=>date('Y-m-d H:i:s'),
'updated_at'=>date('Y-m-d H:i:s')
];
}
if(!empty($saveData)){
$templateHtmlLogModel = new TemplateReplaceHtmlLog();
$templateHtmlLogModel->insert($saveData);
}
return true;
}
/**
* @remark :生成子任务
* @name :createReplaceHtmlLog
* @author :lyh
... ... @@ -75,34 +124,198 @@ class ReplaceHtml extends Command
* @time :2024/5/10 17:26
*/
public function createReplaceHtmlLog($info){
//获取当前页面所有数据
$saveData = [];
$bTemplateModel = new BTemplate();
$condition = ['source'=>$info['source'],'template_id'=>$info['template_id'],'is_custom'=>$info['is_custom'],'is_list'=>$info['is_list']];
$condition = ['template_id'=>$info['template_id'],'is_custom'=>$info['is_custom'],'is_list'=>$info['is_list']];
if($info['source'] != BTemplate::STATUS){
$condition['source'] = $info['source'];
}
$bTemplateList = $bTemplateModel->list($condition,'id',['id','source_id']);
$saveData = [];
foreach ($bTemplateList as $v){
$saveData[] = [
$source_id = $v['source'] == 1 ? 0 : $v['source_id'];
$name = $this->getSourceName($v['source'],$source_id,$v['is_list'],$v['is_custom']);
$saveData[] = $this->saveData($info,$v,$source_id,$name);
}
if(!empty($saveData)){
$templateHtmlLogModel = new TemplateReplaceHtmlLog();
$templateHtmlLogModel->insert($saveData);
}
return true;
}
/**
* @remark :组装数据
* @name :saveData
* @author :lyh
* @method :post
* @time :2024/5/13 11:29
*/
public function saveData($info,$v,$source_id,$name){
return [
'replace_id'=>$info['id'],
'project_id'=>$info['project_id'],
'status'=>0,
'old_html'=>$info['old_html'],
'html'=>$info['html'],
'source'=>$info['source'],
'source_id'=>$info['source'] == 1 ? 0 : $v['source_id'],
'is_custom'=>$info['is_custom'],
'is_list'=>$info['is_list'],
'source'=>$v['source'],
'source_id'=>$source_id,
'is_custom'=>$v['is_custom'],
'is_list'=>$v['is_list'],
'is_rollback'=>$info['is_rollback'],
'template_id'=>$info['template_id'],
'name'=>$name,
'created_at'=>date('Y-m-d H:i:s'),
'updated_at'=>date('Y-m-d H:i:s')
];
}
if(!empty($saveData)){
$templateHtmlLogModel = new TemplateReplaceHtmlLog();
$templateHtmlLogModel->insert($saveData);
/**
* @remark :生成子任务获取对应数据id名称
* @name :getSourceName
* @author :lyh
* @method :post
* @time :2024/5/13 10:47
*/
public function getSourceName($source,$source_id,$is_list,$is_custom){
if($is_custom == 1){//扩展模块
return $this->getCustomName($source,$source_id,$is_list);
}
return true;
if($source == BTemplate::SOURCE_HOME){
return '';
}elseif ($source == BTemplate::SOURCE_PRODUCT){
return $this->getProductName($source_id,$is_list);
}elseif ($source == BTemplate::SOURCE_BLOG){
return $this->getBlogName($source_id,$is_list);
}elseif ($source == BTemplate::SOURCE_NEWS){
return $this->getNewsName($source_id,$is_list);
}else {//单页面管理
return $this->getPageName($source_id);
}
return false;
}
/**
* @remark :获取单页面名称
* @name :getPageName
* @author :lyh
* @method :post
* @time :2024/5/13 11:10
*/
public function getPageName($source_id){
$customTemplateModel = new BCustomTemplate();
$info = $customTemplateModel->read(['id'=>$source_id]);
if($info === false){
return false;
}
return $info['name'];
}
/**
* @remark :获取新闻名称
* @name :getNewsName
* @author :lyh
* @method :post
* @time :2024/5/13 11:07
*/
public function getNewsName($source_id,$is_list){
if($is_list == BTemplate::IS_LIST){
$cateModel = new NewsCategory();
$cateInfo = $cateModel->read(['id'=>$source_id]);
if($cateInfo === false){
return false;
}
$name = $cateInfo['name'];
}else{
$newsModel = new News();
$newsInfo = $newsModel->read(['id'=>$source_id]);
if($newsInfo === false){
return false;
}
$name = $newsInfo['name'];
}
return $name;
}
/**
* @remark :获取blog名称
* @name :getBlogName
* @author :lyh
* @method :post
* @time :2024/5/13 11:05
*/
public function getBlogName($source_id,$is_list){
if($is_list == BTemplate::IS_LIST){
$cateModel = new BlogCategory();
$cateInfo = $cateModel->read(['id'=>$source_id]);
if($cateInfo === false){
return false;
}
$name = $cateInfo['name'];
}else{
$blogModel = new Blog();
$productInfo = $blogModel->read(['id'=>$source_id]);
if($productInfo === false){
return false;
}
$name = $productInfo['name'];
}
return $name;
}
/**
* @remark :获取产品名称
* @name :getProductName
* @author :lyh
* @method :post
* @time :2024/5/13 11:00
*/
public function getProductName($source_id,$is_list){
if($is_list == BTemplate::IS_LIST){
$cateModel = new Category();
$cateInfo = $cateModel->read(['id'=>$source_id]);
if($cateInfo === false){
return false;
}
$name = $cateInfo['title'];
}else{
$productModel = new Product();
$productInfo = $productModel->read(['id'=>$source_id]);
if($productInfo === false){
return false;
}
$name = $productInfo['title'];
}
return $name;
}
/**
* @remark :获取扩展模块名称
* @name :getCustomName
* @author :lyh
* @method :post
* @time :2024/5/13 10:55
*/
public function getCustomName($source,$source_id,$is_list){
$customModuleModel = new CustomModule();
$moduleInfo = $customModuleModel->read(['id'=>$source]);
if($moduleInfo === false){
return false;
}
if($is_list == BTemplate::IS_LIST){
$categoryModel = new CustomModuleCategory();
$cateInfo = $categoryModel->read(['id'=>$source_id],['id','name']);
if($cateInfo === false){
return false;
}
$name = $cateInfo['name'];
}else{
$contentModel = new CustomModuleContent();
$contentInfo = $contentModel->read(['id'=>$source_id],['id','name']);
if($contentInfo === false){
return false;
}
$name = $contentInfo['name'];
}
return $name;
}
}
... ...
... ... @@ -14,6 +14,7 @@ use App\Http\Controllers\Aside\BaseController;
use App\Http\Logic\Aside\Template\ReplaceHtmlLogic;
use App\Models\Manage\Manage;
use App\Models\Project\Project;
use App\Models\Template\BTemplate;
use App\Models\Template\TemplateReplaceHtml;
use App\Models\Template\TemplateReplaceHtmlLog;
... ... @@ -85,7 +86,7 @@ class ReplaceHtmlController extends BaseController
* @method :post
* @time :2024/5/11 11:09
*/
public function replaceTemplateSonLog(TemplateReplaceHtmlLog $replaceHtmlLog){
public function replaceTemplateSonLog(TemplateReplaceHtmlLog $replaceHtmlLog,ReplaceHtmlLogic $logic){
$this->request->validate([
'replace_id'=>'required',
],[
... ...