修改

catch/alarm/controller/ControlAalrm.php

@@ -1,69 +0,0 @@
-<?php
-
-namespace catchAdmin\alarm\controller;
-
-use catcher\base\CatchRequest as Request;
-use catcher\CatchResponse;
-use catcher\base\CatchController;
-use catchAdmin\alarm\model\ControlAalrm as controlAalrmModel;
-
-class ControlAalrm extends CatchController
-{
-    protected $controlAalrmModel;
-    
-    public function __construct(ControlAalrmModel $controlAalrmModel)
-    {
-        $this->controlAalrmModel = $controlAalrmModel;
-    }
-    
-    /**
-     * 列表
-     * @time 2022年10月27日 15:33
-     * @param Request $request 
-     */
-    public function index(Request $request) : \think\Response
-    {
-        return CatchResponse::paginate($this->controlAalrmModel->getList());
-    }
-    
-    /**
-     * 保存信息
-     * @time 2022年10月27日 15:33
-     * @param Request $request 
-     */
-    public function save(Request $request) : \think\Response
-    {
-        return CatchResponse::success($this->controlAalrmModel->storeBy($request->post()));
-    }
-    
-    /**
-     * 读取
-     * @time 2022年10月27日 15:33
-     * @param $id 
-     */
-    public function read($id) : \think\Response
-    {
-        return CatchResponse::success($this->controlAalrmModel->findBy($id));
-    }
-    
-    /**
-     * 更新
-     * @time 2022年10月27日 15:33
-     * @param Request $request 
-     * @param $id
-     */
-    public function update(Request $request, $id) : \think\Response
-    {
-        return CatchResponse::success($this->controlAalrmModel->updateBy($id, $request->post()));
-    }
-    
-    /**
-     * 删除
-     * @time 2022年10月27日 15:33
-     * @param $id
-     */
-    public function delete($id) : \think\Response
-    {
-        return CatchResponse::success($this->controlAalrmModel->deleteBy($id));
-    }
-}

catch/alarm/controller/ControlAlarm.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace catchAdmin\alarm\controller;
+
+use catcher\base\CatchRequest as Request;
+use catcher\CatchResponse;
+use catcher\base\CatchController;
+use catchAdmin\alarm\model\ControlAlarm as controlAlarmModel;
+use think\facade\Db;
+class ControlAlarm extends CatchController
+{
+    protected $controlAlarmModel;
+    
+    public function __construct(controlAlarmModel $controlAlarmModel)
+    {
+        $this->controlAlarmModel = $controlAlarmModel;
+    }
+    
+    /**
+     * 列表
+     * @time 2022年10月27日 15:33
+     * @param Request $request 
+     */
+    public function index(Request $request) : \think\Response
+    {
+        return CatchResponse::paginate($this->controlAlarmModel->getList());
+    }
+    
+    /**
+     * 保存信息
+     * @time 2022年10月27日 15:33
+     * @param Request $request 
+     */
+    public function save(Request $request) : \think\Response
+    {
+        return CatchResponse::success($this->controlAlarmModel->storeBy($request->post()));
+    }
+    
+    /**
+     * 读取
+     * @time 2022年10月27日 15:33
+     * @param $id 
+     */
+    public function read($id) : \think\Response
+    {
+        return CatchResponse::success($this->controlAlarmModel->findBy($id));
+    }
+    
+    /**
+     * 更新
+     * @time 2022年10月27日 15:33
+     * @param Request $request 
+     * @param $id
+     */
+    public function update(Request $request, $id) : \think\Response
+    {
+        return CatchResponse::success($this->controlAlarmModel->updateBy($id, $request->post()));
+    }
+    
+    /**
+     * 删除
+     * @time 2022年10月27日 15:33
+     * @param $id
+     */
+    public function delete($id) : \think\Response
+    {
+        return CatchResponse::success($this->controlAlarmModel->deleteBy($id));
+    }
+
+     /**
+     * 报警点统计
+     * @param Request $request 
+     */
+    public function totalAlarmAddress(Request $request){
+        // $params=$request->param();
+        // $start_time=date('Y-m-d 00:00:00',strtotime($params['timeRange'][0]));
+        // $end_time=date('Y-m-d 00:00:00',strtotime($params['timeRange'][1]));
+        $xAxisData=[];
+        $yAxisData=[];
+        
+        $list=Db::table('control_alarm')
+            ->field('address,count(*) as num')
+            ->group('address')
+            ->order('num desc')
+            ->select();
+        foreach($list as $val){
+            $xAxisData[]=$val['address'];
+            $yAxisData[]=$val['num'];
+        }
+        // return $rows;
+        return CatchResponse::success(['xAxisData'=>$xAxisData,'yAxisData'=>$yAxisData]);
+    }
+}

catch/alarm/model/ControlAalrm.php

@@ -5,7 +5,7 @@ namespace catchAdmin\alarm\model;
 use catcher\base\CatchModel as Model;
 use catchAdmin\permissions\model\DataRangScopeTrait;
 use catchAdmin\system\model\SysDictData;
