Merge remote-tracking branch 'origin/master'

app/Http/Controllers/Api/JobController.php

@@ -7,6 +7,7 @@ use App\Jobs\DesktopDeviceJob;
 use App\Jobs\ManDeviceJob;
 use App\Jobs\ProcessDataJob;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Redis;
 
 
 class JobController extends BaseController
@@ -30,4 +31,10 @@ class JobController extends BaseController
 
         echo $request->get('verify');die;
     }
+
+    public function delKey(Request $request){return;
+        $token_key = 'big_king_login_token';
+//        $token = Redis::get($token_key);
+        Redis::del($token_key);
+    }
 }

app/Jobs/DesktopDeviceJob.php

@@ -17,6 +17,7 @@ class DesktopDeviceJob implements ShouldQueue
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     protected $data;
+    protected $url;
 
     /**
      * Create a new job instance.
@@ -26,6 +27,7 @@ class DesktopDeviceJob implements ShouldQueue
     public function __construct($data)
     {
         $this->data = $data;
+        $this->url = config('ip.zs');
     }
 
     /**
@@ -47,7 +49,7 @@ class DesktopDeviceJob implements ShouldQueue
 
                 $dispatchList = $this->getDispatchList($order_num);
                 if(empty($dispatchList) || empty($dispatchList['content'])) return;
-                $this->completionOrders($dispatchList);
+                $this->completionOrders($dispatchList,$first);
 
                 file_put_contents('send_record.txt',date('Y-m-d H:i:s').$order_num . PHP_EOL,8);
             }
@@ -64,7 +66,7 @@ class DesktopDeviceJob implements ShouldQueue
         list($status,$token) = ClearDataService::getToken();
         if(! $status) return;
 
-        $url = 'http://121.36.142.167:7774/jbl/api/module-data/dispatch_orders/page';
+        $url = $this->url . 'jbl/api/module-data/dispatch_orders/page';
         $post = [
             'direction' => 'DESC',
             'property' => 'id',
@@ -105,7 +107,7 @@ class DesktopDeviceJob implements ShouldQueue
         return json_decode($response,true);
     }
 
-    public function completionOrders($data){
+    public function completionOrders($data,$tag){
         list($status,$token) = ClearDataService::getToken();
         if(! $status) return;
 
@@ -176,20 +178,21 @@ class DesktopDeviceJob implements ShouldQueue
             "process_id_show" => $first['process_id_show'],
             "team_id_show" => $first['team_id_show'],
             "equipment_id_show" => $first['equipment_id_show'],
-            "employee_id_show" => $first['employee_id_show']
+            "employee_id_show" => $first['employee_id_show'],
+            "tag" => $tag
         ];
         $post = [
             "bizTypeEk" => "LOWCODE",
             "bizId" => -1,
             "data" => [
                 "completion_orders_dtl" => $completion_orders_dtl,
-                "completion_orders" => $completion_orders
+                "completion_orders" => $completion_orders,
             ],
             "dynamicFormId" => "474201923419320320",
             "showModelId" => "474382714828959744"
         ];
         //组织数据------
-        $url = 'http://121.36.142.167:7774/jbl/api/module-data/completion_orders/completion_orders';
+        $url = $this->url . 'jbl/api/module-data/completion_orders/completion_orders';
         $header = ["Authorization: Bearer {$token}","Content-Type:application/json",'Site:91451322MA5P9JNKXA'];
 
         $curl = curl_init();

app/Jobs/ManDeviceJob.php

@@ -10,7 +10,6 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ManDeviceJob implements ShouldQueue
@@ -18,6 +17,7 @@ class ManDeviceJob implements ShouldQueue
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     protected $data;
+    protected $url;
 
     /**
      * Create a new job instance.
@@ -27,6 +27,7 @@ class ManDeviceJob implements ShouldQueue
     public function __construct($data)
     {
         $this->data = $data;
+        $this->url = config('ip.zs');
     }
 
     /**
@@ -58,7 +59,7 @@ class ManDeviceJob implements ShouldQueue
                     $this->sendToDevice(['dev_eui' => $dev_eui, 'value' => $value['value']]);
 
                     $insert[] = [
-                        'data' => json_encode($value),
+//                        'data' => json_encode($value),
                         'happening_data' => $value['value'],
                         'dev_eui' => $dev_eui,
                         'device_name' => $deviceName,
@@ -72,7 +73,7 @@ class ManDeviceJob implements ShouldQueue
                 $dev_eui = $deviceId;
                 if(in_array($dev_eui,$device)) {
                     $insert[] = [
-                        'data' => json_encode($this->data['data']['position']),
+//                        'data' => json_encode($this->data['data']['position']),
                         'happening_data' => '',
                         'dev_eui' => $deviceId,
                         'device_name' => $deviceName,
@@ -100,7 +101,7 @@ class ManDeviceJob implements ShouldQueue
         list($status,$token) = ClearDataService::getToken();
         if(! $status) return;
 
-        $url = "http://121.36.142.167:7774/api/module-data/device_machine_record/device_machine_record";
+        $url = $this->url . "api/module-data/device_machine_record/device_machine_record";
         $post = [
             'bizId' => -1,
             'bizTypeEk' => 'LOWCODE',
@@ -114,7 +115,7 @@ class ManDeviceJob implements ShouldQueue
             'dynamicFormId' => '477743923368955904',
             'showModelId' => '477745421456904192'
         ];
-        $header = ["Authorization: Bearer {$token}","Content-Type:application/json",'Site:91451322MA5P9JNKXA'];
+        $header = ["Authorization: Bearer {$token}","Content-Type:application/json"];
 
         $curl = curl_init();
         curl_setopt_array($curl, array(

app/Jobs/ProcessDataJob.php

@@ -16,6 +16,7 @@ class ProcessDataJob implements ShouldQueue
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     protected $data;
+    protected $url;
 
     /**
      * Create a new job instance.
@@ -25,6 +26,7 @@ class ProcessDataJob implements ShouldQueue
     public function __construct($data)
     {
         $this->data = $data;
+        $this->url = config('ip.zs');
     }
 
     /**
@@ -46,7 +48,6 @@ class ProcessDataJob implements ShouldQueue
         $this->sendToDevice($return);
 
         //传递数据给下一个队列
-//        dispatch(new SendDataJob($return))->onQueue('cloud_device');
         file_put_contents('record2.txt',json_encode($return) . PHP_EOL,8);
 
         //输出信息
@@ -58,7 +59,7 @@ class ProcessDataJob implements ShouldQueue
         list($status,$token) = ClearDataService::getToken();
         if(! $status) return;
 
-        $url = "http://121.36.142.167:7774/api/module-data/device_machine_record/device_machine_record";
+        $url = $this->url . "api/module-data/device_machine_record/device_machine_record";
         $post = [
             'bizId' => -1,
             'bizTypeEk' => 'LOWCODE',
@@ -72,7 +73,7 @@ class ProcessDataJob implements ShouldQueue
             'dynamicFormId' => '477743923368955904',
             'showModelId' => '477745421456904192'
         ];
-        $header = ["Authorization: Bearer {$token}","Content-Type:application/json",'Site:91451322MA5P9JNKXA'];
+        $header = ["Authorization: Bearer {$token}","Content-Type:application/json"];
 
         $curl = curl_init();
         curl_setopt_array($curl, array(

app/Jobs/SendDataJob.php

@@ -15,6 +15,7 @@ class SendDataJob implements ShouldQueue
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     protected $data;
+    protected $url;
 
     /**
      * Create a new job instance.
@@ -24,6 +25,7 @@ class SendDataJob implements ShouldQueue
     public function __construct($data)
     {
         $this->data = $data;
+        $this->url = config('ip.zs');
     }
 
     /**
@@ -63,7 +65,7 @@ class SendDataJob implements ShouldQueue
     }
 
     public function sendToDevice($data){
-        $url = "http://121.36.142.167:7774/api/module-data/device_machine_record/device_machine_record";
+        $url = $this->url . "api/module-data/device_machine_record/device_machine_record";
         $post = [
             'bizId' => -1,
             'bizTypeEk' => 'LOWCODE',

app/Service/ClearDataService.php

@@ -4,7 +4,6 @@ namespace App\Service;
 
 
 use App\Model\DeviceData;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Redis;
 
 class ClearDataService extends Service
@@ -89,7 +88,7 @@ class ClearDataService extends Service
         try{
             //保存数据
             $model = new DeviceData();
-            $model->data = json_encode($data);//源数据
+//            $model->data = json_encode($data);//源数据
             $model->dev_eui = $data['obj']['devEUI'];
             $model->device_name = $data['obj']['deviceName'];
             $model->source_ip = self::getIP();
@@ -158,11 +157,12 @@ class ClearDataService extends Service
         $token_key = 'big_king_login_token';
         $token = Redis::get($token_key);
         if(! $token){
+            $url = config('ip.zs');
             $post = array("name" => "admin","password"=>"admin","rememberMe"=>true);
             $header = ['Content-Type:application/json'];
             $curl = curl_init();
             curl_setopt_array($curl, array(
-                CURLOPT_URL => 'http://121.36.142.167:7774/jbl/api/mes/login',
+                CURLOPT_URL => $url . 'jbl/api/mes/login',
                 CURLOPT_RETURNTRANSFER => true,
                 CURLOPT_ENCODING => '',
                 CURLOPT_MAXREDIRS => 10,

config/ip.php

@@ -0,0 +1,6 @@
+<?php
+//状态码
+return [
+    'cs' => 'http://121.36.142.167:7774/', //测试
+    'zs' => 'http://122.112.250.253:7774/', //正式
+];

routes/api.php

@@ -21,6 +21,7 @@ Route::any('login', 'Api\LoginController@login');
 Route::any('job', 'Api\JobController@processDataJobAdd');
 Route::any('job_device', 'Api\JobController@processDataJobAddDevice');
 Route::any('man_device', 'Api\JobController@processDataJobAddDeviceMan');
+Route::any('del', 'Api\JobController@delKey');
 Route::any('oee', 'Api\ScreenController@oee');
 
 Route::group(['middleware'=> []],function ($route){