From cbf3e4dfd14fe3b1a07302e7e0cb7f1d44939758 Mon Sep 17 00:00:00 2001
From: "altob.rd" <altob.rd@gmail.com>
Date: Tue, 14 Nov 2017 10:13:43 +0800
Subject: [PATCH] upd

---
 controllers/Carpark.php | 12 ++++++++++--
 controllers/Cars.php    |  2 --
 models/Cars_model.php   | 16 ++++++++--------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/controllers/Carpark.php b/controllers/Carpark.php
index d082054..dd7af1e 100644
--- a/controllers/Carpark.php
+++ b/controllers/Carpark.php
@@ -138,6 +138,12 @@ class Carpark extends CI_Controller
 	//
 	// ------------------------------------------------
 	
+	// [test] ACTI crm alert
+	public function gen_test_alert()
+	{
+		echo 'test_alert';
+	}
+	
 	// [test] zzz
 	public function gen_test_case()
 	{
@@ -258,11 +264,13 @@ class Carpark extends CI_Controller
 		
 		if ($rows['member_no'] == 0)
 		{
-			$this->cars_model->mq_send(MQ_TOPIC_OPEN_DOOR, "DO{$parms['ivsno']},TICKET,{$parms['lpr']}");	// 臨停訊號
+			$parms['ck'] = $this->cars_model->gen_opendoor_ck($parms, 'temp_opendoors');	// 臨停訊號
+			$this->cars_model->do_temp_opendoor($parms);
 		}
 		else
 		{
-			$this->cars_model->mq_send(MQ_TOPIC_OPEN_DOOR, "DO{$parms['ivsno']},OPEN,{$parms['lpr']}");		// 月租訊號
+			$parms['ck'] = $this->cars_model->gen_opendoor_ck($parms, 'member_opendoors');	// 月租訊號
+			$this->cars_model->do_member_opendoor($parms);
 		}
 		
 		echo 'ok';
diff --git a/controllers/Cars.php b/controllers/Cars.php
index f2774f2..018ceba 100644
--- a/controllers/Cars.php
+++ b/controllers/Cars.php
@@ -250,7 +250,6 @@ http://192.168.10.201/cars.html/ipcam/sno/12119/ivsno/0/io/O/type/C/lpr/4750YC/c
 		$this->cars_model->init($this->vars);
 		$result = $this->cars_model->do_temp_opendoor($parms);
 		trigger_error(__FUNCTION__ . "..{$result}.." . print_r($parms, true));
-		$this->cars_model->stop();		
 		exit;
 	}
 	
@@ -266,7 +265,6 @@ http://192.168.10.201/cars.html/ipcam/sno/12119/ivsno/0/io/O/type/C/lpr/4750YC/c
 		$this->cars_model->init($this->vars);
 		$result = $this->cars_model->do_member_opendoor($parms);
 		trigger_error(__FUNCTION__ . "..{$result}.." . print_r($parms, true));
-		$this->cars_model->stop();		
 		exit;
 	}
 
diff --git a/models/Cars_model.php b/models/Cars_model.php
index 927f18a..72901d6 100644
--- a/models/Cars_model.php
+++ b/models/Cars_model.php
@@ -1171,17 +1171,17 @@ class Cars_model extends CI_Model
     }
 	
 	// 產生 CK
-	public function gen_opendoor_ck($parms)
+	public function gen_opendoor_ck($parms, $function_name)
 	{
-		return md5($parms['ivsno']. 'alt' . date('dmh') . 'ob' . $parms['lpr']);
+		return md5($parms['ivsno']. 'alt' . date('dmh') . 'o' . $parms['lpr'] . 'b' . $function_name);
 	}
 	
 	// 開門 (月租)
     public function member_opendoors($parms)
 	{
 		//$this->mq_send_opendoor(MQ_TOPIC_OPEN_DOOR, "DO{$parms['ivsno']},OPEN,{$parms['lpr']}");
-		$ck = $this->gen_opendoor_ck($parms);
-		get_headers("http://localhost/cars.html/member_opendoors/{$parms['ivsno']}/{$parms['lpr']}/{$ck}");
+		$ck = $this->gen_opendoor_ck($parms, __FUNCTION__);
+		get_headers("http://localhost/cars.html/" . __FUNCTION__ . "/{$parms['ivsno']}/{$parms['lpr']}/{$ck}");
         return true;
     }
 
@@ -1189,15 +1189,15 @@ class Cars_model extends CI_Model
 	public function temp_opendoors($parms)
 	{
 		//$this->mq_send_opendoor(MQ_TOPIC_OPEN_DOOR, "DO{$parms['ivsno']},TICKET,{$parms['lpr']}");
-		$ck = $this->gen_opendoor_ck($parms);
-		get_headers("http://localhost/cars.html/temp_opendoors/{$parms['ivsno']}/{$parms['lpr']}/{$ck}");
+		$ck = $this->gen_opendoor_ck($parms, __FUNCTION__);
+		get_headers("http://localhost/cars.html/" . __FUNCTION__ ."/{$parms['ivsno']}/{$parms['lpr']}/{$ck}");
 		return true;
 	}
 	
 	// 開門 (月租)
 	public function do_member_opendoor($parms)
 	{
-		if($parms['ck'] != $this->cars_model->gen_opendoor_ck($parms))
+		if($parms['ck'] != $this->gen_opendoor_ck($parms, 'member_opendoors'))
 		{
 			return 'ck_error';	// 中斷
 		}
@@ -1209,7 +1209,7 @@ class Cars_model extends CI_Model
 	// 開門 (臨停)
 	public function do_temp_opendoor($parms)
 	{
-		if($parms['ck'] != $this->cars_model->gen_opendoor_ck($parms))
+		if($parms['ck'] != $this->gen_opendoor_ck($parms, 'temp_opendoors'))
 		{
 			return 'ck_error';	// 中斷
 		}