合并分支 'master-lyh-edit' 到 'master'

开发公共模版审核，并调试扩展模块保存串台问题



查看合并请求 !584

@@ -39,7 +39,6 @@ class CustomModuleController extends BaseController
             $this->response('success');
             $this->response('success');
         }
         }
         $customModule = new CustomModule();
         $customModule = new CustomModule();
-        $this->map['status'] = 0;
         $lists = $customModule->lists($this->map,$this->page,$this->row,$this->order = ['topping_time','sort','id']);
         $lists = $customModule->lists($this->map,$this->page,$this->row,$this->order = ['topping_time','sort','id']);
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);

@@ -245,4 +245,20 @@ class ATemplateController extends BaseController
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
+    /**
+     * @remark :修改审核状态
+     * @name   :auditingStatus
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/23 16:42
+     */
+    public function auditingStatus(ATemplateLogic $aTemplateLogic){
+        $this->request->validate([
+            'id'=>'required'
+        ],[
+            'id.required' => 'ID不能为空'
+        ]);
+        $data = $aTemplateLogic->auditingStatus();
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }
 }

@@ -101,13 +101,6 @@ class ProjectUserController extends BaseController
      */
      */
     public function save(UserRequest $request,UserLogic $userLogic){
     public function save(UserRequest $request,UserLogic $userLogic){
         $request->validated();
         $request->validated();
-        if(!isset($this->param['id'])){
-            $this->request->validate([
-                'password'=>'required',
-            ],[
-                'password.required' => '密码不能为空',
-            ]);
-        }
         $userLogic->projectUserSave();
         $userLogic->projectUserSave();
         $this->response('success');
         $this->response('success');
     }
     }

@@ -64,6 +64,9 @@ class FileManageController extends BaseController
      * @time   :2023/12/28 17:18
      * @time   :2023/12/28 17:18
      */
      */
     public function downLoad(){
     public function downLoad(){
+        if(!isset($this->param['path']) || empty($this->param['path'])){
+            $this->response('参数错误',Code::SYSTEM_ERROR);
+        }
         $username = basename($this->param['path']);
         $username = basename($this->param['path']);
         $parsed_url = parse_url($this->param['path']);
         $parsed_url = parse_url($this->param['path']);
         if(isset($parsed_url['scheme'])){
         if(isset($parsed_url['scheme'])){

@@ -3,6 +3,7 @@
 namespace App\Http\Logic\Aside\Template;
 namespace App\Http\Logic\Aside\Template;
 
 
 use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Manage\Manage;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\Service\Service as ServiceSettingModel;
 use App\Models\Service\Service as ServiceSettingModel;
 use App\Models\Template\BTemplate;
 use App\Models\Template\BTemplate;
@@ -123,6 +124,12 @@ class ATemplateLogic extends BaseLogic
         if(!empty($info['image'])){
         if(!empty($info['image'])){
             $info['image_link'] = getImageUrl($info['image']);
             $info['image_link'] = getImageUrl($info['image']);
         }
         }
+        if(!empty($info['design_manager'])){
+            $info['design_manager'] = (new Manage())->getName($info['design_manager']);
+        }
+        if(!empty($info['front_manager'])){
+            $info['front_manager'] = (new Manage())->getName($info['front_manager']);
+        }
         return $this->success($info);
         return $this->success($info);
     }
     }
 
 
@@ -244,4 +251,30 @@ class ATemplateLogic extends BaseLogic
         }
         }
         return $this->success($data);
         return $this->success($data);
     }
     }
+
+    /**
+     * @remark :修改状态
+     * @name   :auditingStatus
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/23 16:44
+     */
+    public function auditingStatus(){
+        //获取当前数据详情
+        $info = $this->model->read(['id'=>$this->param['id']]);
+        if(isset($this->param['front_status']) && $this->param['front_status'] == 1){
+            if($info['design_status'] == 0){
+                $this->fail('请先提交设计审核');
+            }
+            $this->param['design_manager'] = $this->manager['id'];
+            $this->param['test_model'] = 0;
+        }else{
+            $this->param['front_manager'] = $this->manager['id'];
+        }
+        $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->fail('修改失败，请联系管理员');
+        }
+        return $this->success(['id'=>$this->param['id']]);
+    }
 }
 }

