add campush

catch/api/controller/Api.php

@@ -673,7 +673,7 @@ class Api extends CatchController
                         $info = [
                             "mac" => $mac,
                             "id" => $rfid,
-                            "firs_time" => $time,
+                            "first_time" => $time,
                             "time" => $time,
                             "status" => 2,//2出状态，1进状态
                             "rssi" => [
@@ -870,10 +870,11 @@ class Api extends CatchController
         $flagIn = $avg["front"] < $config["front_in"] || $avg["behind"] < $config["behind_in"] || $avg["left"] < $config["left_in"] || $avg["right"] < $config["right_in"];
         $flagOut = $avg["front"] > $config["front_out"] && $avg["behind"] > $config["behind_out"] && $avg["left"] > $config["left_out"] && $avg["right"] > $config["right_out"];
 
-        
-        $url="http://localhost:8115/api/areaReport";
         if($flagIn && $status == 2){
-            if ($info["pushTime"] &&  (time()-$info['pushTime']) < 5 ) { 
+        // if($flagIn){
+            $inoutIntFilter = $ues_redis->hget("anbang_four_wire", "anbang_4rssi_intFilter");
+            $inoutIntFilter = $inoutIntFilter ? $inoutIntFilter : 20;
+            if ($info["pushTime"] &&  (time()-$info['pushTime']) < $inoutIntFilter ) { 
                 # code...
                 return $info;
             }
@@ -886,6 +887,7 @@ class Api extends CatchController
                     [
                         "label" => $info["id"],
                         "time" => $info["time"],
+                        "first_time" => $info["first_time"],
                         "dirt" => 1,
                         "rssi" => $info["rssi"],//数组 [{"front":72,"behind":255,"left":255,"right":255,"time":1685067709},{"front":76,"behind":255,"left":255,"right":255,"time":1685067710}]
                         "avg" => $info["avg"] //{"front":"77.17","behind":"90.00","left":"90.00","right":"90.00"}
@@ -927,6 +929,31 @@ class Api extends CatchController
             
             // debug_log("pushPareaRes","远程返回结果".$url_res);
         }
+        if($flagIn && $info['status'] == 1){
+            $inoutIntFilter = $ues_redis->hget("anbang_four_wire", "anbang_4rssi_intFilter");
+            $inoutIntFilter = $inoutIntFilter ? $inoutIntFilter : 20;
+            if ($info["camPushTime"] &&  (time()-$info['camPushTime']) < $inoutIntFilter ) { 
+                # code...
+                return $info;
+            }
+            //推送进
+            $url_data = [
+                "mac" => $info["mac"],
+                "first_time" => $info["first_time"],
+                "data" => [
+                    [
+                        "label" => $info["id"],
+                        "time" => $info["time"],
+                        "dirt" => 1,
+                        "rssi" => $info["rssi"],//数组 [{"front":72,"behind":255,"left":255,"right":255,"time":1685067709},{"front":76,"behind":255,"left":255,"right":255,"time":1685067710}]
+                        "avg" => $info["avg"] //{"front":"77.17","behind":"90.00","left":"90.00","right":"90.00"}
+                    ]
+                ]
+            ];
+            $ues_redis->lpush("parea_inoutres_push", json_encode($url_data));
+            $info["camPushTime"] = time();
+        }
+
         return $info;
     }
 

task_script/PAREA_INOUTRES_PUSH.php

@@ -273,19 +273,21 @@ while (true) {
         
         http($url, $url_data, [], 'POST');
 
-        // if($url_data["data"][0]["dirt"] == 1){
-        //     $camData = [
-        //         "station" => $url_data["mac"],
-        //         "list" => [
-        //             [
-        //                 "label" =>$url_data["data"][0]["label"],
-        //                 "time" => $url_data["data"][0]["time"]
-        //             ]
-        //         ]
-        //     ];
-        //     $resp = http("http://localhost:8115/api/areaLabelReport", $camData, [], 'POST');
-        //     // rlog("CAM api RESP",$resp);
-        // }
+        if($url_data["first_time"]){
+            $camData = [
+                "station" => $url_data["mac"],
+                "list" => [
+                    [
+                        "label" =>$url_data["id"],
+                        "first_time" => $url_data["first_time"],
+                        "time" => $url_data["time"]
+                    ]
+                ]
+            ];
+            
+            $resp = http("http://localhost:8115/api/areaLabelReport", $camData, [], 'POST');
+                
+        }
 
         rlog("PUSH INFO","推送依赖数据", $data);
     }catch (\Exception $ex) {

task_script/PAREA_STATUS_UPDATE.php

@@ -221,7 +221,7 @@ while (true) {
 
         $infos = app_redis()->hgetall("parea_rfidinfos");
         $offlineInt  = app_redis()->hget("anbang_four_wire", "anbang_4rssi_offint");
-        $inoutIntFilter = app_redis()->hget("anbang_four_wire", "anbang_4rssi_intFilter");
+        // $inoutIntFilter = app_redis()->hget("anbang_four_wire", "anbang_4rssi_intFilter");
         if(!$inoutIntFilter){
             $inoutIntFilter = 300;
         }
@@ -234,33 +234,34 @@ while (true) {
             $data = json_decode($v, true);
             
 
-            if($data["status"] == 1){
-                if ( (time() - $data["pushTime"] ) > $inoutIntFilter ) {
-                    $camData = [
-                        "station" => $data["mac"],
-                        "list" => [
-                            [
-                                "label" =>$data["id"],
-                                "time" => $data["time"]
-                            ]
-                        ]
-                    ];
+            // if($data["status"] == 1){
+            //     if ( (time() - $data["pushTime"] ) > $inoutIntFilter ) {
+            //         $camData = [
+            //             "station" => $data["mac"],
+            //             "list" => [
+            //                 [
+            //                     "label" =>$data["id"],
+            //                     "first_time"
+            //                     "time" => $data["time"]
+            //                 ]
+            //             ]
+            //         ];
                     
-                    if(!$rfidPushRecArr[$data["id"]]){
-                        $rfidPushRecArr[$data["id"]] = 1;
-                        $resp = http("http://localhost:8115/api/areaLabelReport", $camData, [], 'POST');
-                    }else{
-                        if($rfidPushRecArr[$data["id"]] == 1){
-                            $rfidPushRecArr[$data["id"]] == 2;
-                            $resp = http("http://localhost:8115/api/areaLabelReport", $camData, [], 'POST');
-                        }
-                    }
+            //         if(!$rfidPushRecArr[$data["id"]]){
+            //             $rfidPushRecArr[$data["id"]] = 1;
+            //             $resp = http("http://localhost:8115/api/areaLabelReport", $camData, [], 'POST');
+            //         }else{
+            //             if($rfidPushRecArr[$data["id"]] == 1){
+            //                 $rfidPushRecArr[$data["id"]] == 2;
+            //                 $resp = http("http://localhost:8115/api/areaLabelReport", $camData, [], 'POST');
+            //             }
+            //         }
 
-                    $logrecData = ['anbang_4rssi_intFilter' => $inoutIntFilter, 'time' => $data["time"], 'os_time' => time(), 'push_count' => $rfidPushRecArr[$data["id"]]];
-                    rlog("CAM PUSH INFO","推送摄像关联接口", json_encode($logrecData) );
+            //         $logrecData = ['anbang_4rssi_intFilter' => $inoutIntFilter, 'time' => $data["time"], 'os_time' => time(), 'push_count' => $rfidPushRecArr[$data["id"]]];
+            //         rlog("CAM PUSH INFO","推送摄像关联接口", json_encode($logrecData) );
                     
-                }
-            }
+            //     }
+            // }
 
             if ( (time() - $data["time"] ) > $offlineInt ) {
                 # code...