Merge tag 'swoole_tcp' into develop

no message

app/Http/Controllers/AlarmOrderController.php

@@ -59,7 +59,7 @@ class AlarmOrderController extends Controller
             ->leftjoin('reportpolice AS r', 'r.id', '=', 'alarm_order.reportpolice_id')
             ->leftjoin('device AS d', 'd.id', '=', 'alarm_order.device_id')
             ->leftjoin('users AS u', 'alarm_order.user_id', '=', 'u.id')
-            ->leftjoin('status AS s', 's.id', '=', 'alarm_order.reportpolice_id')
+            ->leftjoin('status AS s', 's.id', '=', 'r.policestatus')
             ->leftjoin('device_type AS t', 'r.policestatus', '=', 't.tid')
             ->offset($offset)
             ->where($where)
@@ -93,7 +93,7 @@ class AlarmOrderController extends Controller
             ->leftjoin('reportpolice AS r', 'r.id', '=', 'alarm_order.reportpolice_id')
             ->leftjoin('device AS d', 'd.id', '=', 'alarm_order.device_id')
             ->leftjoin('users AS u', 'alarm_order.user_id', '=', 'u.id')
-            ->leftjoin('status AS s', 's.id', '=', 'alarm_order.reportpolice_id')
+            ->leftjoin('status AS s', 's.id', '=', 'r.policestatus')
             ->leftjoin('device_type AS t', 'r.policestatus', '=', 't.tid')
             ->whereIn('alarm_order.state',explode(',',$request->input('userstate')))
             ->where('u.id','=',Auth::id())
@@ -164,7 +164,7 @@ class AlarmOrderController extends Controller
         $order = AlarmOrder::leftjoin('reportpolice AS r', 'r.id', '=', 'alarm_order.reportpolice_id')
             ->leftjoin('device AS d', 'd.id', '=', 'alarm_order.device_id')
             ->leftjoin('users AS u', 'alarm_order.user_id', '=', 'u.id')
-            ->leftjoin('status AS s', 's.id', '=', 'alarm_order.reportpolice_id')
+            ->leftjoin('status AS s', 's.id', '=', 'r.policestatus')
             ->leftjoin('device_type AS t', 'r.policestatus', '=', 't.tid')
             ->leftjoin('gas AS g', 'd.status', '=', 'g.id')
             ->leftjoin('danwei AS w', 'd.devicemonad', '=', 'w.id')

app/Http/Controllers/Auth/SwooleCommandMeTcpController.php

@@ -6,6 +6,7 @@ use Illuminate\Support\Facades\DB;
 use App\Laravue\Models\Users;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Redis;
 use App\Http\Controllers\DevicesController;
 use Illuminate\Support\Facades\Config;
@@ -15,6 +16,7 @@ class  SwooleCommandMeTcpController extends Controller
     //获取tcp链接返回数据 //进去redis
     public function swooletcplist($data = '')
     {
+        Log::channel('slack')->info('接收数据 =>' . $data);
         if ($data != '') {
             $datadevice = $this->stringdata($data);
             Redis::set('dbtype',0);
@@ -119,7 +121,7 @@ class  SwooleCommandMeTcpController extends Controller
             if($type['status'] == 1 && $type['endtime'] == '' && $davicedata[1] == 1){
                 $up = DB::table('reportpolice')
                     ->where('devicenumber', '=', $davicedata[0])
-                    ->update(['endtime'=>time(),'status' => 2,'policestatus'=> $davicedata[1]]);
+                    ->update(['endtime'=>time(),'status' => 2]);
             }
             if ($isdavice) {
                 //改成报警状态
@@ -131,7 +133,14 @@ class  SwooleCommandMeTcpController extends Controller
             } else {
                 if ($davicedata[1] != 1) {
                     $add = DB::table('reportpolice')
-                        ->insertGetId(['devicenumber' => $davicedata[0], 'starttime' => time(), 'concentration' => $davicedata[2], 'policestatus' => $davicedata[1], 'status' => 1]);
+                        ->insertGetId([
+                            'devicenumber' => $davicedata[0],
+                            'starttime' => time(),
+                            'concentration' => $davicedata[2],
+                            'policestatus' => $davicedata[1],
+                            'status' => 1,
+                            'location' => $isdevicenumm->deviceinfo,
+                        ]);
                 }
 
             }

app/Http/Controllers/Auth/ZehongTcpController.php

@@ -9,6 +9,7 @@ use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Redis;
 use App\Http\Controllers\DevicesController;
 use Illuminate\Support\Facades\Config;
+use App\Http\Controllers\Auth\SwooleCommandMeTcpController;
 
 class  ZehongTcpController extends Controller
 {
@@ -85,6 +86,11 @@ class  ZehongTcpController extends Controller
     //获取上报数据从数据库查询
     public function mysqldb($data){
         if($data != []){
+            // 报警提醒
+            $meTcp = new SwooleCommandMeTcpController();
+            $alarmData = $data['id'] . '/' . $data['status'] . '/' . $data['np'];
+            $meTcp->swooletcplist($alarmData);
+
             $datainfo = DB::table('device')
                 ->where('devicenum','=',$data['id'])
                 ->update(['nd'=>intval($data['np']),'devicepolice'=>$data['status'] == 0 ? '1' : $data['status'],'update_time'=>time(),'shutoff_status'=>$data['famen']]);