重命名TaskBusOrganizer->OrganizerTaskBus

app/api/business/TaskBusOrganizer.php → app/api/business/OrganizerTaskBus.php

@@ -15,7 +15,7 @@ use app\api\model\TestModel;
 use app\api\model\Undertake;
 use app\common\lib\auth\JwtAuth;
 
-class TaskBusOrganizer
+class OrganizerTaskBus
 {
     private $uid;
     public function __construct()

app/api/business/TaskCommonBus.php

@@ -1,23 +0,0 @@
-<?php
-/**
- *
- *User:Administrator
- *Date:2021/10/13
- */
-
-namespace app\api\business;
-
-use app\common\lib\auth\JwtAuth;
-
-class TaskCommonBus
-{
-    private $uid;
-    public function __construct()
-    {
-        $jwtAuth=JwtAuth::getInstance();            //实例化jwtAuth
-        $this->uid = $jwtAuth->getUid();          //setRybh是在middleware/jwtAuth中完成的
-    }
-
-
-
-}

app/api/controller/v1/Organizer.php

@@ -9,11 +9,17 @@ namespace app\api\controller\v1;
 
 //牵头单位
 
-use app\api\business\TaskBusOrganizer;
-use app\api\business\TaskBusUndertaker;
+use app\api\business\OrganizerTaskBus;
 
 class Organizer
 {
+    private $OrganizerTaskBus;
+
+    public function __construct()
+    {
+        $this->OrganizerTaskBus = new OrganizerTaskBus();
+    }
+
     public function selectTaskList()
     {
         $task_class = request()->param('task_class');
@@ -26,7 +32,7 @@ class Organizer
             'endtime' => request()->param('endtime','','trim'),//任务结束时间
             'task_name' => request()->param('task_name','','trim'),//任务名称
         ];
-        $result = (new TaskBusOrganizer())->selectTask($task_class,$pageNum,$pageSize,$data);
+        $result =$this->OrganizerTaskBus->selectTask($task_class,$pageNum,$pageSize,$data);
         return showSuccess($result);
     }
 
@@ -35,14 +41,14 @@ class Organizer
         $pageNum = request()->param('pageNum', 1, 'int');
         $pageSize = request()->param('pageSize', null, 'trim');
         $task_id = request()->param('task_id');
-        $result = (new TaskBusOrganizer())->getTaskInfo($task_id,$pageNum,$pageSize);
+        $result = $this->OrganizerTaskBus->getTaskInfo($task_id,$pageNum,$pageSize);
         return showSuccess($result);
     }
 
     public function qtRelease()
     {
         $task_id = request()->param('task_id', '', 'int');
-        $result = (new TaskBusOrganizer())->releaseTask($task_id);
+        $result = $this->OrganizerTaskBus->releaseTask($task_id);
         return showSuccess($result);
     }
 }

app/api/controller/v1/TaskCommon.php

@@ -7,13 +7,20 @@
 
 namespace app\api\controller\v1;
 
-use app\api\business\TaskBusOrganizer;
+use app\api\business\OrganizerTaskBus;
 use app\api\business\TestUnitBus;
 
 class TaskCommon
 {
     //获取检测单位列表(抽样机构 todo 增加查询功能 检测单位和抽样单位可以写到一起
 
+    private $OrganizerTaskBus;
+
+    public function __construct()
+    {
+        $this->OrganizerTaskBus = new OrganizerTaskBus();
+    }
+
     public function getTestUnitList()
     {
         $pageNum = request()->param('pageNum',1,'int');
@@ -29,7 +36,7 @@ class TaskCommon
     public function getTaskInfo()
     {
         $task_id = request()->param('task_id');
-        $result = (new TaskBusOrganizer())->getTaskInfo($task_id);
+        $result = $this->OrganizerTaskBus->getTaskInfo($task_id);
         return showSuccess($result);
 
     }

app/api/controller/v1/Undertaker.php

@@ -8,9 +8,7 @@
 namespace app\api\controller\v1;
 
 //承担单位
-use app\api\business\TaskBusOrganizer;
 use app\api\business\TaskBusUndertaker;
-use app\api\model\Undertake;
 
 class Undertaker
 {