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

@@ -60,7 +60,8 @@ class TemplateController extends BaseController
 
         $data = TemplateLogic::instance()->getInfo($res['id']);
 
-        return $this->success($data);
+        return $this->response('',Code::SUCCESS,$data);
+
     }
 
 
@@ -90,7 +91,11 @@ class TemplateController extends BaseController
      */
     public function html_index($template_id){
 
-        $lists = (new ATemplateHtml)->list([['template_id','=',$template_id]],$this->order,['id','name','status','is_default','sort','thumb','url','created_at','updated_at']);
+        $lists = (new ATemplateHtml)->list(
+            ['template_id'=>$template_id],
+            $this->order
+//            , ['id','name','status','is_default','sort','thumb','url','created_at','updated_at']
+        );
         $this->response('success',Code::SUCCESS,$lists);
 
     }
@@ -131,7 +136,7 @@ class TemplateController extends BaseController
                 'id'    =>  ['required','integer'],
 //                'template_id'    =>  ['required','integer'],
                 'name'    =>  ['required'],
-                'type'    =>  ['required',Rule::in(ATemplateHtml::$typeMap)],
+                'type'    =>  ['required',Rule::in(array_keys(ATemplateHtml::$typeMap))],
                 'css'    =>  [],
                 'script'    =>  [],
                 'html'    =>  ['required'],
@@ -166,7 +171,7 @@ class TemplateController extends BaseController
             return $this->response('保存失败',Code::SYSTEM_ERROR);
         }
 
-        return $this->success(ATemplateHtml::_find($id));
+        return $this->response('保存成功',Code::SUCCESS,ATemplateHtml::_find($id));
     }
 
 
@@ -194,7 +199,7 @@ class TemplateController extends BaseController
      * @time 2023/5/11 10:29
      */
     public function html_type(){
-        return $this->success(ATemplateHtml::$typeMap);
+        return $this->response('',Code::SUCCESS,ATemplateHtml::$typeMap);
     }
 
 
@@ -209,7 +214,7 @@ class TemplateController extends BaseController
      */
     public function chunk_lists(){
         $lists = TemplateChunkLogic::instance()->getList()->toArray();
-        return $this->success($lists);
+        return $this->response('',Code::SUCCESS,$lists);
     }
 
 

@@ -63,7 +63,7 @@ class ProjectDeptController extends BaseController
             ->orderBy('gl_project_dept_user.id','desc');
         $query = $this->searchParam($query);
         $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page);
