|
|
@@ -124,10 +124,10 @@ class Api extends CatchController
|
|
|
debug_log("label_log","delete：".json_encode($DA));
|
|
|
|
|
|
}
|
|
|
- $DA['rssi1']=$DA['rssi1']==255?90:$DA['rssi1'];
|
|
|
- $DA['rssi2']=$DA['rssi2']==255?90:$DA['rssi2'];
|
|
|
- $DA['rssi3']=$DA['rssi3']==255?90:$DA['rssi3'];
|
|
|
- $DA['rssi4']=$DA['rssi4']==255?90:$DA['rssi4'];
|
|
|
+ $DA['rssi1']=$DA['rssi1']==255?100:$DA['rssi1'];
|
|
|
+ $DA['rssi2']=$DA['rssi2']==255?100:$DA['rssi2'];
|
|
|
+ $DA['rssi3']=$DA['rssi3']==255?100:$DA['rssi3'];
|
|
|
+ $DA['rssi4']=$DA['rssi4']==255?100:$DA['rssi4'];
|
|
|
|
|
|
$DA["rssi1"]=$DA["rssi1"]<=$DA["rssi3"]?$DA["rssi1"]:$DA["rssi3"];
|
|
|
$DA["rssi2"]=$DA["rssi2"]<=$DA["rssi4"]?$DA["rssi2"]:$DA["rssi4"];
|
|
|
@@ -135,9 +135,15 @@ class Api extends CatchController
|
|
|
* 缓存到redis历史数据
|
|
|
*/
|
|
|
if(substr($da,8,2)=='01'&&$history_status&&$DA["rssi1"]!=$DA["rssi2"]){
|
|
|
- $dispose = new dispose($ues_redis);
|
|
|
- $dispose->set_label_history($DA);
|
|
|
+
|
|
|
debug_log("label_log","cache: ".json_encode($DA));
|
|
|
+ $diff= $DA["rssi1"]-$DA["rssi2"];
|
|
|
+ if(abs($diff)>2){
|
|
|
+ $dispose = new dispose($ues_redis);
|
|
|
+ $dispose->set_label_history($DA);
|
|
|
+ }
|
|
|
+ debug_log("label_log","cache_diff: ".$diff);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -306,9 +312,6 @@ class Api extends CatchController
|
|
|
|
|
|
}else{
|
|
|
//上午不做二次计算
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
if(empty($in_and_out)){
|
|
|
//二次生成结果
|
|
|
|
