<\/div>(.*?)<\/div><\/div>/is", $html, $result);
$result = str_replace('
','',$result[0]);
@@ -582,8 +674,8 @@ function wuxian_getList($html,&$file,&$all,$exit){
if(!in_array($province_detail,$province_record)){
$record['city'] = $province_detail;
$province_record[] = $province_detail;
- fputcsv($file,$record);
- fputcsv($all,$record);
+ $key = $record['city'];
+ $list1[$key][] = $record;
}
if(strpos($data[1],'电信') !== false){
$record['city'] = explode('电信',$data[1])[0];
@@ -616,13 +708,22 @@ function wuxian_getList($html,&$file,&$all,$exit){
$record['nasname'] = $data[0];
if(!in_array($record['nasname'],$exit) && !in_array($record['nasname'],$dnx_has_exit)){
- fputcsv($dnx_exit,['无限',$record['nasname']]);
+ fputcsv($dnx_exit,['无限',$record['nasname'],date('Y-m-d H:i:s')]);
}
- fputcsv($file,$record);
- fputcsv($all,$record);
+ $list1[$key][] = $record;
}
+ foreach($list1 as $val){
+ foreach($val as $net_data){
+ $net_data['city'] = str_replace('电信','',$net_data['city']);
+ $net_data['city'] = str_replace('联通','',$net_data['city']);
+
+
+ fputcsv($file,$net_data);
+ fputcsv($all,$net_data);
+ }
+ }
}
function xianfeng_getList($data,&$file,&$all,$exit){
@@ -630,22 +731,25 @@ function xianfeng_getList($data,&$file,&$all,$exit){
//省会
$province = ['黑龙','内蒙','直辖'];
$province_record = [];
+ $key = '';
+ $list1 = [];
$status = ['维护中','正常'];
foreach ($data as $info) {
$record = [];
$record['name'] = '先锋';
+
+ $info['description'] = trim($info['description'],'a');
if(strpos($info['description'],'混播') || strpos($info['description'],'所有单城市')){
$province_detail = '混播';
if(!in_array($province_detail,$province_record)){
$record['city'] = $province_detail;
$province_record[] = $province_detail;
- fputcsv($file,$record);
- fputcsv($all,$record);
+ $key = $record['city'];
+ $list1[$key][] = $record;
}
$record['city'] = $info['description'];
$record['supply'] = '电信/联通';
} else {
- $info['description'] = trim($info['description'],'a');
$province_detail = mb_substr(trim($info['description']),0,2);
if(in_array($province_detail,$province)){
$province_detail = mb_substr($info['description'],0,3);
@@ -653,8 +757,8 @@ function xianfeng_getList($data,&$file,&$all,$exit){
if(!in_array($province_detail,$province_record)){
$record['city'] = $province_detail;
$province_record[] = $province_detail;
- fputcsv($file,$record);
- fputcsv($all,$record);
+ $key = $record['city'];
+ $list1[$key][] = $record;
}
if(strpos($info['description'],'电信') !== false){
$record['city'] = $info['description'];
@@ -678,10 +782,21 @@ function xianfeng_getList($data,&$file,&$all,$exit){
$record['status'] = '';
$record['nasname'] = $info['nasname'];
if(!in_array($record['nasname'],$exit) && !in_array($record['nasname'],$dnx_has_exit)){
- fputcsv($dnx_exit,['先锋',$record['nasname']]);
+ fputcsv($dnx_exit,['先锋',$record['nasname'],date('Y-m-d H:i:s')]);
+ }
+ $list1[$key][] = $record;
+ }
+ foreach($list1 as $val){
+ foreach($val as $net_data){
+
+ $net_data['city'] = str_replace('电信','',$net_data['city']);
+ $net_data['city'] = str_replace('联通','',$net_data['city']);
+
+ if(mb_strlen($net_data['city'])>3 && !strpos($net_data['city'],'省内')) $net_data['city'] = mb_substr($net_data['city'],3);
+
+ fputcsv($file,$net_data);
+ fputcsv($all,$net_data);
}
- fputcsv($file,$record);
- fputcsv($all,$record);
}
}
@@ -690,6 +805,8 @@ function jinrui_getList($html,&$file,&$all,$exit){
global $dnx_exit,$dnx_has_exit;
//省会
$province_record = [];
+ $key = '';
+ $list1 = [];
preg_match_all("/\{(.*?)\}/is", $html, $result);
foreach ($result[0] as $info) {
$info = json_decode($info,true);
@@ -701,8 +818,8 @@ function jinrui_getList($html,&$file,&$all,$exit){
if(!in_array($info['province'],$province_record)){
$record['city'] = $info['province'];
$province_record[] = $info['province'];
- fputcsv($file,$record);
- fputcsv($all,$record);
+ $key = $record['city'];
+ $list1[$key][] = $record;
}
if(empty($info['city'])){
$record['city'] = $info['province'] ;
@@ -720,10 +837,17 @@ function jinrui_getList($html,&$file,&$all,$exit){
foreach($nasname as $v){
$record['nasname'] = $v;
if(!in_array($record['nasname'],$exit) && !in_array($record['nasname'],$dnx_has_exit)){
- fputcsv($dnx_exit,['金瑞',$record['nasname']]);
+ fputcsv($dnx_exit,['金瑞',$record['nasname'],date('Y-m-d H:i:s')]);
}
- fputcsv($file,$record);
- fputcsv($all,$record);
+ $list1[$info['province']][] = $record;
+ }
+ }
+ foreach($list1 as $val){
+ foreach($val as $net_data){
+
+
+ fputcsv($file,$net_data);
+ fputcsv($all,$net_data);
}
}
}
diff --git a/script/linedata/search.php b/script/linedata/search.php
old mode 100644
new mode 100755
index f988ee7..fb5ffbe
--- a/script/linedata/search.php
+++ b/script/linedata/search.php
@@ -5,7 +5,7 @@
* @Author: kangkang
* @Date: 2020-11-07 11:13:08
* @LastEditors: kangkang
- * @LastEditTime: 2020-11-10 11:06:54
+ * @LastEditTime: 2020-11-12 09:31:32
*/
header('Access-Control-Allow-Origin: *');
header("Access-Control-Allow-Methods: *");
@@ -64,13 +64,16 @@ function search_all_product($file_path,$search){
$record = [];
while ($info = fgetcsv($file)) {
- if(isset($info[7])){
+ if(!empty($info[7])){
$info[10] = $province;
} else {
$province = $info[1];
}
- $search_info = implode('',$info);
+ $search_info = implode('',$info).$province;
+ if(strpos($search_info,'混播')||strpos($search_info,'混拨')){
+ $search_info .= '混播混拨';
+ }
if(strpos($search_info,$search) !== false){
$data['name'] = $info[0];
@@ -139,13 +142,16 @@ function search_product($file_path,$dns = ''){
$province = '';
$record = [];
while ($info = fgetcsv($file)) {
- if(isset($info[7])){
+ if(!empty($info[9])){
$info[10] = $province;
} else {
$province = $info[1];
}
- $search_info = implode('',$info);
+ $search_info = implode('',$info).$province;
+ if(strpos($search_info,'混播')||strpos($search_info,'混拨')){
+ $search_info .= '混播混拨';
+ }
if(strpos($search_info,$search) !== false){
$data['name'] = $info[0];
@@ -182,6 +188,9 @@ function search_xingxing($file_path1,$file_path2,$dns){
}
$search_info = implode('',$info);
+ if(strpos($search_info,'混播')||strpos($search_info,'混拨')){
+ $search_info .= '混播混拨';
+ }
if(strpos($search_info,$search) !== false){
$data['name'] = $info[0];
@@ -206,6 +215,9 @@ function search_xingxing($file_path1,$file_path2,$dns){
}
$search_info = implode('',$info);
+ if(strpos($search_info,'混播')||strpos($search_info,'混拨')){
+ $search_info .= '混播混拨';
+ }
if(strpos($search_info,$search) !== false){
$data['name'] = $info[0];
diff --git a/script/linedata/upload.php b/script/linedata/upload.php
index 1bd90e2..090c822 100755
--- a/script/linedata/upload.php
+++ b/script/linedata/upload.php
@@ -5,7 +5,7 @@
* @Author: kangkang
* @Date: 2020-11-03 11:04:15
* @LastEditors: kangkang
- * @LastEditTime: 2020-11-06 11:18:36
+ * @LastEditTime: 2020-11-11 11:37:32
*/
header('Access-Control-Allow-Origin: *');
@@ -13,7 +13,7 @@ header("Access-Control-Allow-Methods: *");
header('Access-Control-Allow-Headers:*');
header("Access-Control-Allow-Credentials: true");
-if(move_uploaded_file($_FILES['file']['tmp_name'],__DIR__.'/2288.csv')){
+if(move_uploaded_file($_FILES['file']['tmp_name'],__DIR__.'/data/2288.csv')){
echo "上传成功";
}else{
echo "上传失败";