-        return $this->success($lists);
+        $this->response('success',Code::SUCCESS,$lists);
     }
 
     /**

@@ -7,7 +7,6 @@ use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\User\ProjectRoleLogic;
 use App\Http\Requests\Aside\User\ProjectRoleRequest;
 use App\Models\User\ProjectRole as ProjectRoleModel;
-use Illuminate\Http\Request;
 
 /**
  * @remark :b端用户角色设置管理
@@ -18,22 +17,26 @@ use Illuminate\Http\Request;
 class ProjectRoleController extends BaseController
 {
     /**
-     * @name :列表
-     * @return json
-     * @author :liyuhang
-     * @method
+     * @remark :用户角色列表
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/27 10:47
      */
     public function lists (){
         $roleModel = new ProjectRoleModel();
-        $lists = $roleModel->lists($this->map,$this->page,$this->row,$this->order,['*']);
+        $filed = ['id','name','project_id','operator_id','status','created_at','updated_at'];
+        $lists = $roleModel->lists($this->map,$this->page,$this->row,$this->order,$filed);
         $this->response('success',Code::SUCCESS,$lists);
     }
 
     /**
-     * @name :详情
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @param ProjectRoleLogic $roleLogic
+     * @remark :获取角色详情
+     * @name   :info
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/27 10:50
      */
     public function info(ProjectRoleLogic $roleLogic){
         $this->request->validate([
@@ -41,16 +44,17 @@ class ProjectRoleController extends BaseController
         ],[
             'id.required' => 'ID不能为空'
         ]);
-        //TODO::详情
         $roleLogic->role_info();
         $this->response('success');
     }
 
     /**
-     * @name :添加角色时获取菜单列表
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @param ProjectRoleLogic $roleLogic
+     * @remark :添加角色时获取菜单列表
+     * @name   :get_menu
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/27 10:51
      */
     public function get_menu(ProjectRoleLogic $roleLogic){
         $list = $roleLogic->role_get_menu();

@@ -6,6 +6,8 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\User\UserLogic;
 use App\Http\Requests\Aside\User\UserRequest;
+use App\Models\Project\Project;
+use App\Models\User\User;
 use App\Models\User\User as UserModel;
 use Illuminate\Http\Request;
 
@@ -26,9 +28,15 @@ class ProjectUserController extends BaseController
      * @time   :2023/6/25 9:27
      */
     public function lists(){
+        $filed = ['id','mobile','name','project_id','created_at','updated_at','image','operator_id'];
         $userModel = new UserModel();
-        $lists = $userModel->lists($this->map,$this->page,$this->row,$this->order,
-            ['id','mobile','name','created_at','updated_at','image','operator_id']);
+        $lists = $userModel->lists($this->map,$this->page,$this->row,$this->order,$filed);
+        if(!empty($lists)){
+            foreach ($lists['list'] as $k => $v){
+                $lists['list'][$k]['operator_name'] = (new User())->read(['id'=>$v['operator_id']],['name'])['name'];
+                $lists['list'][$k]['project_name'] = (new Project())->read(['id'=>$v['project_id']],['title'])['title'];
+            }
+        }
         $this->response('列表',Code::SUCCESS,$lists);
     }
 

@@ -33,16 +33,9 @@ class TemplateController extends BaseController
      * @time 2023/5/9 14:20
      */
     public function index(){
-
         $limit = intval($this->param['limit']??20);
-
-
         // 读取列表
         $data   =   ATemplate::_bAll($limit)->toArray();
-
-
-
-
         return $this->success($data);
     }
 
@@ -53,7 +46,6 @@ class TemplateController extends BaseController
      * @time 2023/5/9 15:19
      */
     public function info(){
-
         // 保存更新
         if($this->isPost()){
             $template_id = intval($this->param['template_id']??0);
@@ -64,12 +56,10 @@ class TemplateController extends BaseController
                 return $this->response('无法使用不存在的模板',Code::SYSTEM_ERROR);
             }
         }
-
         // 读取我的模板
         $conf = BSetting::_get($this->user['project_id']);
         // 读取模板信息
         $data = ATemplate::_bFind($conf['template_id']);
-
         return $this->success([
             'template_id'    =>  $data['id']??0,
             'name'    =>  $data['name']??'',
@@ -78,6 +68,22 @@ class TemplateController extends BaseController
         ]);
     }
 
+    /**
+     * @remark :使用模版
+     * @name   :read
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/27 15:07
+     */
+    public function read(TemplateLogic $templateLogic){
+        $this->request->validate([
+            'template_id' => 'required',
+        ],[
+            'template_id.required' => 'template_id不能为空'
+        ]);
+        $data = $templateLogic->usingTemplates();
+        $this->response('选中模版信息',Code::SUCCESS,$data);
+    }
 
     /**
      * 保存模板
@@ -85,19 +91,11 @@ class TemplateController extends BaseController
      * @time 2023/5/10 10:53
      */
     public function save(){
-
         $html = '<header id="globalso-header" class="web_head sticky-top py-1 py-md-0" style="background-color: #318fff;">asdf</header>';
-
         // 替换 header
         $html = preg_replace("/<header(.*)id=\"globalso-header\"(.*)>([\s\S]*)<\/header>/iU",'',$html);
         $html = preg_replace("/<main(.*)id=\"globalso-main\"(.*)>([\s\S]*)<\/main>/iU",'',$html);
         $html = preg_replace("/<footer(.*)id=\"globalso-footer\"(.*)>([\s\S]*)<\/footer>/iU",'',$html);
-
-
-
-
-
-
     }
 
 
@@ -127,7 +125,6 @@ class TemplateController extends BaseController
             'name'  =>  'example',
         ];
         return $this->response('',Code::SUCCESS,$res);
-
     }
 
     /**
@@ -136,7 +133,6 @@ class TemplateController extends BaseController
      * @time 2023/5/11 11:00
      */
     public function save_html(TemplateRequest $request){
-
         $data   =   $request->validated();
         $data['data_source']    =   $data['source'];
         $data['data_source_id']    =   $data['source_id'];
@@ -160,10 +156,8 @@ class TemplateController extends BaseController
             unset($info['css']);
             unset($info['script']);
             unset($info['data_ext']);
-
             return $this->success($info,Code::SUCCESS,'保存成功');
         }
-
         return $this->response('保存失败',Code::SYSTEM_ERROR);
 
     }
@@ -178,11 +172,8 @@ class TemplateController extends BaseController
      * @time 2023/5/15 14:43
      */
     public function status(TemplateRequest $request){
-
         $data   =   $request->validated();
-
         TemplateLogic::instance()->status($data['source'],$data['source_id'],$data['status']);
-
         return $this->response('保存成功');
 
     }
