From 9e6042d17c4acc2a84ccc09341511e15f7337c88 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Tue, 8 Aug 2023 18:01:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=AD=A2sql=E6=B3=A8=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/pass/Passcc.php            |  4 +-
 source/application/common/logic/PassFlow.php  | 41 +++++++++++++------
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/source/application/api/controller/pass/Passcc.php b/source/application/api/controller/pass/Passcc.php
index 17d8cc2..a6d842d 100644
--- a/source/application/api/controller/pass/Passcc.php
+++ b/source/application/api/controller/pass/Passcc.php
@@ -93,8 +93,8 @@ class Passcc extends Controller
      */
     public function getPassHoursData()
     {
-        $groupsId = $this->request->param('groupsId') ?: '';
-        $data = PassFlow::getPassHoursData(null,['groupsId' => $groupsId]);
+        $type = $this->request->param('type') ?: '';
+        $data = PassFlow::getPassHoursData(null,['type' => $type]);
         return $this->renderSuccess(compact('data'));
     }
 }
\ No newline at end of file
diff --git a/source/application/common/logic/PassFlow.php b/source/application/common/logic/PassFlow.php
index 0db6ada..2fb6391 100644
--- a/source/application/common/logic/PassFlow.php
+++ b/source/application/common/logic/PassFlow.php
@@ -6,6 +6,17 @@ use app\common\dm\Dm;
 
 class PassFlow
 {
+    protected static $groupType = [1,2];# 1 = 体育 2 = 文化
+
+    protected static function getGroupIds($dm,$type = 1)
+    {
+        $groupIdArr = [];
+        $result = $dm->select('bt_passenger_monitor_group',['type' => $type]);
+        foreach ($result as $row) {
+            $groupIdArr[] = $row['groupId'];
+        }
+        return $groupIdArr;
+    }
     /**
      * 分时时间段接口      <首页-客流趋势>
      * @return array
@@ -17,14 +28,16 @@ class PassFlow
     {
 
         $granularity = $param['granularity'];
-        $groupsId    = $param['groupsId'];
+        $type    = $param['type'];
 
         if (empty($granularity)) return ['code' => 0, 'msg' => '缺少参数：granularity'];
         $where = '';
-        if (!empty($groupsId)) {
-            $garr  = explode("|", $groupsId);
-            $where .= ' "groupId" in(' . "'" . implode("','", $garr) . "')";
-
+        $groupsId = '';
+        if (!empty($type)) {
+            if (!in_array($type,self::$groupType)) return ['code' => 0, 'msg' => 'type字段参数错误'];
+            $groupsIdArr = self::getGroupIds($dm,$type);
+            $groupsId = implode("|",$groupsIdArr);
+            $where .= ' "groupId" in(' . "'" . implode("','", $groupsIdArr) . "')";
         }
 
         $allTimeData = [];
@@ -251,8 +264,9 @@ class PassFlow
         if (empty($dm)) $dm = new Dm();
         $paramWhere = '';
         if (!empty($param)) {
-            if (!empty($param['groupsId'])) {
-                $groupsId = explode("|",$param['groupsId']);
+            if (!empty($param['type'])) {
+                if (!in_array($param['type'],self::$groupType)) return ['code' => 0, 'msg' => 'type字段参数错误'];
+                $groupsId = self::getGroupIds($dm,$param['type']);
                 $paramWhere .= ' and "groupId" in (' . "'" . implode("','",$groupsId) . "')";
             }
         }
@@ -394,9 +408,11 @@ class PassFlow
 
         $where = ' "granularity"='."'hourly' ";
         $groupsWhere = null;
+        $groupsId = [];
         if (!empty($param)) {
-            if (!empty($param['groupsId'])) {
-                $groupsId = explode("|",$param['groupsId']);
+            if (!empty($param['type'])) {
+                if (!in_array($param['type'],self::$groupType)) return ['code' => 0, 'msg' => 'type字段参数错误'];
+                $groupsId = self::getGroupIds($dm,$param['type']);
                 $groupsWhere = ['groupId' => $groupsId];
                 $where .= ' and "groupId" in (' . "'" . implode("','",$groupsId) . "')";
             }
@@ -448,7 +464,7 @@ class PassFlow
                 'list' => $listData
             ];
         }
-	if(empty($param['groupsId'])){
+	if(empty($groupsId)){
 	   $data = self::getLibraryGroupHoursList($dm,false,$data);
 	}
         return $data;
@@ -547,8 +563,9 @@ class PassFlow
 
         $where = ' "granularity"='."'hourly' ";
         if (!empty($param)) {
-            if (!empty($param['groupsId'])) {
-                $groupsId = explode("|",$param['groupsId']);
+            if (!empty($param['type'])) {
+                if (!in_array($param['type'], self::$groupType)) return ['code' => 0, 'msg' => 'type字段参数错误'];
+                $groupsId = self::getGroupIds($dm, $param['type']);
                 $where .= ' and "groupId" in (' . "'" . implode("','",$groupsId) . "')";
             }
         }