1

app/Http/Controllers/Api/DwyController.php

@@ -1024,7 +1024,7 @@ class DwyController extends BaseController
         foreach ($data as $k => &$v) {
             $v['material_code_show'] = $v['box_inventory']['material_code_show'];
             $v['qty'] = $v['roll_qty'];
-            $v['bus_date'] = $v['bus_date'] ? strtotime($v['bus_date']) : time();
+            $v['bus_date'] = $v['bus_date'] ? strtotime($v['bus_date']) : '1722441600';
             $v['use_qty'] = 0;
         }
         sort($data);
@@ -1161,20 +1161,29 @@ class DwyController extends BaseController
     }
 
     public function andriodDownload(Request $request){
+        $data = file_get_contents('andriodList.txt');
+        $data  = json_decode($data,true);
+        $param = $request->all();
+        if(isset($param['type'])){
+            $type = $param['type'];
+            $return = [];
+            foreach ($data as $v){
+                if($v['type'] == $type) $return[] = $v;
+            }
+            $data = $return;
+        }
+        return ['status'=>200,'data'=> $data];
+    }
 
-        return ['status'=>200,'data'=> [
-            [
-                'load' => 'https://t9.qingyaokeji.com/dwy/cbjtest0801.apk',
-                'remark' => '这是测试数据',
-                'type' => '1',
-                'version' => '20240802'
-            ],[
-                'load' => 'https://t9.qingyaokeji.com/dwy/cbjtest0801.apk',
-                'remark' => '这是正式数据数据',
-                'type' => '0',
-                'version' => '20240803'
-            ],
-        ]];
+    public function setAndriodDownload(Request $request){
+//        $data = file_get_contents('andriodList.txt');
+//        if(empty($data)) $data = [];
+//        else $data = json_decode($data,true);
+        $param = $request->all();
+
+        file_put_contents('andriodList.txt',json_encode($param));
+
+        return ['status'=>200,'msg'=>'ok','data'=>[]];
     }
 
 }

app/Http/Controllers/Api/ScreenController.php

@@ -256,6 +256,7 @@ class ScreenController extends BaseController
         foreach ($list as $k=>$v){
             $v['device_name'] = substr(str_replace('广西大王椰','',$v['device_name']),0,19);
             if(!in_array($v['device_name'],$device_key))$device_key[] = $v['device_name'];
+            if($v['happening_data'] < 0 ) $v['happening_data'] = - $v['happening_data'];
             $list_key[$v['device_name']][$v['c']] = sprintf('%.2f',$v['happening_data']*1);
 //            $list_key[$v['device_name']][$v['c']] = rand(0,100);
 //            $list_key[]
@@ -363,7 +364,7 @@ class ScreenController extends BaseController
         $key = DeviceSite::where('site',1)->wherein('title',['急停'])->groupBy('key')->pluck('key')->toArray();
         $list = DeviceData::wherein('dev_eui',$key)->where('happening_data',1)->select('crt_time','device_name','happening_data');
 //        $list = $this->limi
-        $list = $list->paginate(50, '*', 'page', 1)->toArray();
+        $list = $list->orderBy('crt_time','desc')->paginate(50, '*', 'page', 1)->toArray();
         $list = $list['data'];
         foreach ($list as &$v){
             $v['device_name'] = substr(str_replace('广西大王椰','',$v['device_name']),0,19);
@@ -376,11 +377,12 @@ class ScreenController extends BaseController
 
     public function gzEchart(){
 
-        $start = time()-86400*150;
+//        $start = time()-86400*0;
         $end = isset($request['start_time']) ? $request['start_time'] : time();
         $key = DeviceSite::where('site',1)->wherein('title',['急停'])->groupBy('key')->pluck('key')->toArray();
         $list = DeviceData::wherein('dev_eui',$key)->where('happening_data',1)->select(DB::raw("DATE_FORMAT(FROM_UNIXTIME(crt_time), '%Y-%m-%d %H') as c") ,DB::raw("count(id) as s"),'device_name','happening_data')->groupBy('dev_eui')->groupBy(DB::raw("DATE_FORMAT(FROM_UNIXTIME(crt_time), '%Y-%m-%d %H')"));
-        $list = $list->where('crt_time','>=',$start);
+        $list = $list->orderby('crt_time','desc');
+//        $list = $list->where('crt_time','>=',$start);
         $list = $list->paginate(50, '', 'page', 1)->toArray();
         $list = $list['data'];
         $list_key = [];

routes/api.php

@@ -27,7 +27,9 @@ Route::any('andriodLog', 'Api\DwyController@andriodLog');
 Route::any('ttttt', 'Api\TestController@deviceCallback');
 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');
 
 //贴标机