likang

catch/tag_history/controller/TagHistory.php

@@ -85,8 +85,8 @@ class TagHistory extends CatchController
             $where[] = ['mac', 'in', '30B5F10138EB'];
             $where[] = ['lable', 'in', "30b5f6000006,30b5f6000007,30b5f6000008,0000f6000006,0000f6000007,0000f6000008"];
         } elseif ($ccccRole) {
-            $where[] = ['mac', 'in', '30B5F10138ED'];
-            $where[] = ['lable', 'in', "000000880002,000000880003"];
+            $where[] = ['mac', 'in', '30B5F10138ED,30B5F1012F7A'];
+            $where[] = ['lable', 'in', "000000880002,000000880003,000000880004"];
         } elseif ($six) {
 
             $where[] = ['mac', 'in', '30B5F1013801'];
@@ -95,11 +95,11 @@ class TagHistory extends CatchController
 
             $where[] = ['mac', 'not in', '30B5F1013899'];
             $where[] = ['mac', 'not in', '30B5F10138EB'];
-            $where[] = ['mac', 'not in', '30B5F10138ED'];
+            $where[] = ['mac', 'not in', '30B5F10138ED,30B5F1012F7A'];
             $where[] = ['mac', 'not in', '30B5F1013801'];
             $where[] = ['lable', 'not in', "3543245626,3544976938,3544261098,1539178988,3544517098,3544959402,3542053498,3543226346,3544413306"];
             $where[] = ['lable', 'not in', "30b5f6000006,30b5f6000007,30b5f6000008,0000f6000006,0000f6000007,0000f6000008"];
-            $where[] = ['lable', 'not in', "000000880002,000000880003"];
+            $where[] = ['lable', 'not in', "000000880002,000000880003,000000880004"];
             $where[] = ['lable', 'not in', "0000e2b7a905,0000e2b7a2c5,0000ea511abe,0000e2b6d355"];
         }
 
@@ -185,7 +185,7 @@ class TagHistory extends CatchController
         } else if ($shifouRole) {
             $where[] = ['mac', 'in', '30B5F10138EB'];
         } elseif ($ccccRole) {
-            $where[] = ['mac', 'in', '30B5F10138ED'];
+            $where[] = ['mac', 'in', '30B5F10138ED,30B5F1012F7A'];
         } elseif ($six) {
             $where[] = ['mac', 'in', '30B5F1013801'];
         } else {
@@ -214,14 +214,14 @@ class TagHistory extends CatchController
         } elseif ($shifouRole) {
             $where[] = ['lable', 'in', "30b5f6000006,30b5f6000007,30b5f6000008,0000f6000006,0000f6000007,0000f6000008"];
         } elseif ($ccccRole) {
-            $where[] = ['lable', 'in', "000000880002,000000880003"];
+            $where[] = ['lable', 'in', "000000880002,000000880003,000000880004"];
         } elseif ($six) {
             $where[] = ['lable', 'in', "0000e2b7a905,0000e2b7a2c5,0000ea511abe,0000e2b6d355"];
         } else {
             $where[] = ['lable', 'not in', "3543245626,3544976938,3544261098,1539178988,3544517098,3544959402,3542053498,3543226346,3544413306"];
             $where[] = ['lable', 'not in', "30b5f6000006,30b5f6000007,30b5f6000008,0000f6000006,0000f6000007,0000f6000008"];
             $where[] = ['lable', 'not in', "0000e2b7a905,0000e2b7a2c5,0000ea511abe,0000e2b6d355"];
-            $where[] = ['lable', 'not in', "000000880002,000000880003"];
+            $where[] = ['lable', 'not in', "000000880002,000000880003,000000880004"];
         }
         $list = $this->tagHistoryModel->group('lable')->where($where)->column('lable');
         return CatchResponse::success($list);
@@ -287,4 +287,68 @@ class TagHistory extends CatchController
         $resout = $intage;
         return $resout;
     }
+    /**
+     * 折现图
+     */
+    public function lineChart(Request $request)
+    {
+        $data = $request->get();
+        $start_time = $data['start_time'];
+
+        if (empty($start_time)) {
+            $start_time = strtotime(date('Y-m-d'));
+        }
+
+        $end_time = null;
+        if (!$end_time) {
+            $end_time = time();
+        }
+
+        $where = [];
+        $where[] = [$start_time, '>=', 'addTime'];
+        $where[] = [$end_time, '=<', 'addTime'];
+        $where[] = ['mac', 'in', '30B5F10138ED'];
+        $where[] = ['lable', 'in', "000000880002,000000880003"];
+
+        $list = $this->tagHistoryModel->where($where)->order('addTime desc')->select()->toArray();
+
+        $time = [];
+        $lable1 = [];
+        $lable2 = [];
+        foreach ($list as $item) {
+            $time[] = $item['addTime'];
+            if ($item['lable'] == '000000880002') {
+                $lable1[$item['addTime']] = $item['temperature'];
+                if (!$lable2[$item['addTime']]) {
+                    $lable2[$item['addTime']] = null;
+                }
+            } else if ($item['lable'] == '000000880003') {
+                $lable2[] = $item['temperature'];
+                if (!$lable1[$item['addTime']]) {
+                    $lable1[$item['addTime']] = null;
+                }
+            }
+        }
+        $renData = [];
+        $renData = [
+            'xAxis' => array_unique($time),
+            'legend' => ['000000880002', '000000880003'],
+            'series' => [
+                [
+                    'name' => '000000880002',
+                    'type' => 'line',
+                    'stack' => 'Total',
+                    'data' => array_values($lable1)
+                ],
+                [
+                    'name' => '000000880003',
+                    'type' => 'line',
+                    'stack' => 'Total',
+                    'data' => array_values($lable2)
+                ]
+            ]
+
+        ];
+        return CatchResponse::success($renData);
+    }
 }

catch/tag_history/route.php

@@ -5,7 +5,7 @@
  * @Author: likang
  * @Date: 2022-08-12 11:31:01
  * @LastEditors: likang
- * @LastEditTime: 2022-08-18 14:22:56
+ * @LastEditTime: 2022-10-08 15:41:38
  */
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
@@ -28,4 +28,6 @@ $router->group(function () use ($router) {
 	//获取标签
 	$router->get('getTages', '\catchAdmin\tag_history\controller\TagHistory@getTages');
 	$router->get('getTime', '\catchAdmin\tag_history\controller\TagHistory@getTime');
+	//获取折线图lineChart
+	$router->get('lineChart', '\catchAdmin\tag_history\controller\TagHistory@lineChart');
 })->middleware('auth');