git 2 vuotta sitten
vanhempi
commit
bc69e1300f

+ 58 - 0
Home/Lib/Action/ListeningFileCreateAction.class.php

@@ -68,5 +68,63 @@ class ListeningFileCreateAction extends Action {
 		
 	}
 	
+ 
+	public  function scan_no_listening(  ){
+		$dis = '/home/renlian';
+			if(is_file($dir))
+			{
+			   return;
+			}
+		    $redis = new Redis();
+		   try{
+					 $redis->connect($ip,$post,2.5);
+					 $redis->auth($password); //设置密码
+					$redis->select(1);
+					$result = $redis->ping();
+					if($result=='pong')
+					{
+		             echo "redis连接成功";
+		             DahuaUtil::rlog('redis连接成功');
+		         }
+		         else
+		         {
+		               DahuaUtil::rlog("redis连接失败=>".$result.PHP_EOL);
+		               echo "redis连接失败=>".$result.PHP_EOL;
+		         }
+		                  
+		       }catch (Exception $e){
+		
+		           DahuaUtil::rlog("redis连接异常".$e->getMessage());
+		
+		    }
+		
+		
+		    $files = scandir($dir);
+		    foreach($files as $k=>$filename) {//务必使用!==,防止目录下出现类似文件名“0”等情况
+		    if ($filename != "." && $filename != ".."&&!strstr($filename,'.redis')&&!strstr($filename,'.md5')&&is_file($dir.'/'.$filename))    {
+		          $data = $dir.'/'.$filename;
+					  $file_md5 = str_replace('.dat','.md5',$data);
+					  if(!is_file($file_md5))
+					  {
+						  continue;
+					  }
+					  $md5=file_get_contents($file_md5);
+						if(md5_file($data)!=$md5)
+						{
+							continue;
+						}
+				
+		          if(rename($data,$data.'.redis'))
+		          {
+		              $redis->lpush('redis_to_kafka',$data.'.redis');
+		          }
+		    }
+		                   }
+		   closedir($dir);
+			 $redis->close();
+		
+		   return;
+	}
+	
 
 }

+ 1 - 3
Home/Lib/Action/RouteRfidKafkaAction.class.php

@@ -55,9 +55,7 @@ class RouteRfidKafkaAction extends Action {
 				$RF_STAT=2;
 			}
 			$RF_FLAGID=strtoupper($val['id']);
-			if($RF_FLAGID=='00000000'){
-				continue;
-			}
+			
 			$RF_DATE=date('Y-m-d H:i:s',$val['time']);
 			$sql = 'INSERT INTO "DSSC2"."W_DW_RF_RECORD"("ID", "RF_ID", "RF_FLAGID", "RF_DATE", "RF_STAT") VALUES (DSSC2.SEQ_W_DW_RF_RECORD.nextval, \''.$RF_ID.'\', \''.$RF_FLAGID.'\', TO_DATE(\''.$RF_DATE.'\', \'SYYYY-MM-DD HH24:MI:SS\'), \''.$RF_STAT.'\')';
 		 	//var_dump($sql); 

+ 9 - 7
Home/Lib/Action/V1Action.class.php

@@ -93,14 +93,16 @@ class V1Action extends Action {
 				$runTime = time() - $timeFram;
 				$sum++;
 				echo $sum.PHP_EOL;
-				if($sum % 100000 == 0){
-					$datRes = $this->writeRouteFile($fileName,$locationPack);
-					if($datRes){
-						$locationPack = '';
-						$sum = 0;
+				if($runTime < $fileTimeInterval){
+					if($sum % 10000 == 0){
+						echo 'start write routefile...'.PHP_EOL;
+						$datRes = $this->writeRouteFile($fileName,$locationPack);
+						if($datRes){
+							$locationPack = '';
+							$sum = 0;
+						}
 					}
-				}
-				if($runTime >= $fileTimeInterval){
+				}else{
 					$md5Res = $this->createRouteMD5file($fileName);
 					$timeFram = time();
 					$createTime = date('Ymd_His', $timeFram);