@@ -60,10 +60,8 @@ class UserLogic extends BaseLogic
             }
             }
             $this->param = $this->editPassword($this->param);
             $this->param = $this->editPassword($this->param);
             $rs = $this->model->edit($this->param, ['id' => $this->param['id']]);
             $rs = $this->model->edit($this->param, ['id' => $this->param['id']]);
+            DB::table('gl_user_edit_log')->insert(['message'=>json_encode($this->param),'user_id'=>$this->manager['id'],'project_id'=>$this->user['project_id'],'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')]);
         } else {
         } else {
-//            $mobileModel = new Mobile();
-//            //查看当前手机号码是否存在于手机号码库
-//            $mobileInfo = $mobileModel->read(['mobile'=>$this->param['mobile']]);
             $this->param['password'] = base64_encode(md5($this->param['password']));
             $this->param['password'] = base64_encode(md5($this->param['password']));
             $rs = $this->model->add($this->param);
             $rs = $this->model->add($this->param);
         }
         }

@@ -59,7 +59,7 @@ class CountLogic extends BaseLogic
      */
      */
     public function scheme_info(){
     public function scheme_info(){
         $data = [
         $data = [
-            'company'=>$this->project['company'],
+            'company'=>$this->project['company'] ?? '',
             'scheme'=>Project::planMap()[$this->project['deploy_build']['plan']],
             'scheme'=>Project::planMap()[$this->project['deploy_build']['plan']],
             'service_duration'=>$this->project['deploy_build']['service_duration'],
             'service_duration'=>$this->project['deploy_build']['service_duration'],
         ];
         ];

@@ -5,6 +5,7 @@ namespace App\Http\Logic\Bside\User;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\User\DeptUser;
 use App\Models\User\DeptUser;
 use App\Models\User\User as UserModel;
 use App\Models\User\User as UserModel;
+use Illuminate\Support\Facades\DB;
 
 
 class DeptUserLogic extends BaseLogic
 class DeptUserLogic extends BaseLogic
 {
 {

@@ -6,6 +6,7 @@ use App\Enums\Common\Code;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\User\User;
 use App\Models\User\User;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
 
 
 class UserLogic extends BaseLogic
 class UserLogic extends BaseLogic
 {
 {
@@ -84,6 +85,8 @@ class UserLogic extends BaseLogic
         if($rs === false){
         if($rs === false){
             $this->fail('系统错误，请联系管理员');
             $this->fail('系统错误，请联系管理员');
         }
         }
+        //todo::写入日志
+        DB::table('gl_user_edit_log')->insert(['message'=>json_encode($this->param),'user_id'=>$this->user['id'],'project_id'=>$this->user['project_id'],'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')]);
         return $this->success();
         return $this->success();
     }
     }
 
 

@@ -358,6 +358,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/setHeadFooter', [Aside\Template\ATemplateController::class, 'setHeadFooter'])->name('admin.template_setHeadFooter');
         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('/getHeadFooter', [Aside\Template\ATemplateController::class, 'getHeadFooter'])->name('admin.template_getHeadFooter');
         Route::any('/setPublicTemplate', [Aside\Template\ATemplateController::class, 'setPublicTemplate'])->name('admin.template_setPublicTemplate');
         Route::any('/setPublicTemplate', [Aside\Template\ATemplateController::class, 'setPublicTemplate'])->name('admin.template_setPublicTemplate');
+        Route::any('/auditingStatus', [Aside\Template\ATemplateController::class, 'auditingStatus'])->name('admin.template_auditingStatus');
         Route::any('/getProjectPublicTemplate', [Aside\Template\ATemplateController::class, 'getProjectPublicTemplate'])->name('admin.template_getProjectPublicTemplate');
         Route::any('/getProjectPublicTemplate', [Aside\Template\ATemplateController::class, 'getProjectPublicTemplate'])->name('admin.template_getProjectPublicTemplate');
         // 左侧模块
         // 左侧模块
         Route::prefix('module')->group(function () {
         Route::prefix('module')->group(function () {