@@ -194,14 +185,12 @@ class TemplateController extends BaseController
      * @time 2023/5/10 14:55
      */
     public function chunk(){
-
         $lists  = TemplateChunkLogic::instance()->getList([['status','=',1]],['sort'=>'asc'],['*'],false);
         foreach ($lists as &$list){
             unset($list['created_at']);
             unset($list['updated_at']);
             unset($list['status']);
         }
-
         return $this->success($lists);
     }
 

@@ -21,7 +21,8 @@ class DeptLogic extends BaseLogic
      * @method :post
      * @time   :2023/6/21 14:56
      */
-    public function DeptLists($map,$page,$row,$order = 'created_at',$filed = ['*']){
+    public function DeptLists($map,$page,$row,$order = 'created_at'){
+        $filed = ['id','pid','title','sort','created_at','remark'];
         $lists = $this->model->lists($map,$page,$row,$order,$filed);
         return $this->success($lists);
     }
@@ -34,7 +35,8 @@ class DeptLogic extends BaseLogic
      * @time   :2023/6/21 15:01
      */
     public function DeptRead(){
-        $info = $this->model->read($this->param);
+        $filed = ['id','pid','title','sort','created_at','remark'];
+        $info = $this->model->read($this->param,$filed);
         if($info === false){
             $this->fail('当前数据不存在,或者被删除');
         }

@@ -92,7 +92,8 @@ class ProjectMenuLogic extends BaseLogic
      * @time   :2023/6/21 17:26
      */
     public function MenuList(){
-        $lists = $this->model->list(['status'=>$this->model::ZERO,'is_role'=>$this->model::ZERO,'pid'=>$this->model::ZERO]);
+        $filed = ['id','pid','name','created_at','status','rules','is_role','icon','action','updated_at'];
+        $lists = $this->model->list(['status'=>$this->model::ZERO,'is_role'=>$this->model::ZERO,'pid'=>$this->model::ZERO],'created_at',$filed);
         return $this->success($lists);
     }
 }

@@ -2,6 +2,7 @@
 
 namespace App\Http\Logic\Aside\User;
 
+use App\Helper\Common;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Models\User\ProjectMenu as ProjectMenuModel;
 use App\Models\User\ProjectRole;
@@ -14,7 +15,6 @@ class ProjectRoleLogic extends BaseLogic
     public function __construct()
     {
         parent::__construct();
-
         $this->model = new ProjectRole();
         $this->param = $this->requestAll;
     }
@@ -48,7 +48,15 @@ class ProjectRoleLogic extends BaseLogic
      * @method
      */
     public function role_info(){
-        $info = $this->info($this->param);
+        $info = Common::get_user_cache($this->model,$this->param['id'],'A');
+        if(empty($info)){
+            $filed = ['id','name','project_id','operator_id','created_at','status','updated_at'];
+            $info = $this->model->read($this->param,$filed);
+            if($info === false){
+                $this->fail('当前数据不存在');
+            }
+            Common::set_user_cache($info,$this->model,$this->param['id'],'A');
+        }
         return $this->success($info);
     }
 
@@ -83,7 +91,11 @@ class ProjectRoleLogic extends BaseLogic
         if($info !== false){
             $this->fail('当前菜单名称已存在');
         }
-        $this->edit($this->param,['id'=>$this->param['id']]);
+        $rs = $this->edit($this->param,['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->fail('error');
+        }
+        Common::del_user_cache($this->model,$this->param['id'],'A');
         return $this->success();
     }
 

@@ -2,7 +2,9 @@
 
 namespace App\Http\Logic\Aside\User;
 
+use App\Helper\Common;
 use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Project\Project;
 use App\Models\User\User;
 
 class UserLogic extends BaseLogic
@@ -22,9 +24,15 @@ class UserLogic extends BaseLogic
      * @method
      */
     public function user_info(){
-        $info = $this->model->read($this->param,['id','project_id','name','status','mobile','operator_id']);
-        if($info === false){
-            $this->fail('当前数据不存在');
+        $info = Common::get_user_cache($this->model,$this->param['id'],'A');
+        if(empty($info)){
+            $info = $this->model->read($this->param,['id','project_id','name','status','mobile','operator_id']);
+            if($info === false){
+                $this->fail('当前数据不存在');
+            }
+            $info['operator_name'] = (new User())->read(['id'=>$info['operator_id']],['name'])['name'];
+            $info['project_name'] = (new Project())->read(['id'=>$info['project_id']],['title'])['title'];
+            Common::set_user_cache($info,$this->model,$this->param['id'],'A');
         }
         return $this->success($info);
     }
@@ -63,6 +71,7 @@ class UserLogic extends BaseLogic
         if($rs === false){
             $this->fail('编辑失败');
         }
+        Common::del_user_cache($this->model,$this->param['id'],'A');
         return $this->success();
     }
 
@@ -73,11 +82,13 @@ class UserLogic extends BaseLogic
      * @method
      */
     public function user_del(){
+        $ids = $this->param['id'];
         $this->param['id'] = ['in',$this->param['id']];
         $rs = $this->model->del($this->param);
         if($rs === false){
             $this->fail('删除失败');
         }
+        Common::del_user_cache($this->model,$ids,'A');
         return $this->success();
     }
 

@@ -64,7 +64,7 @@ class CountLogic extends BaseLogic
         $data = [
             'total_pv'=>$pv,
             'total_ip'=>$ip,
-            'conversion_rate' => (isset($inquiry_num) && !empty($inquiry_num)) ? round(($inquiry_num / $ip) * 10,2) : 0,
+            'conversion_rate' => (isset($inquiry_num) && !empty($inquiry_num) && ($ip != 0)) ? round(($inquiry_num / $ip) * 10,2) : 0,
         ];
         return $this->success($data);
     }

