Merge remote-tracking branch 'origin/master'

app/Http/Controllers/Api/LoginController.php

@@ -49,4 +49,16 @@ class LoginController extends BaseController
 
         return $this->json_return(200,'', ['token' => $jwtToken]);
     }
+
+    public function getCbLog(Request $request){
+        $data = $request->all();
+
+        //登录
+        list($bool,$result) = (new EmployeeService())->getCbLog($data);
+        if($bool){
+            return $this->json_return(200,'',$result);
+        }else{
+            return $this->json_return(201,$result);
+        }
+    }
 }

app/Service/EmployeeService.php

@@ -2,6 +2,7 @@
 
 namespace App\Service;
 
+use App\Model\BigKingCbj;
 use App\Model\Depart;
 use App\Model\Employee;
 use App\Model\EmployeeDepartPermission;
@@ -466,4 +467,33 @@ class EmployeeService extends Service
 
         return [true,''];
     }
+
+    public function getCbLog($data){
+        $model = new BigKingCbj();
+        $model = $model->select('id','data','crt_time','is_successful')
+            ->orderby('id', 'desc');
+
+        if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
+            $model->where('crt_time','>=',$data['crt_time'][0]);
+            $model->where('crt_time','<=',$data['crt_time'][1]);
+        }
+        if(! empty($data['data'])) $model->where('data','LIKE', '%'.$data['data'].'%');
+
+        $list = $this->limit($model,'',$data);
+        $list = $this->fillData($list);
+
+        return [true, $list];
+    }
+
+    public function fillData($data){
+        if(empty($data['data'])) return $data;
+
+        foreach ($data['data'] as $key => $value){
+            $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
+            $data['data'][$key]['data'] = json_decode($value['data'],true);
+            $data['data'][$key]['is_successful'] = $value['is_successful'] ? '是' : '否';
+        }
+
+        return $data;
+    }
 }

routes/api.php

@@ -29,7 +29,6 @@ Route::any('maintenance', 'Api\DwyController@maintenance');
 Route::any('andriodDownload', 'Api\DwyController@andriodDownload');
 Route::any('setAndriodDownload', 'Api\DwyController@setAndriodDownload');
 Route::any('andriodUp', 'Api\DwyController@andriodUp');
-Route::any('aa', 'Api\TestController@aa');
 //Route::any('boxOut', 'Api\DwyController@boxOut');
 
 //贴标机
@@ -66,6 +65,7 @@ Route::any('getBoxTrademark', 'Api\DwyController@getBoxTrademark');
 Route::any('aaaa', 'Api\DwyController@setBoxTrademark');
 Route::any('boxOut', 'Api\JobController@labelDeal');
 Route::any('getObsUrl', 'Api\DwyController@getObsUrl');
+Route::any('getCbLog', 'Api\LoginController@getCbLog');
 
 Route::group(['middleware'=> []],function ($route){
     $route->any('menuAdd', 'Api\SysMenuController@add');