From 34d2db77dd61231a16062469864d8ee1ca4a41fd Mon Sep 17 00:00:00 2001
From: "altob.rd" <altob.rd@gmail.com>
Date: Mon, 13 Nov 2017 11:05:48 +0800
Subject: [PATCH] bug fix

add mqtt_opendoor
---
 controllers/Cars.php  |  2 ++
 models/Cars_model.php | 36 +++++++++++++++++++++---------------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/controllers/Cars.php b/controllers/Cars.php
index 48823c5..66caa9e 100644
--- a/controllers/Cars.php
+++ b/controllers/Cars.php
@@ -109,6 +109,8 @@ class Cars extends CI_Controller
 		$mqtt_port = isset($station_setting['mqtt_port']) ? $station_setting['mqtt_port'] : MQ_PORT;
 		$this->vars['mqtt'] = new phpMQTT($mqtt_ip, $mqtt_port, uniqid());
 		$this->vars['mqtt']->connect();
+		$this->vars['mqtt_opendoor'] = new phpMQTT($mqtt_ip, $mqtt_port, uniqid());
+		$this->vars['mqtt_opendoor']->connect();
 		
 		// init again
 		$this->sync_data_model->init($this->vars);	// for mqtt
diff --git a/models/Cars_model.php b/models/Cars_model.php
index 49a0d69..5aaf18f 100644
--- a/models/Cars_model.php
+++ b/models/Cars_model.php
@@ -845,21 +845,6 @@ class Cars_model extends CI_Model
         return $rows;
     }
 
-	// 開門 (月租)
-    public function member_opendoors($parms)
-	{
-		$this->mq_send(MQ_TOPIC_OPEN_DOOR, "DO{$parms['ivsno']},OPEN,{$parms['lpr']}");
-        return true;
-    }
-
-	// 開門 (臨停)
-	public function temp_opendoors($parms)
-	{
-		$this->mq_send(MQ_TOPIC_OPEN_DOOR, "DO{$parms['ivsno']},TICKET,{$parms['lpr']}");
-		return true;
-	}
-
-
     // 用eTag讀出車號
 	public function etag2lpr_2($etag)
 	{
@@ -1168,6 +1153,27 @@ class Cars_model extends CI_Model
 		$this->vars['mqtt']->publish($topic, $msg, 0);
     	trigger_error("mqtt:{$topic}|{$msg}");
     }
+	
+	// 開門專用
+	public function mq_send_opendoor($topic, $msg)
+	{
+		$this->vars['mqtt_opendoor']->publish($topic, $msg, 0);
+    	trigger_error("mqtt_opendoor:{$topic}|{$msg}");
+    }
+	
+	// 開門 (月租)
+    public function member_opendoors($parms)
+	{
+		$this->mq_send_opendoor(MQ_TOPIC_OPEN_DOOR, "DO{$parms['ivsno']},OPEN,{$parms['lpr']}");
+        return true;
+    }
+
+	// 開門 (臨停)
+	public function temp_opendoors($parms)
+	{
+		$this->mq_send_opendoor(MQ_TOPIC_OPEN_DOOR, "DO{$parms['ivsno']},TICKET,{$parms['lpr']}");
+		return true;
+	}
 
 
     // 指派車位