fix bug

api/application/controllers/Lampcontrol.php

@@ -819,6 +819,7 @@ class Lampcontrol extends Base_Controller {
     // 灯控的开启/关闭(支持批量处理)
     public function turnonoff(){
         $username = $this->input->post('username',true);
+        $role = $this->input->post('role',true);
         $client_key = $this->input->post('client_key',true);
         $token = $this->input->post('token',true);
         $type = intval($this->input->post('type',true));
@@ -828,10 +829,10 @@ class Lampcontrol extends Base_Controller {
 
         $lampArr = explode(',', $lamp_id);
 
-        $url = $_SERVER['REQUEST_SCHEME'].'://'.$_SERVER['SERVER_NAME'].'/api/device/lampcontrol/dimming_asy';
+        $url = $_SERVER['REQUEST_SCHEME'].'://'.$_SERVER['SERVER_NAME'].'/api/lampcontrol/dimming_asy';
         $lightness = empty($type) ? 0 : 100;
         foreach ($lampArr as $l) {
-            doAsyncRequest($url,['clientid'=>$clientid,'username'=>$username,'client_key'=>$client_key,'token'=>$token,'version'=>$version,'type'=>$type,'lamp_id'=>$l,'lightness'=>$lightness]);
+            doAsyncRequest($url,['clientid'=>$clientid,'username'=>$username,'client_key'=>$client_key,'token'=>$token,'version'=>$version,'type'=>$type,'lamp_id'=>$l,'lightness'=>$lightness,'role'=>$role]);
         }
         
         exit();
@@ -840,6 +841,7 @@ class Lampcontrol extends Base_Controller {
     // 灯控调光
     public function dimming(){
         $username = $this->input->post('username',true);
+        $role = $this->input->post('role',true);
         $client_key = $this->input->post('client_key',true);
         $token = $this->input->post('token',true);
         $lamp_id = $this->input->post('lamp_id',true);
@@ -850,9 +852,10 @@ class Lampcontrol extends Base_Controller {
         $lampArr = explode(',', $lamp_id);
 
         // $lampList = $this->Lamp_model->get_list_in('L.id', $lampArr, 'L.id,N.protocoltype', array());
-        $url = $_SERVER['REQUEST_SCHEME'].'://'.$_SERVER['SERVER_NAME'].'/api/device/lampcontrol/dimming_asy';
+        $url = $_SERVER['REQUEST_SCHEME'].'://'.$_SERVER['SERVER_NAME'].'/api/lampcontrol/dimming_asy';
+        
         foreach ($lampArr as $l) {
-            doAsyncRequest($url,['clientid'=>$clientid,'username'=>$username,'client_key'=>$client_key,'token'=>$token,'version'=>$version,'lamp_id'=>$l,'lightness'=>$lightness]);
+            doAsyncRequest($url,['clientid'=>$clientid,'username'=>$username,'client_key'=>$client_key,'token'=>$token,'version'=>$version,'lamp_id'=>$l,'lightness'=>$lightness,'role'=>$role]);
         }
         
         exit();
@@ -867,7 +870,7 @@ class Lampcontrol extends Base_Controller {
         if (empty($lamp_id)) {
             exit(json_result('0400', $this->response['0400'], array()));
         }
-        $lampData = $this->Lamp_model->get_one(['id'=>$lamp_id],'number,address');
+        $lampData = $this->Lamp_model->get_one(['id'=>$lamp_id],'number,address,id');
 
         $seq = get_seq();
         $seq = '01';
@@ -892,9 +895,9 @@ class Lampcontrol extends Base_Controller {
                     $this->Lamp_model->update(array('id'=>$lampData['id']),array('status'=>0,'lighteness'=>0));
                 }
 
-                $lampData = $this->Lamp_model->get_project_company(array('L.id'=>$lamp_id),'P.projectname,N.networkname,L.number,L.address');
-                $this->add_operation_log('cmd',"\"{$lampData['projectname']}\"项目下的\"{$lampData['networkname']}\"网络里的编号为\"{$lampData['number']}\"、无线模块地址为\"{$lampData['address']}\"的路灯调光\"{$lightness}%\"",0);
-                $this->add_operation_log('cmd',"Light dimming:\"{$lampData['number']}\".Wireless module address:\"{$lampData['address']}\".Project name:\"{$lampData['projectname']}\".Network name:\"{$lampData['networkname']}\".Lighteness:\"{$lightness}%\"",0,1);
+                $lampData = $this->Lamp_model->get_project_company(array('L.id'=>$lamp_id),'P.projectname,L.number,L.address');
+                $this->add_operation_log('cmd',"\"{$lampData['projectname']}\"项目下的编号为\"{$lampData['number']}\"、无线模块地址为\"{$lampData['address']}\"的路灯调光\"{$lightness}%\"",0);
+                $this->add_operation_log('cmd',"Light dimming:\"{$lampData['number']}\".Wireless module address:\"{$lampData['address']}\".Project name:\"{$lampData['projectname']}\".Lighteness:\"{$lightness}%\"",0,1);
                 $data = ['code'=>'0000','status'=>2,'msg'=>$this->response['0000'],'data'=>['number'=>$lampData['number'],'type'=>'dimming','id'=>$lamp_id]];
                 exit(send_websocket($clientid,$data));
             }else{

api/application/models/Lamp_model.php

@@ -899,7 +899,7 @@ class Lamp_model extends Base_model {
         }
 
         $this->db->join('project as P','P.id = L.projectid','left');
-        $this->db->join('network as N','N.id = L.networkid','left');
+        // $this->db->join('network as N','N.id = L.networkid','left');
 
         return $this->db->get($this->table.' as L')->row_array();
     }