|
@@ -286,6 +286,27 @@ class Api extends CatchController
|
|
|
debug_log("parea_rfidinfos_redis_set_record","redis更新记录".json_encode($info,true));
|
|
|
}else{
|
|
|
$info = json_decode($info,true);
|
|
|
+
|
|
|
+ $config = $ues_redis->hget("anbang_four_wire", $info["mac"]);
|
|
|
+
|
|
|
+ if (!$config) {
|
|
|
+ # code...
|
|
|
+ $config = [
|
|
|
+ "front_in" => 65,
|
|
|
+ "behind_in" => 70,
|
|
|
+ "left_in" => 80,
|
|
|
+ "right_in" => 70,
|
|
|
+ "front_out" => 70,
|
|
|
+ "behind_out" => 75,
|
|
|
+ "left_out" => 82,
|
|
|
+ "right_out" => 70,
|
|
|
+ "expInt" => 20,
|
|
|
+ "effSigNum" => 10
|
|
|
+ ];
|
|
|
+ }else{
|
|
|
+ $config = json_decode($config,true);
|
|
|
+ }
|
|
|
+ // var_dump("+++++++++++++++++",$config);
|
|
|
|
|
|
$info["time"] = $time;
|
|
|
$newRssi = [
|
|
@@ -298,16 +319,15 @@ class Api extends CatchController
|
|
|
$rssisArr = $info["rssi"];
|
|
|
|
|
|
// var_dump("+++++++++++++++++", $time, $newRssi["time"]);
|
|
|
-
|
|
|
+
|
|
|
foreach ($rssisArr as $k => $v) {
|
|
|
# code...
|
|
|
- if( ($time - $v["time"] ) > $EXP_TIME ){
|
|
|
+ if( ($time - $v["time"] ) > $config['expInt'] ){
|
|
|
unset($rssisArr[$k]);
|
|
|
- // var_dump("+++++++++++++++++", $time, $v["time"]);
|
|
|
}
|
|
|
}
|
|
|
// var_dump("+++++++++++++++++",$rssisArr);
|
|
|
- if(count($rssisArr) == $EFF_SIG_NUM){
|
|
|
+ if(count($rssisArr) == $config['effSigNum']){
|
|
|
array_shift($rssisArr);
|
|
|
array_push($rssisArr, $newRssi);
|
|
|
}else{
|
|
@@ -342,7 +362,7 @@ class Api extends CatchController
|
|
|
|
|
|
if ($cacCount == $EFF_SIG_NUM) {
|
|
|
# code...
|
|
|
- $info = $this->compAndPush($info ,$ues_redis);
|
|
|
+ $info = $this->compAndPush($info ,$config);
|
|
|
}
|
|
|
$ues_redis->hset("parea_rfidinfos",$field, json_encode($info,true));
|
|
|
|
|
@@ -359,30 +379,14 @@ class Api extends CatchController
|
|
|
return $text ?$text : "";
|
|
|
}
|
|
|
//判断进出和推送
|
|
|
- public function compAndPush($info, $ues_redis){
|
|
|
+ public function compAndPush($info, $config ){
|
|
|
//标签多,数据多时候,判断完成后放入redis,异步推送,当前暂时直接推
|
|
|
- if (empty($info)) {
|
|
|
- # code...
|
|
|
- return false;
|
|
|
- }
|
|
|
- $config = $ues_redis->hget("anbang_four_wire", $info["mac"]);
|
|
|
+
|
|
|
+ // $config = $ues_redis->hget("anbang_four_wire", $info["mac"]);
|
|
|
|
|
|
//{"front_in":44,"front_out":44,"behind_in":50,"behind_out":50,"left_in":55,"left_out":55,"right_out":44,"right_out":44}
|
|
|
- if (!$config) {
|
|
|
- # code...
|
|
|
- $config = [
|
|
|
- "front_in" => 65,
|
|
|
- "behind_in" => 70,
|
|
|
- "left_in" => 80,
|
|
|
- "right_in" => 70,
|
|
|
- "front_out" => 70,
|
|
|
- "behind_out" => 75,
|
|
|
- "left_out" => 82,
|
|
|
- "right_out" => 70,
|
|
|
- ];
|
|
|
- }else{
|
|
|
- $config = json_decode($config);
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
|
|
|
$avg = $info['avg'];
|
|
|
$status = $info['status'];
|