-class ControlAalrm extends Model
+class ControlAlarm extends Model
 {
     use DataRangScopeTrait;
     // 表名

catch/alarm/route.php

@@ -29,7 +29,8 @@ $router->group(function () use ($router){
 	// rfidWithBw路由
 	$router->resource('rfidWithBw', '\catchAdmin\alarm\controller\RfidWithBw');
 	// controlAalrm路由
-	$router->resource('controlAalrm', '\catchAdmin\alarm\controller\ControlAalrm');
+	$router->resource('controlAlarm', '\catchAdmin\alarm\controller\ControlAlarm');
+	$router->get('totalAlarmAddress', '\catchAdmin\alarm\controller\ControlAlarm@totalAlarmAddress');
 })->middleware('auth');
 
 $router->group('alarmReport', function () use ($router){

catch/device/database/migrations/20221103154309_station_passing.php

@@ -0,0 +1,39 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class StationPassing extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        $table = $this->table('station_passing', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '统计表' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
+        $table->addColumn('address', 'string', ['limit' => 255,'null' => true,'signed' => true,'comment' => '地点',])
+			->addColumn('mac', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '基站',])
+			->addColumn('date', 'date', ['null' => true,'signed' => true,'comment' => '日期',])
+			->addColumn('num', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => true,'signed' => true,'comment' => '过车数',])
+            ->create();
+    }
+}

catch/report/controller/Report.php

@@ -7,6 +7,7 @@ use catcher\CatchResponse;
 use catcher\base\CatchController;
 use catchAdmin\report\model\Report as ReportModel;
 use think\facade\Env;
+use think\facade\Db;
 class Report extends CatchController
 {
 
@@ -68,12 +69,13 @@ class Report extends CatchController
         $xAxisData=[];
         $yAxisData=[];
         for($i=$start_time;$i<$end_time+24*3600;$i+=24*3600){
-            $time1=date('Y-m-d 00:00:00',$i);
-            $time2=date('Y-m-d 23:59:59',$i);
+            $time1=date('Y-m-d',$i);
+            $time2=date('Y-m-d',$i);
             $xAxisData[]=date('Y-m-d',$i);
-            $cond['RF_DATE']=['timeRange',$time1,$time2];
+            // $cond['RF_DATE']=['timeRange',$time1,$time2];
             // $count=queryOracleCount('DSSC2.W_DW_RF_RECORD',$cond);
-            $count=mt_rand(0,99999);
+            // $count=mt_rand(0,99999);
+            $count=Db::table('station_passing')->where('date','between',[$time1,$time2])->sum('num');
             $yAxisData[]=$count;
      
         }   
@@ -89,15 +91,26 @@ class Report extends CatchController
     public function areaDeviceCollect(Request $request){
 
         $params=$request->param();
-        $start_time=date('Y-m-d 00:00:00',strtotime($params['timeRange'][0]));
-        $end_time=date('Y-m-d 00:00:00',strtotime($params['timeRange'][1]));
-    
+        $start_time=date('Y-m-d',strtotime($params['timeRange'][0]));
+        $end_time=date('Y-m-d',strtotime($params['timeRange'][1]));
+        $xAxisData=[];
+        $yAxisData=[];
+        $list=Db::table('station_passing')
+                        ->where('date','between',[$start_time,$end_time])
+                        ->field('address,sum(num) as count')
+                        ->group('address')
+                        ->order('count desc')
+                        ->select()->toArray();
+        foreach($list as $val){
+            $xAxisData[]=$val['address'];
+            $yAxisData[]=$val['count'];
+        }        
 
-        $host=    Env::get('oracle.hostname',  '127.0.0.1');
-        $port=    Env::get('oracle.hostport',  '1521');
-        $instance_name=    Env::get('oracle.instance',  'ORCL');
-        $username=    Env::get('oracle.username',  'root');
-        $password=    Env::get('oracle.password',  'root');
+        // $host=    Env::get('oracle.hostname',  '127.0.0.1');
+        // $port=    Env::get('oracle.hostport',  '1521');
+        // $instance_name=    Env::get('oracle.instance',  'ORCL');
+        // $username=    Env::get('oracle.username',  'root');
+        // $password=    Env::get('oracle.password',  'root');
      
     //     $conn = oci_connect('dssc3', 'dssc3', '61.175.203.188:6521/DSSC','AL32UTF8');
 
@@ -116,16 +129,12 @@ class Report extends CatchController
     //         $rows[]=$row;
     //     }
     //     oci_free_statement($stid);
-        $xAxisData=[];
-        $yAxisData=[];
+        
     //     foreach($rows as $val){
     //         $xAxisData[]=$val['DEVICE_NAME'];
     //         $yAxisData[]=$val['NUM'];
     //     }
-        for($i=0;$i<800;$i++){
-            $xAxisData[]='测试基站'.$i;
-            $yAxisData[]=mt_rand(0,99999);
-        }
+    
       
         // return $rows;
         return CatchResponse::success(['xAxisData'=>$xAxisData,'yAxisData'=>$yAxisData]);