接口数据两列相连优化

application/api/controller/Index.php

@@ -316,10 +316,20 @@ class Index extends Api
                     }else{
                         $row[$k]['pid'] = $pid;
                         $row[$k]['time'] = $v[0];
-                        $row[$k]['type'] = '';
-                        ($v[1] == '-')?$row[$k]['peak_area'] = '-':$row[$k]['peak_area'] = floatval($v[1]);
-                        ($v[2] == '-')?$row[$k]['val'] = '-':$row[$k]['val'] = floatval($v[2]);
-                        ($v[3] == '-')?$row[$k]['potency'] = '-':$row[$k]['potency'] = floatval($v[3]);
+                        if($v[1]=='-'){
+                            //数据形式为  ' 11.636            -           -         -         苯  '
+                            $row[$k]['type'] = '';
+                            $row[$k]['peak_area'] = '-';
+                            $row[$k]['val'] = '-';
+                            $row[$k]['potency'] = '-';
+                        }else{
+                            //数据形式为  '16.058 BB     5.14751e-1     1.545917.95757e-1    1-乙氧基-2-丙醇  '
+                            //数据形式为  ' 13.642 BB        6.59774  1.20137e-27.92635e-2    乙酸正丙酯  '
+                            $row[$k]['type'] = $v[1];
+                            $row[$k]['peak_area'] = floatval($v[2]);
+                            $row[$k]['val'] = floatval(substr($v[3],0,strlen($v[3])-10));
+                            $row[$k]['potency'] = floatval(substr($v[3],strlen($v[3])-10,10));
+                        }
 
                         preg_match('/邻(-)?二甲苯$/', $v[4], $matches);
                         if(count($matches)){
@@ -842,10 +852,20 @@ class Index extends Api
                             }else{
                                 $row[$k]['pid'] = $id['id'];
                                 $row[$k]['time'] = $v[0];
-                                $row[$k]['type'] = '';
-                                ($v[1] == '-')?$row[$k]['peak_area'] = '-':$row[$k]['peak_area'] = floatval($v[1]);
-                                ($v[2] == '-')?$row[$k]['val'] = '-':$row[$k]['val'] = floatval($v[2]);
-                                ($v[3] == '-')?$row[$k]['potency'] = '-':$row[$k]['potency'] = floatval($v[3]);
+                                if($v[1]=='-'){
+                                    //数据形式为  ' 11.636            -           -         -         苯  '
+                                    $row[$k]['type'] = '';
+                                    $row[$k]['peak_area'] = '-';
+                                    $row[$k]['val'] = '-';
+                                    $row[$k]['potency'] = '-';
+                                }else{
+                                    //数据形式为  '16.058 BB     5.14751e-1     1.545917.95757e-1    1-乙氧基-2-丙醇  '
+                                    //数据形式为  ' 13.642 BB        6.59774  1.20137e-27.92635e-2    乙酸正丙酯  '
+                                    $row[$k]['type'] = $v[1];
+                                    $row[$k]['peak_area'] = floatval($v[2]);
+                                    $row[$k]['val'] = floatval(substr($v[3],0,strlen($v[3])-10));
+                                    $row[$k]['potency'] = floatval(substr($v[3],strlen($v[3])-10,10));
+                                }
 
                                 preg_match('/邻(-)?二甲苯$/', $v[4], $matches);
                                 if(count($matches)){