接口调整

Modules/OpcData/Http/Controllers/Api/CarIllegalController.php

@@ -31,7 +31,7 @@ class CarIllegalController  extends BaseController
             $startTime = $date.' '.$stime;
             $endTime = $date.' '.$etime;
 
-            $res = $this->getCarIllegalByTimeSpan($startTime, $endTime);
+            $res = $this->getCarIllegalByTimeSpan($startTime, $endTime, $mineCode);
 
             $categories1[]= substr($etime, 0, -3);
             $data1[] = $res[0]->con;
@@ -41,7 +41,7 @@ class CarIllegalController  extends BaseController
             $yStartTime = $yesterday.' '.$stime;
             $yEndTime = $yesterday.' '.$etime;
 
-            $res = $this->getCarIllegalByTimeSpan($yStartTime, $yEndTime);
+            $res = $this->getCarIllegalByTimeSpan($yStartTime, $yEndTime, $mineCode);
             $data2[] = $res[0]->con;
         }
         // 超速违章统计
@@ -65,7 +65,7 @@ class CarIllegalController  extends BaseController
             $stime = date("Y-m-d 00:00:00", strtotime("-".$i." day"));
             $etime = date("Y-m-d 23:59:59", strtotime("-".$i." day"));
 
-            $res = $this->getCarIllegalByTimeSpan($stime, $etime);
+            $res = $this->getCarIllegalByTimeSpan($stime, $etime, $mineCode);
             $categories3[]= date("m-d", strtotime("-".$i." day"));;
             $data3['data'][] = $res[0]->con;
         }
@@ -76,10 +76,10 @@ class CarIllegalController  extends BaseController
         ];
 
         // 违章数据列表
-        $dataList = $this->getCarIllegalList($listStartTime, $listEndTime, $page, $perPage);
+        $dataList = $this->getCarIllegalList($listStartTime, $listEndTime, $mineCode, $page, $perPage);
         $dataTotal = $this->getCarIllegalCount($mineCode);
         $data = [
-            "total"=>$dataTotal[0]->total,
+            "total"=>$dataTotal,
             "speeding_con"=>$res1,
             "speeding_week"=>$res2,
             "detail_list"=>$dataList
@@ -99,7 +99,7 @@ class CarIllegalController  extends BaseController
         try {
             $opcDB =  DB::connection($conn);
             $dbResult = $opcDB->select($sqlStr);
-            return $dbResult;
+            return $dbResult[0]->total;
         } catch (\Exception $e) {
             return $this->error(-1, '今日超速统计出错！');
         }
@@ -108,13 +108,13 @@ class CarIllegalController  extends BaseController
     public function getCarIllegalList($startTime, $endTime, $mineCode='zaoquan', $page=0, $perPage = 15) {
         $sqlStr = "SELECT DISTINCT state_date, plate_number, substr(illegal_time, 1, 16 ) illegal_time, point_name, illegal_speed, speed_limit ";
         $sqlStr .= "FROM cars_violation ";
-        $sqlStr .= "WHERE illegal_time >='".$startTime."' and illegal_time < '".$endTime."' ";
+        $sqlStr .= "WHERE illegal_time >='".$startTime."' and illegal_time <= '".$endTime."' ";
         $sqlStr .= "AND plate_number != '无车牌' ";
         $sqlStr .= "order by illegal_time desc ";
         // $sqlStr .= "limit ".$page.", ".$perPage."";
         // return $sqlStr;
         $conn   = 'etl_'.$mineCode;
-        try{
+        try {
             $opcDB =  DB::connection($conn);
             $dbResult = $opcDB->select($sqlStr);
             for($i = 0; $i<count($dbResult); $i++) {