作者 王晓刚
1 个管道 的构建 通过 耗费 0 秒

合并分支 'wxg' 到 'master'

gatewaywork部署上线调试



查看合并请求 !32
... ... @@ -118,11 +118,15 @@ class Events
$dianji_status = $param[12];//电机状态
$yejing_status = $param[13];//液晶状态
$wenshidu_status = $param[14];//湿度传感器状态
print_r($param);
//验证签名是否正确;
unset($param[0]);
unset($param[count($param)]);
unset($param[count($param)]);
print_r($param);
$str = ",".implode(',',$param).",";
echo self::crc16($str)."\n";
echo $crc16;
if (self::crc16($str) != $crc16) {
echo "yanzhengshibai2";
return ;
... ... @@ -135,6 +139,23 @@ class Events
if($row['status'] != 'normal' || $row['end_time'] < time()){
$status = "B9";//禁用
}else {
$iunsert_param = [
'number' => $number,
'command_number' => $command_number,
'time' => $time,
'position' => $position,
'address' => $address,
'quantity' => $quantity,
'wendu' => $wendu,
'shidu' => $shidu,
'papers' => $papers,
'papers_count' => $papers_count,
'times' => $times,
'sensor_status' => $sensor_status,
'dianji_status' => $dianji_status,
'yejing_status' => $yejing_status,
'wenshidu_status' => $wenshidu_status,
];
$createtime = time();
$arr1 = [
'number' => $number,
... ... @@ -152,7 +173,7 @@ class Events
'dianji_status' => $dianji_status,
'yejing_status' => $yejing_status,
'wenshidu_status' => $wenshidu_status,
'socket_data' => json_encode($param),
'socket_data' => json_encode($iunsert_param),
'createtime' => $createtime,
];
// $db->beginTrans();
... ...