Skip to content

L
laravelzh
Commit 3d0b374c authored by Administrator's avatar Administrator
Browse files
Options

Merge branch 'master' of ssh://111.61.77.35:15/fengchaopeng/laravelzh

parents 6d970180 f1820aaf
Pipeline #95 failed with stages
      Show whitespace changes
      Inline Side-by-side
      Showing with 2 additions and 2 deletions
      app/Http/Controllers/Auth/SwooleCommandMeTcpController.php
      View file @ 3d0b374c
      ......@@ -114,7 +114,7 @@ class SwooleCommandMeTcpController extends Controller
      if ($type['endtime'] != '' && $type['status'] == 2 && $davicedata[1] != 1){
      $up = DB::table('reportpolice')
      ->where('devicenumber', '=', $davicedata[0])
      ->update(['endtime'=>'', 'police' => 1,'status' => 1,'policestatus'=> $davicedata[1],'concentration' => $davicedata[2]]);
      ->update(['endtime'=>'', 'police' => 1,'starttime'=>time(),'status' => 1,'policestatus'=> $davicedata[1],'concentration' => $davicedata[2]]);
      }
      if($type['status'] == 1 && $type['endtime'] == '' && $davicedata[1] == 1){
      $up = DB::table('reportpolice')
      ......@@ -126,7 +126,7 @@ class SwooleCommandMeTcpController extends Controller
      if ($davicedata[1] != 1 && $type['endtime'] == '') {
      $up = DB::table('reportpolice')
      ->where('devicenumber', '=', $davicedata[0])
      ->update(['concentration' => $davicedata[2], 'policestatus' => $davicedata[1], 'police' => 1, 'status' => 1]);
      ->update(['concentration' => $davicedata[2], 'policestatus' => $davicedata[1], 'police' => 1, 'status' => 1,'starttime'=>time()]);
      }
      } else {
      if ($davicedata[1] != 1) {
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment