图书馆返回数据优化

source/application/api/controller/library/Pass.php

@@ -18,7 +18,27 @@ class Pass extends Controller
      */
     public function allFlowTrends()
     {
-        $data = \app\common\model\Pass::getBaoAnLibData();
+        $dm = new Dm();
+        $res = $dm->find('bt_library',['group_id' => 'lib001']);
+
+        $data = [
+            'day30' => [
+                'incount' => isset($res['day30_incount']) ? $res['day30_incount'] : 0,
+                'outcount' => isset($res['day30_outcount']) ? $res['day30_outcount'] : 0
+            ],
+            'month' => [
+                'incount' => isset($res['month_incount']) ? $res['month_incount'] : 0,
+                'outcount' => isset($res['month_outcount']) ? $res['month_outcount'] : 0
+            ],
+            'today' => [
+                'incount' => isset($res['today_incount']) ? $res['today_incount'] : 0,
+                'outcount' => isset($res['today_outcount']) ? $res['today_outcount'] : 0
+            ],
+            'year' => [
+                'incount' => isset($res['year_incount']) ? $res['year_incount'] : 0,
+                'outcount' => isset($res['year_outcount']) ? $res['year_outcount'] : 0
+            ],
+        ];
 
         return $this->renderSuccess(compact('data'));
     }

source/application/api/controller/pass/Passcc.php

@@ -29,7 +29,12 @@ class Passcc extends Controller
 
         if (empty($granularity)) return $this->renderError('date参数不能为空');
         $where = '';
-        if (!empty($groupsId)) $where .= ' "groups_id" in(' . "'" . implode("','",$groupsId)  . "')";
+        if(!empty($groupsId)){
+            $garr = explode("|",$groupsId);
+            $where .= ' "groupId" in(' . "'" . implode("','",$garr)  . "')";
+
+        }
+        //if (!empty($groupsId)) $where .= ' "groupId" in(' . "'" . implode("','",$groupsId)  . "')";
         $allTimeData = [];
         $groupsData = [];
         $dkeys=[];
@@ -172,16 +177,16 @@ class Passcc extends Controller
             }
         }
         $returnData['sumYear']['noRepeatInNum'] = $yearSum;
-
-        $libData = Pass::getBaoAnLibData(true);
-        foreach ($libData as $libRow) {
-            $returnData['day']['noRepeatInNum'] += $libRow['data']['today']['incount'];
-            $returnData['week']['noRepeatInNum'] += $libRow['data']['today']['incount'];
-            $returnData['month']['noRepeatInNum'] += $libRow['data']['month']['incount'];
-            $returnData['year']['noRepeatInNum'] += $libRow['data']['year']['incount'];
-            $returnData['sumYear']['noRepeatInNum'] += $libRow['data']['year']['incount'];
-        }
-
+        /*
+                $libData = Pass::getBaoAnLibData(true);
+                foreach ($libData as $libRow) {
+                    $returnData['day']['noRepeatInNum'] += $libRow['data']['today']['incount'];
+                    $returnData['week']['noRepeatInNum'] += $libRow['data']['today']['incount'];
+                    $returnData['month']['noRepeatInNum'] += $libRow['data']['month']['incount'];
+                    $returnData['year']['noRepeatInNum'] += $libRow['data']['year']['incount'];
+                    $returnData['sumYear']['noRepeatInNum'] += $libRow['data']['year']['incount'];
+                }
+        */
         foreach ($returnData as &$val) {
             $val['noRepeatInNum'] = formatNumber($val['noRepeatInNum']);
         }
@@ -222,19 +227,18 @@ class Passcc extends Controller
             $val['groupName'] = $getGroup['groupName'] ?: '';
             $returnData[] = $val;
         }
-
-        $libData = Pass::getBaoAnLibData(true);
-
+        $libData = $dm->select('bt_library',['group_id' => ['baz001','BAF055']]);
         foreach ($libData as $libRow) {
-            $libProportion = $libRow['data']['today']['incount'] > 0 ? round($libRow['data']['today']['incount']/$threshold,2) : 0;
+            $libProportion = $libRow['today_incount'] > 0 ? round($libRow['today_incount']/$threshold,2) : 0;
             $returnData[] = [
-                'allEnter' => $libRow['data']['today']['incount'] ?: 0,
+                'allEnter' => $libRow['today_incount'] ?: 0,
                 'proportion' => ($libProportion * 100) . "%",
                 'congestion' => Pass::getPassType($libProportion),
-                'groupId' => $libRow['groupId'],
-                'groupName' => $libRow['name']
+                'groupId' => $libRow['group_id'],
+                'groupName' => $libRow['group_name']
             ];
         }
+        var_dump($returnData);die;
 
         return $this->renderSuccess(compact('returnData'));
     }