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

Lyh server



查看合并请求 !2845

@@ -43,7 +43,7 @@ class RemainDay extends Command
      * @var 暂停的项目
      * @var 暂停的项目
      */
      */
     protected $ceaseProjectId = [
     protected $ceaseProjectId = [
-        354, 378, 649, 1226, 1283, 1703, 1893, 2066, 2250, 2193, 2399, 1685, 3931
+        354, 378, 649, 1226, 1283, 1703, 1893, 2066, 2250, 2193, 2399, 1685, 3931,2273,3647
     ];//需要单独处理的项目
     ];//需要单独处理的项目
     /**
     /**
      * The console command description.
      * The console command description.

@@ -20,14 +20,83 @@ use Illuminate\Support\Facades\Cache;
  */
  */
 class BaseController extends Controller
 class BaseController extends Controller
 {
 {
-    public $param;
-    public $request;
+    protected $param = [];//所有请求参数
+    protected $token = ''; //token
+    protected $request = [];//助手函数
+    protected $page = 1;//当前页
+    protected $row = 20;//每页条数
+    protected $header = [];//设置请求头参数
+    protected $order = 'created_at';
+    protected $order_type = 'desc';
+    protected $map = [];//处理后的参数
+
 
 
     public function __construct(Request $request)
     public function __construct(Request $request)
     {
     {
         $this->request = $request;
         $this->request = $request;
         $this->param = $this->request->all();
         $this->param = $this->request->all();
+        $this->getParam();
+    }
+
+    /**
+     * @remark :请求参数处理
+     * @name   :getParam
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/17 16:34
+     */
+    public function getParam(){
+        foreach ($this->param as $k => $v){
+            if(is_array($v)){
+                $this->map[$k] = $v;
+            }else{
+                $this->getMap($k,$v);
+            }
+        }
     }
     }
+
+    /**
+     * @remark :搜索参数处理
+     * @name   :getMap
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/28 10:22
+     */
+    public function getMap($k,$v){
+        switch ($k){
+            case "order":
+                $this->order = $v;
+                break;
+            case "order_type":
+                $this->order_type = $v;
+                break;
+            case 'page':
+                $this->page = $v;
+                break;
+            case 'row':
+            case 'size':
+                $this->row = $v;
+                break;
+            case "name":
+                $this->map['name'] = ['like','%'.$v.'%'];
+                break;
+            case "start_at":
+                $this->_btw[0] = $v;
+                $this->_btw[1] = date('Y-m-d H:i:s',time());
+                $this->map['created_at'] = ['between', $this->_btw];
+                break;
+            case "end_at":
+                $this->_btw[1] = $v;
+                $this->map['created_at'] = ['between', $this->_btw];
+                break;
+            default:
+                if (!empty($v) || $v == 0) {
+                    $this->map[$k] = $v;
+                }
+                break;
+        }
+    }
+
     /**
     /**
      * @param array $data
      * @param array $data
      * @param string $message
      * @param string $message

+<?php
+/**
+ * @remark :
+ * @name   :TicketUploadDataController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/9/25 09:40
+ */
+
+namespace App\Http\Controllers\Api\WorkOrder;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Api\BaseController;
+use App\Models\Blog\BlogCategory;
+use App\Models\News\NewsCategory;
+use App\Models\Product\Category;
+use App\Models\Product\Keyword;
+use App\Models\Ticket\TicketUploadData;
+use App\Services\ProjectServer;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * @remark :上传产品/博客/新闻模块
+ * @name   :TicketUploadDataController
+ * @author :lyh
+ * @method :post
+ * @time   :2025/9/25 09:40
+ */
+class TicketUploadDataController extends BaseController
+{
+    public function __construct(Request $request)
+    {
+        parent::__construct($request);
+        $this->model = new TicketUploadData();
+    }
+
+    /**
+     * @remark :已提交列表
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/25 10:28
+     */
+    public function lists()
+    {
+        $this->request->validate([
+            'project_id' => 'required',
+        ], [
+            'project_id.required' => 'project_id不能为空',
+        ]);
+        $data = $this->model->lists($this->map, $this->page, $this->row, $this->order);
+        $this->response('success', Code::SUCCESS, $data);
+    }
+
+    /**
+     * @remark :获取数据详情
+     * @name   :info
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/25 10:35
+     */
+    public function info()
+    {
+        $this->request->validate([
+            'id' => 'required',
+        ], [
+            'id.required' => 'id不能为空',
+        ]);
+        $data = $this->model->read($this->param);
+        $this->response('success', Code::SUCCESS, $data);
+    }
+
+    /**
+     * @remark :提交数据
+     * @name   :save
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/25 09:48
+     */
+    public function save()
+    {
+        $this->request->validate([
+            'project_id' => 'required',
+            'type' => 'required',
+            'text' => 'required'
+        ], [
+            'project_id.required' => 'project_id不能为空',
+            'type.required' => '上传类型不能为空',
+            'text' => '数据详情不为空'
+        ]);
+        //验证当前数据是否已提交
+        $this->param['text'] = json_encode($this->param['text'], true);
+        $info = $this->model->read(['project_id' => $this->$this->param['project_id'], 'type' => $this->param['type'], 'text' => $this->param['text'], 'status' => 0]);
+        if ($info === false) {
+            $id = $this->model->addReturnId($this->param);
+        } else {
+            $id = $info['id'];
+        }
+        $data = ['id' => $id];
+        $this->response('success', Code::SUCCESS, $data);
+    }
+
+    /**
+     * @remark :根据项目获取分类
+     * @name   :getProductCate
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/25 15:41
+     */
+    public function getProductCate()
+    {
+        $this->request->validate([
+            'project_id' => 'required',
+            'type' => 'required',
+            'search' => 'required'
+        ], [
+            'project_id.required' => 'project_id不能为空',
+            'type.required' => 'type不能为空',
+            'search.required' => '搜索参数不能为空',
+        ]);
+        ProjectServer::useProject($this->param['project_id']);
+        if ($this->param['type'] == 1) {
+            //todo::搜索获取分类
+            $productCateModel = new Category();
+            $data = $productCateModel->lists(['title' => ['like' => '%' . $this->param['search'] . '%']], 1, 20);
+        } else {
+            $keywordModel = new Keyword();
+            $data = $keywordModel->lists(['title' => ['like' => '%' . $this->param['search'] . '%']], 1, 20);
+        }
+        DB::disconnect('custom_mysql');
+        $this->response('success', Code::SUCCESS, $data);
+    }
+
+    /**
+     * @remark :获取博客分类
+     * @name   :getBlogCate
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/25 15:42
+     */
+    public function getBlogCate()
+    {
+        $this->request->validate([
+            'project_id' => 'required',
+            'search' => 'required'
+        ], [
+            'project_id.required' => 'project_id不能为空',
+            'search.required' => '搜索参数不能为空',
+        ]);
+        ProjectServer::useProject($this->param['project_id']);
+        $blogCateModel = new BlogCategory();
+        $data = $blogCateModel->lists(['name' => ['like' => '%' . $this->param['search'] . '%']], 1, 20);
+        DB::disconnect('custom_mysql');
+        $this->response('success', Code::SUCCESS, $data);
+    }
+
+    /**
+     * @remark :获取新闻分类
+     * @name   :getNewsCate
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/25 15:43
+     */
+    public function getNewsCate()
+    {
+        $this->request->validate([
+            'project_id' => 'required',
+            'search' => 'required'
+        ], [
+            'project_id.required' => 'project_id不能为空',
+            'search.required' => '搜索参数不能为空',
+        ]);
+        ProjectServer::useProject($this->param['project_id']);
+        $newsCateModel = new NewsCategory();
+        $data = $newsCateModel->lists(['name' => ['like' => '%' . $this->param['search'] . '%']], 1, 20);
+        DB::disconnect('custom_mysql');
+        $this->response('success', Code::SUCCESS, $data);
+    }
+}

+<?php
+/**
+ * @remark :
+ * @name   :TicketUploadDataController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/9/25 14:00
+ */
+
+namespace App\Http\Controllers\Aside\Ticket;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Aside\BaseController;
+use App\Http\Logic\Aside\Ticket\TicketUploadDataLogic;
+use Illuminate\Http\Request;
+
+/**
+ * @remark :工单上传列表审核功能
+ * @name   :TicketUploadDataController
+ * @author :lyh
+ * @method :post
+ * @time   :2025/9/25 14:01
+ */
+class TicketUploadDataController extends BaseController
+{
+    public function __construct(Request $request)
+    {
+        parent::__construct($request);
+        $this->logic = new TicketUploadDataLogic();
+    }
+
+    /**
+     * @remark :获取审核列表
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/25 14:02
+     */
+    public function lists(){
+        if(isset($this->map['text']) && !empty($this->map['text'])){
+            $this->map['text'] = ['like','%'.$this->map['text'].'%'];
+        }
+        $data = $this->logic->getDataList($this->map,$this->page,$this->row,$this->order);
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :获取数据详情
+     * @name   :detail
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/26 09:29
+     */
+    public function detail(){
+        $this->request->validate([
+            'id'=>'required'
+        ],[
+            'id.required' => '主键ID不能为空',
+        ]);
+        $data = $this->logic->getDetail();
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :人工审核
+     * @name   :save
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/25 14:14
+     */
+    public function save()
+    {
+        $this->request->validate([
+            'status'=>'required',
+            'id'=>'required'
+        ],[
+            'status.required' => '提交状态不能为空',
+            'id.required' => '主键ID不能为空',
+        ]);
+        $data = $this->logic->saveData();
+        $this->response('success',Code::SUCCESS,$data);
+    }
+}

+<?php
+/**
+ * @remark :
+ * @name   :TicketUploadDataLogic.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/9/25 14:03
+ */
+
+namespace App\Http\Logic\Aside\Ticket;
+
+use App\Helper\Arr;
+use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Blog\Blog;
+use App\Models\News\News;
+use App\Models\Product\CategoryRelated;
+use App\Models\Product\KeywordRelated;
+use App\Models\Product\Product;
+use App\Models\RouteMap\RouteMap;
+use App\Models\Ticket\TicketUploadData;
+use App\Services\ProjectServer;
+use Illuminate\Support\Facades\DB;
+
+class TicketUploadDataLogic extends BaseLogic
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->param = $this->requestAll;
+        $this->model = new TicketUploadData();
+    }
+
+    /**
+     * @remark :获取审核列表
+     * @name   :getDataList
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/25 14:17
+     */
+    public function getDataList($map = [],$page = 1,$row = 20,$order = 'id'){
+        if(isset($this->map['text']) && !empty($this->map['text'])){
+            $this->map['text'] = ['like','%'.$this->map['text'].'%'];
+        }
+        $data = $this->model->lists($map,$page,$row,$order);
+        foreach ($data as &$v){
+            $v = $this->getHandleFileImage($v);
+        }
+        return $this->success($data);
+    }
+
+    /**
+     * @remark :处理数据
+     * @name   :getHandleFileImage
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/25 16:53
+     */
+    public function getHandleFileImage($v){
+        if($v['type'] == 1){
+            if(!empty($v['text']['image'])){
+                foreach ($v['text']['image'] as $gallery_k => $gallery_v){
+                    $gallery_v['url'] = getImageUrl($gallery_v['url'],$this->user['storage_type'] ?? 0,$this->user['project_location']);
+                    $info['text']['image'][$gallery_k] = $gallery_v;
+                }
+            }
+        }else{
+            $v['text']['image'] = getImageUrl($v['text']['image'],$this->user['storage_type'],$this->user['project_location']);
+        }
+        return $this->success($v);
+    }
+
+    /**
+     * @remark :获取当前数据详情
+     * @name   :getDetail
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/26 09:31
+     */
+    public function getDetail(){
+        $info = $this->model->read(['id'=>$this->param['id']]);
+        if($info === false){
+            $this->fail('当前数据不存在或已被删除');
+        }
+        $info = $this->getHandleFileImage($info);
+        return $this->success($info);
+    }
+
+    /**
+     * @remark :保存数据
+     * @name   :saveData
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/25 17:01
+     */
+    public function saveData()
+    {
+        //获取当前数据详情
+        $info = $this->model->read(['id'=>$this->param['id']]);
+        if($info === false){
+            $this->fail('当前数据不存在或已被删除');
+        }
+        //审核成功执行
+        if($this->param['status'] == 1){
+            ProjectServer::useProject($info['project_id']);
+            if($info['type'] == 1){
+                $this->saveProductData($info);
+            }elseif ($info['type'] == 2){
+                $this->saveBlogData($info);
+            }else{
+                $this->saveNewsData($info);
+            }
+            DB::disconnect('custom_mysql');
+        }
+        $data = $this->model->edit(['status'=>$this->param['status'],'operator_id'=>$this->manager['id'],'remark'=>$this->param['remark'] ?? ''],['id'=>$this->param['id']]);
+        return $this->success($data);
+    }
+
+    /**
+     * @remark :保存数据详情
+     * @name   :saveData
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/25 14:17
+     */
+    public function saveProductData($info){
+        if(isset($info['text']['keyword_id']) && !empty($info['text']['keyword_id'])){
+            $keyword_id = ','.Arr::arrToSet($info['text']['keyword_id']).',';
+        }
+        if(isset($info['text']['category_id']) && !empty($info['text']['category_id'])) {
+            $category_id = ','.Arr::arrToSet($info['text']['category_id']).',';
+        }
+        if(isset($info['text']['image']) && !empty($info['text']['image'])){
+            foreach ($info['text']['image'] as $k => $v){
+                $v['url'] = str_replace_url($v['url']);
+                $info['text']['image'][$k] = $v;
+            }
+            $info['text']['image'] = Arr::a2s($info['text']['image'] ?? []);
+        }else{
+            $info['text']['image'] = Arr::a2s([]);
+        }
+        try {
+            $productModel = new Product();
+            $data = [
+                'project_id' => $info['project_id'],
+                'title' => $info['text']['title'],
+                'thumb'=>json_encode($info['text']['image'][0] ?? [],true),
+                'gallery'=>json_encode($info['text']['image'] ?? [],true),
+                'intro'=>$info['text']['remark'],
+                'category_id'=>$category_id ?? '',
+                'keyword_id'=>$keyword_id ?? '',
+                'status'=>0,
+            ];
+            $id = $productModel->addReturnId($data);
+            CategoryRelated::saveRelated($id, $info['text']['category_id'] ?? []);//分类关联
+            KeywordRelated::saveRelated($id,$info['text']['keyword_id'] ?? []);//关键字关联
+            $route = RouteMap::setRoute($data['title'],RouteMap::SOURCE_PRODUCT,$id,$info['project_id']);
+            $this->model->edit(['route'=>$route],['id'=>$id]);
+        }catch (\Exception $e){
+            $this->fail('保存失败，请联系管理员');
+        }
+        return $this->success();
+    }
+
+    /**
+     * @remark :保存blog数据
+     * @name   :saveBlogData
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/25 16:26
+     */
+    public function saveBlogData($info)
+    {
+        if(isset($info['text']['category_id']) && !empty($info['text']['category_id'])) {
+            $category_id = ','.Arr::arrToSet($info['text']['category_id']).',';
+        }
+        if(isset($info['text']['image'])){
+            $info['text']['image'] = str_replace_url($info['text']['image'] ?? '');
+        }
+        $data = [
+            'project_id' => $info['project_id'],
+            'name' => $info['text']['title'],
+            'image'=>$info['text']['image'],
+            'text'=>$info['text']['remark'],
+            'category_id'=>$category_id ?? '',
+            'status'=>0,
+        ];
+        try {
+            $blogModel = new Blog();
+            $id = $blogModel->addReturnId($data);
+            $route = RouteMap::setRoute($data['name'],RouteMap::SOURCE_BLOG,$id,$info['project_id']);
+            $this->model->edit(['url'=>$route],['id'=>$id]);
+        }catch (\Exception $e){
+            $this->fail('保存失败，请联系管理员');
+        }
+        return $this->success();
+    }
+
+    /**
+     * @remark :保存新闻数据
+     * @name   :saveNewsData
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/25 16:34
+     */
+    public function saveNewsData($info)
+    {
+        if(isset($info['text']['category_id']) && !empty($info['text']['category_id'])) {
+            $category_id = ','.Arr::arrToSet($info['text']['category_id']).',';
+        }
+        if(isset($info['text']['image'])){
+            $info['text']['image'] = str_replace_url($info['text']['image'] ?? '');
+        }
+        $data = [
+            'project_id' => $info['project_id'],
+            'name' => $info['text']['title'],
+            'image'=>$info['text']['image'],
+            'text'=>$info['text']['remark'],
+            'category_id'=>$category_id ?? '',
+            'status'=>0,
+        ];
+        try {
+            $newsModel = new News();
+            $id = $newsModel->addReturnId($data);
+            $route = RouteMap::setRoute($data['name'],RouteMap::SOURCE_NEWS,$id,$info['project_id']);
+            $this->model->edit(['route'=>$route],['id'=>$id]);
+        }catch (\Exception $e){
+            $this->fail('保存失败，请联系管理员');
+        }
+        return $this->success();
+    }
+}

@@ -555,7 +555,7 @@ class RankDataLogic extends BaseLogic
         $without_extension_project_ids = [658]; //是否达标只统计主词的
         $without_extension_project_ids = [658]; //是否达标只统计主词的
         $extension_project_ids = [354]; //扩展词也到达标的
         $extension_project_ids = [354]; //扩展词也到达标的
         $compliance_project_ids = [2163,257,823,1750,497]; //直接达标处理的
         $compliance_project_ids = [2163,257,823,1750,497]; //直接达标处理的
-        $ceaseProjectId = [354, 378, 649, 1226, 1283, 1703, 1893, 2066, 2250,2193,2399,1685, 3931];//暂停的项目
+        $ceaseProjectId = [354, 378, 649, 1226, 1283, 1703, 1893, 2066, 2250,2193,2399,1685, 3931,2273,3647];//暂停的项目
         $uptimeProjectId = [1434,1812,276,2414,2974];//按上线时间统计的项目
         $uptimeProjectId = [1434,1812,276,2414,2974];//按上线时间统计的项目
         //一个项目多个api_no
         //一个项目多个api_no
         $multiple_api_no_project_ids = [
         $multiple_api_no_project_ids = [

+<?php
+/**
+ * @remark :
+ * @name   :TicketUploadData.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/9/25 09:33
+ */
+
+namespace App\Models\Ticket;
+
+use App\Helper\Arr;
+use App\Models\Base;
+
+/**
+ * @remark :工单内上传数据
+ * @name   :TicketUploadData
+ * @author :lyh
+ * @method :post
+ * @time   :2025/9/25 09:34
+ */
+class TicketUploadData extends Base
+{
+    protected $table = 'gl_ticket_upload_data';
+
+    public function getTextAttribute($value){
+        if(!empty($value)){
+            $value = Arr::s2a($value);
+        }
+        return $value;
+    }
+}

@@ -94,3 +94,13 @@ Route::prefix('tickets')->group(function () {
 });
 });
 Route::any('/get_project_records', [\App\Http\Controllers\Api\WorkOrder\TicketController::class, 'get_project_records'])->name('tickets.get_project_records');
 Route::any('/get_project_records', [\App\Http\Controllers\Api\WorkOrder\TicketController::class, 'get_project_records'])->name('tickets.get_project_records');
 Route::get('/pushTicketByBot/{friend_id}', [\App\Http\Controllers\Api\WorkOrder\TicketController::class, 'pushTicketByBot'])->summary('企微群@机器人触发工单推送')->name('tickets.pushTicketByBot');
 Route::get('/pushTicketByBot/{friend_id}', [\App\Http\Controllers\Api\WorkOrder\TicketController::class, 'pushTicketByBot'])->summary('企微群@机器人触发工单推送')->name('tickets.pushTicketByBot');
+//保存工单提交数据（产品，新闻，博客）详情
+Route::prefix('ticket_upload')->group(function () {
+    Route::any('/', [\App\Http\Controllers\Api\WorkOrder\TicketUploadDataController::class, 'lists'])->name('ticket_upload.lists');
+    Route::any('/info', [\App\Http\Controllers\Api\WorkOrder\TicketUploadDataController::class, 'info'])->name('ticket_upload.info');
+    Route::any('/save', [\App\Http\Controllers\Api\WorkOrder\TicketUploadDataController::class, 'save'])->name('ticket_upload.save');
+    Route::any('/getProductCate', [\App\Http\Controllers\Api\WorkOrder\TicketUploadDataController::class, 'getProductCate'])->name('ticket_upload.getProductCate');
+    Route::any('/getBlogCate', [\App\Http\Controllers\Api\WorkOrder\TicketUploadDataController::class, 'getBlogCate'])->name('ticket_upload.getBlogCate');
+    Route::any('/getNewsCate', [\App\Http\Controllers\Api\WorkOrder\TicketUploadDataController::class, 'getNewsCate'])->name('ticket_upload.getNewsCate');
+});
+

@@ -644,6 +644,12 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/monthManageList', [\App\Http\Controllers\Aside\Ticket\TicketController::class,'monthManageList'])->name('ticket_count_monthManageList');//月统计数据
         Route::any('/monthManageList', [\App\Http\Controllers\Aside\Ticket\TicketController::class,'monthManageList'])->name('ticket_count_monthManageList');//月统计数据
         Route::any('/manageTicketCount', [\App\Http\Controllers\Aside\Ticket\TicketController::class,'manageTicketCount'])->name('ticket_count_manageTicketCount');
         Route::any('/manageTicketCount', [\App\Http\Controllers\Aside\Ticket\TicketController::class,'manageTicketCount'])->name('ticket_count_manageTicketCount');
     });
     });
+    //ticket
+    Route::prefix('ticket_upload')->group(function () {
+        Route::any('/', [Aside\Ticket\TicketUploadDataController::class,'lists'])->name('ticket_upload_lists');
+        Route::any('/save', [Aside\Ticket\TicketUploadDataController::class,'save'])->name('ticket_upload_save');
+        Route::any('/detail', [Aside\Ticket\TicketUploadDataController::class,'detail'])->name('ticket_upload_detail');
+    });
 });
 });
 
 
 //无需登录验证的路由组
 //无需登录验证的路由组