@@ -3,6 +3,7 @@
 namespace App\Http\Logic\Bside;
 
 use App\Models\RouteMap;
+use App\Models\Template\ATemplate;
 use App\Models\Template\BSetting;
 use App\Models\Template\BTemplate;
 
@@ -19,6 +20,7 @@ class TemplateLogic extends  BaseLogic
         parent::__construct();
 
         $this->model = new BTemplate();
+        $this->param = $this->requestAll;
     }
 
 
@@ -90,4 +92,34 @@ class TemplateLogic extends  BaseLogic
     }
 
 
+    /**
+     * @remark :使用模版并保存数据
+     * @name   :usingTemplates
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/27 15:26
+     */
+    public function usingTemplates(){
+        //获取模版详情
+        $asideTemplateModel = new ATemplate();
+        $templateInfo = $asideTemplateModel->read(['id'=>$this->param['template_id']]);
+        if($templateInfo === false){
+            $this->fail('当前模版不存在或已被删除');
+        }
+        $bSettingTemplateModel = new BSetting();
+        //查看用户模版是否已使用过
+        $param = [
+            'template_id'=>$this->param['template_id'],
+            'project_id'=>$this->user['project_id']
+        ];
+        $bSettingTemplateInfo = $bSettingTemplateModel->read($param);
+        //当前用户选择模版并关联
+        if($bSettingTemplateInfo === false){
+            $rs = $bSettingTemplateModel->add($param);
+            if($rs === false){
+                $this->fail('error');
+            }
+        }
+        return $this->success($templateInfo);
+    }
 }

@@ -39,6 +39,7 @@ class TemplateRequest extends FormRequest
             'sort'    =>  ['required','integer'],
             'thumb'    =>  ['required'],
             'url'    =>  ['required'],
+            'html'    =>  ['required'],
         ];
 
         // 更新场景

@@ -2,6 +2,7 @@
 
 namespace App\Models\Template;
 
+use App\Models\Base;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
@@ -12,7 +13,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * Class ATemplate
  * @package App\Models\Template
  */
-class ATemplate extends \App\Models\Base{
+class ATemplate extends Base{
 
 
     protected $table = 'gl_aside_template';

@@ -103,7 +103,8 @@ class ATemplateHtml extends \App\Models\Base{
 
 
     public static function _find($id){
-        return static::where('id',$id)->first();
+        $data = static::where('id',$id)->first();
+        return $data ? $data->toArray() : [];
     }
 
     /**
@@ -122,11 +123,11 @@ class ATemplateHtml extends \App\Models\Base{
         $model->template_id = $template_id;
 
         $model->name = $data['name'];
-        $model->status = $data['status'];
-        $model->is_default = $data['is_default'];
-        $model->sort = $data['sort'];
-        $model->thumb = $data['thumb'];
-        $model->url = $data['url'];
+        $model->type = $data['type'];
+        $model->css = $data['css'];
+        $model->script = $data['script'];
+        $model->html = $data['html'];
+
 
         $model->save();
 

@@ -2,6 +2,7 @@
 
 namespace App\Models\Template;
 
+use App\Models\Base;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\DB;
 
@@ -12,7 +13,7 @@ use Illuminate\Support\Facades\DB;
  * Class BSetting
  * @package App\Models\Template
  */
-class BSetting extends \App\Models\Base{
+class BSetting extends Base {