DESKTOP-9JTA2JJ\HP 5 years ago
parent
commit
e1ccc59544

+ 4 - 2
api/application/controllers/Lampcontrol.php

@@ -895,9 +895,11 @@ class Lampcontrol extends Base_Controller {
                 $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);
-                exit(json_result('0000',$this->response['0000'],['number'=>$lampData['number'],'type'=>'dimming','id'=>$lamp_id]));
+                $data = ['code'=>'0000','status'=>2,'msg'=>$this->response['0000'],'data'=>['number'=>$lampData['number'],'type'=>'dimming','id'=>$lamp_id]];
+                exit(send_websocket($clientid,$data));
             }else{
-                exit(json_result('0010',$this->response['0010'],['number'=>$lampData['number'],'type'=>'dimming','id'=>$lamp_id]));
+                $data = ['code'=>'0010','status'=>2,'msg'=>$this->response['0010'],'data'=>['number'=>$lampData['number'],'type'=>'dimming','id'=>$lamp_id]];
+                exit(send_websocket($clientid,$data));
             }
         }
 

+ 1 - 1
api/application/helpers/function_helper.php

@@ -647,7 +647,7 @@ function send_websocket($clientid,$data = array(),$resType='cmd')
 {
     if (!empty($clientid)) {
         $CI =& get_instance();
-        $CI->db->insert('message',['client'=>$clientid,'msg'=>json_encode($data),'type'=>'cmd']);
+        $CI->db->insert('message',['client'=>$clientid,'msg'=>json_encode($data)]);
     }
     
 }