第一版 目前基础功能基本写完

app/Http/Controllers/Api/Device/BaseController.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api\Device;
-
-use App\Http\Controllers\Controller;
-
-class BaseController extends Controller
-{
-    public $user_info;
-    public function __construct()
-    {
-    }
-
-    // 返回json数据
-    protected function json_return($code=200,$msg="Success",$data=[]){
-        if(!is_array($data)&&!is_object($data)) {
-            $msg = $data;
-            $data = '';
-        }
-        if(empty($msg)) $msg = '操作成功';
-        return ['code'=>$code,'msg'=>$msg,'data'=>$data];
-    }
-
-
-    //用户行为记录，暂时放这里具体用不用后期再加
-    public function user_log($data,$user,$id,$perm_id,$remark){
-
-    }
-
-
-
-
-
-
-
-
-
-}

app/Http/Controllers/Api/Device/DeviceController.php

@@ -1,22 +0,0 @@
-<?php
-namespace App\Http\Controllers\Api\Device;
-
-use App\Service\Device\DeviceService;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
-
-
-class DeviceController extends BaseController
-{
-    public function deviceList(Request $request){
-        $service = new DeviceService();
-        list($status,$data) = $service->deviceList();
-
-        if($status){
-            return $this->json_return(200,'',$data);
-        }else{
-            return $this->json_return(201,$data);
-        }
-
-    }
-}

app/Http/Controllers/Api/SystemRecordController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Service\SystemRecordService;
+use Illuminate\Http\Request;
+
+class SystemRecordController extends BaseController
+{
+    public function orderList(Request $request){
+        $service = new SystemRecordService();
+        list($status,$data) = $service->orderList($request->all());
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+    }
+}

app/Service/DeviceService.php

@@ -120,7 +120,7 @@ class DeviceService extends Service
         return [true,$list];
     }
 
-    public function fillData($data){
+    `public function fillData($data){
         if(empty($data['data'])) return $data;
         $gatewayMap = Gateway::whereIn('id',array_unique(array_column($data['data'],'gateway_id')))
             ->pluck('code','id')
@@ -135,7 +135,7 @@ class DeviceService extends Service
         }
 
         return $data;
-    }
+    }`
 
     public function equipmentRule($data,$is_add = true){
         if(empty($data['title'])) return [false,'设备名称不能为空'];

app/Service/Service.php

@@ -257,4 +257,15 @@ class Service
     function delLock($key){
         Cache::forget($key);
     }
+
+    //前端传来的时间转换为时间戳 关于时间段
+    function changeDateToTimeStampAboutRange($time_range){
+        if(empty($time_range[0]) || empty($time_range[1])) return [];
+
+        $return = [];
+        $return[] = strtotime($time_range[0] . " 00:00:00");
+        $return[] = strtotime($time_range[1] . " 23:59:59");
+
+        return $return;
+    }
 }

app/Service/SystemRecordService.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Service;
+
+use App\Model\SystemRecord;
+
+class SystemRecordService extends Service
+{
+    public function orderList($data){
+        $model = SystemRecord::select('account','crt_time','ip','content')
+            ->orderBy('id','desc');
+        if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])){
+            $return = $this->changeDateToTimeStampAboutRange($data['crt_time']);
+            $model->where('crt_time','>=',$return[0]);
+            $model->where('crt_time','<',$return[1]);
+        }
+        if(! empty($data['content'])) $model->where('content', 'LIKE', '%'.$data['content'].'%');
+
+        $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']) : '';
+        }
+
+        return $data;
+    }
+}