stanley-king 4 år sedan
förälder
incheckning
e718f6e4ba
2 ändrade filer med 12 tillägg och 7 borttagningar
  1. 5 7
      application/index/controller/Cabinet.php
  2. 7 0
      route/route.php

+ 5 - 7
application/index/controller/Cabinet.php

@@ -113,7 +113,7 @@ class Cabinet extends Base
         $params['id']                 = $this->getid();
         $params['cabinet_code']     = input('param.cabinet_number');
 
-        $cabinet = $this->get_cabinet($params['cabinet_number']);
+        $cabinet = $this->get_cabinet($params['cabinet_code']);
         $params['delay_time']         = 0;
         if($cabinet == false){
             return json(json_error_exception('1008'));
@@ -137,7 +137,7 @@ class Cabinet extends Base
         $params['id']                 = $this->getid();
         $params['cabinet_code']     = input('param.cabinet_number');
 
-        $cabinet = $this->get_cabinet($params['cabinet_number']);
+        $cabinet = $this->get_cabinet($params['cabinet_code']);
         $params['delay_time']         = 0;
         if($cabinet == false){
             return json(json_error_exception('1008'));
@@ -162,7 +162,7 @@ class Cabinet extends Base
         $params['cabinet_code']     = input('param.cabinet_number');
         $params['delay_time']         = 0;
 
-        $cabinet = $this->get_cabinet($params['cabinet_number']);
+        $cabinet = $this->get_cabinet($params['cabinet_code']);
         if($cabinet == false){
             return json(json_error_exception('1008'));
         }
@@ -186,7 +186,7 @@ class Cabinet extends Base
         $params['cabinet_code']     = input('param.cabinet_number');
         $params['delay_time']         = 0;
 
-        $cabinet = $this->get_cabinet($params['cabinet_number']);
+        $cabinet = $this->get_cabinet($params['cabinet_code']);
         if($cabinet == false){
             return json(json_error_exception('1008'));
         }
@@ -210,7 +210,7 @@ class Cabinet extends Base
         $params['cabinet_code']     = input('param.cabinet_number');
         $params['delay_time']         = 0;
 
-        $cabinet = $this->get_cabinet($params['cabinet_number']);
+        $cabinet = $this->get_cabinet($params['cabinet_code']);
         if($cabinet == false){
             return json(json_error_exception('1008'));
         }
@@ -228,8 +228,6 @@ class Cabinet extends Base
         }
     }
 
-
-
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     private function proc_request($queue_name, $key, $params){
         QueueClient::push($queue_name,self::redis_host , self::redis_port ,$key,$params);

+ 7 - 0
route/route.php

@@ -12,7 +12,14 @@
         'changeCabinetStatus'       => 'index/cabinet/change_cabinet_status',
         'AddCabinet'                => 'index/cabinet/add_cabinet',
         'CloseBox'                  => 'index/cabinet/add_cabinet',
+
         'OpenBox'                   => 'index/cabinet/OpenBox',
+        'LockCabinet'               => 'index/cabinet/LockCabinet',
+        'UnLockCabinet'             => 'index/cabinet/UnLockCabinet',
+        'ReleaseAlarm'              => 'index/cabinet/ReleaseAlarm',
+        'Reboot'                    => 'index/cabinet/Reboot',
+        'QueryState'                => 'index/cabinet/QueryState',
+
         'checkRcode'                => 'index/order/check_rcode',
         'orderBindCode'             => 'index/order/order_bind_code',
     ));