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

刘锟
app/Http/Controllers/Aside/Template/ATemplateController.php
app/Http/Controllers/Bside/Template/BTemplateController.php
app/Http/Logic/Aside/Project/OnlineCheckLogic.php
app/Http/Logic/Bside/BTemplate/BTemplateLogic.php
app/Http/Logic/Bside/BTemplate/VisualizationLogic.php
routes/aside.php
--- a/app/Http/Controllers/Aside/Template/ATemplateController.php
查看文件 @3097a7c
+++ b/app/Http/Controllers/Aside/Template/ATemplateController.php
查看文件 @3097a7c
@@ -7,6 +7,7 @@ use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Template\ATemplateLogic;
 use App\Http\Requests\Aside\Template\ATemplateRequest;
 use App\Models\Template\Setting;
+use App\Models\Template\Template;
 /**
  * @remark :A端主题模板管理
@@ -222,4 +223,28 @@ class ATemplateController extends BaseController
         }
         $this->response('success',Code::SUCCESS,$info);
     }
+
+    /**
+     * @remark :私有公共模板详情
+     * @name   :getProjectPublicTemplate
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/28 16:34
+     */
+    public function getProjectPublicTemplate(){
+        $aTemplateModel = new Template();
+        $filed = ['id','name','image','url','status','sort','deleted_status','test_model','project_id','created_at','project_id'];
+        $this->map['project_id'] = ['!=',0];
+        $this->map['deleted_status'] = 0;
+        $this->map['test_model'] = 2;
+        $lists = $aTemplateModel->lists($this->map,$this->page,$this->row,$this->order,$filed);
+        if(!empty($lists) && !empty($lists['list'])){
+            foreach ($lists['list'] as $k => $v){
+                $v['image_link'] = getImageUrl($v['image']);
+                $lists['list'][$k] = $v;
+            }
+        }
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
 }
--- a/app/Http/Controllers/Bside/Template/BTemplateController.php
查看文件 @3097a7c
+++ b/app/Http/Controllers/Bside/Template/BTemplateController.php
查看文件 @3097a7c
@@ -149,4 +149,5 @@ class BTemplateController extends BaseController
         $BTemplateLogic->saveDetail();
         $this->response('success');
     }
+
 }
--- a/app/Http/Logic/Aside/Project/OnlineCheckLogic.php
查看文件 @3097a7c
+++ b/app/Http/Logic/Aside/Project/OnlineCheckLogic.php
查看文件 @3097a7c
@@ -5,6 +5,7 @@ namespace App\Http\Logic\Aside\Project;
 use App\Helper\Common;
 use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Project\DeployOptimize;
 use App\Models\Project\OnlineCheck;
 use App\Models\Project\Project;
@@ -29,9 +30,12 @@ class OnlineCheckLogic extends BaseLogic
         if($info === false){
             $this->fail('项目未提交审核');
         }
+        //获取项目优化人员
+        $optimizeModel = new DeployOptimize();
+        $optimizeInfo = $optimizeModel->read(['project_id'=>$this->param['id']]);
         //查看当前用户是否有权限审核
         if($this->param['type'] == 'optimist'){
-            if($info['optimist_mid'] != $this->manager['id']){
+            if(($info['optimist_mid'] != $this->manager['id']) && ($optimizeInfo['assist_mid'] != $this->manager['id'])){
                 $this->fail('你无权限提交审核');
             }
         }else{
--- a/app/Http/Logic/Bside/BTemplate/BTemplateLogic.php
查看文件 @3097a7c
+++ b/app/Http/Logic/Bside/BTemplate/BTemplateLogic.php
查看文件 @3097a7c
@@ -524,6 +524,7 @@ class BTemplateLogic extends BaseLogic
      */
     public function savePublicTemplateHtml(){
         $this->param['project_id'] = $this->user['project_id'];
+        $this->param['test_model'] = 2;//未审核模版
         $this->param['operator_id'] = $this->user['manager_id'] ?? 0;
         $this->param = $this->stringProcessing($this->param);
         $publicTemplateModel = new Template();
--- a/app/Http/Logic/Bside/BTemplate/VisualizationLogic.php
查看文件 @3097a7c
+++ b/app/Http/Logic/Bside/BTemplate/VisualizationLogic.php
查看文件 @3097a7c
@@ -14,6 +14,7 @@ use App\Models\Project\PageSetting;
 use App\Models\Service\Service as ServiceSettingModel;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplateCommon;
+use App\Models\Template\BTemplateLog;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\Setting;
 use App\Models\Template\Template;
@@ -306,6 +307,7 @@ class VisualizationLogic extends BaseLogic
                 }else{
                     $bTemplateModel->edit($this->param,['source'=>$this->param['source'],'source_id'=>$this->param['source_id']]);
                 }
+                $this->setTemplateLog($this->param['template_id'],$this->param['html'],$this->param['source'],$this->param['source_id']);
             }
         }catch (\Exception $e){
             $this->fail('系统错误，请联系管理员');
@@ -315,6 +317,32 @@ class VisualizationLogic extends BaseLogic
     }
     /**
+     * @remark :生成记录
+     * @name   :setTemplateLog
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/23 11:16
+     */
+    public function setTemplateLog($template_id,$html,$source,$source_id){
+        $data = [
+            'template_id'=>$template_id,
+            'project_id'=>$this->user['project_id'],
+            'operator_id'=>$this->user['id'],
+            'text'=>$html,
+            'source'=>$source,
+            'source_id'=>$source_id,
+            'main_html'=>characterTruncation($this->param['html'],'/<main\b[^>]*>(.*?)<\/main>/s'),
+            'main_css'=>characterTruncation($this->param['html'],'/<style id="globalsojs-styles">(.*?)<\/style>/s'),
+            'head_html'=>characterTruncation($html,'/<header\b[^>]*>(.*?)<\/header>/s'),
+            'head_css'=>characterTruncation($html,'/<style id="globalsojs-header">(.*?)<\/style>/s'),
+            'footer_html'=>characterTruncation($html,'/<footer\b[^>]*>(.*?)<\/footer>/s'),
+            'footer_css'=>characterTruncation($html,'/<style id="globalsojs-footer">(.*?)<\/style>/s'),
+        ];
+        $bTemplateLogModel = new BTemplateLog();
+        return $bTemplateLogModel->add($data);
+    }
+
+    /**
      * @remark :保存头部公共数据
      * @name   :saveCommonTemplate
      * @author :lyh
--- a/routes/aside.php
查看文件 @3097a7c
+++ b/routes/aside.php
查看文件 @3097a7c
@@ -311,6 +311,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/setHeadFooter', [Aside\Template\ATemplateController::class, 'setHeadFooter'])->name('admin.template_setHeadFooter');
         Route::any('/getHeadFooter', [Aside\Template\ATemplateController::class, 'getHeadFooter'])->name('admin.template_getHeadFooter');
         Route::any('/setPublicTemplate', [Aside\Template\ATemplateController::class, 'setPublicTemplate'])->name('admin.template_setPublicTemplate');
+        Route::any('/getProjectPublicTemplate', [Aside\Template\ATemplateController::class, 'getProjectPublicTemplate'])->name('admin.template_getProjectPublicTemplate');
         // 左侧模块
         Route::prefix('module')->group(function () {
             Route::any('/', [Aside\Template\ATemplateModuleController::class, 'lists'])->name('admin.ATemplateModule_lists');