fix bug

api/application/controllers/Lampcontrol.php

@@ -489,7 +489,7 @@ class Lampcontrol extends Base_Controller {
             $sendData = $address.'0300004646';
 
             if ($lampData['protocoltype'] == 4) {
-                $res = lampMqttCmd('/lamp/TransIn/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
+                $res = lampMqttCmd('/IDCOL/CmdInput/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
             }else{
                 // $cmd .= crc16(pack('H*',$sendData));
                 device_cmd($lampData['deviceid'],pack('H*',$sendData));
@@ -662,11 +662,11 @@ class Lampcontrol extends Base_Controller {
             
         }elseif ($lampData['lampprotocoltype'] == 1) {
             $sendData = '0103000a0002e409';
-            $res = lampMqttCmd('/lamp/TransIn/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
+            $res = lampMqttCmd('/IDCOL/CmdInput/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
             if (!empty($res) && strtolower(crc16(pack('H*',mb_substr($res['msg'], 0,-4)))) == strtolower(mb_substr($res['msg'], -4))) {
                 $sysInfoStr = $res['msg'];
                 $sendData = '010300fd003115ee';
-                $res = lampMqttCmd('/lamp/TransIn/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
+                $res = lampMqttCmd('/IDCOL/CmdInput/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
                 if (!empty($res) && strtolower(crc16(pack('H*',mb_substr($res['msg'], 0,-4)))) == strtolower(mb_substr($res['msg'], -4))) {
                     $data = array();
                     $msg = $res['msg'];
@@ -867,7 +867,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],'L.number,L.address');
+        $lampData = $this->Lamp_model->get_one(['id'=>$lamp_id],'number,address');
 
         $seq = get_seq();
 
@@ -878,7 +878,7 @@ class Lampcontrol extends Base_Controller {
 
         $sendData .= crc16(pack('H*',$sendData));
 
-        $res = lampMqttCmd('/lamp/TransIn/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
+        $res = lampMqttCmd('/IDCOL/CmdInput/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
         if (empty($res)) {
             $data = ['code'=>'0016','status'=>2,'msg'=>$this->response['0016'],'data'=>['number'=>$lampData['number'],'type'=>'dimming','id'=>$lamp_id]];
             exit(send_websocket($clientid,$data));
@@ -1125,7 +1125,7 @@ class Lampcontrol extends Base_Controller {
             $sendData = $address.$sendData;
             
             if ($lampProData['protocoltype'] == 4) {
-                $res = lampMqttCmd('/lamp/TransIn/'.$lampProData['address'],'/lamp/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
+                $res = lampMqttCmd('/IDCOL/CmdInput/'.$lampProData['address'],'/lamp/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
             }else{
                 device_cmd($lampProData['deviceid'],pack('H*',$sendData));
                 $cmd = '{"type":"cmd","deviceId":"'.$lampProData['address'].'"}';
@@ -1406,7 +1406,7 @@ class Lampcontrol extends Base_Controller {
         if ($lampProData['protocoltype'] == 4 && $lampProData['lampprotocoltype'] == 1) {
             $sendData = '0103e08d0027a23b';
             
-            $res = lampMqttCmd('/lamp/TransIn/'.$lampProData['address'],'/lamp/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
+            $res = lampMqttCmd('/IDCOL/CmdInput/'.$lampProData['address'],'/lamp/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
             if (empty($res)) {
                 return array('result'=>1,'msg'=>'0016');
             }else{
@@ -1456,7 +1456,7 @@ class Lampcontrol extends Base_Controller {
                     $len = doubBitSubStr(base_convert(intval(mb_strlen($sendData)/4), 10, 16)).bitSubStr(base_convert(intval(mb_strlen($sendData)/2), 10, 16));
                     $sendData = '0110e08d'.$len.$sendData;
                     $sendData .= crc16(pack('H*',$sendData));
-                    $res = lampMqttCmd('/lamp/TransIn/'.$lampProData['address'],'/lamp/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
+                    $res = lampMqttCmd('/IDCOL/CmdInput/'.$lampProData['address'],'/lamp/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
                     if (empty($res)) {
                         return array('result'=>1,'msg'=>'0016');
                     }else{
@@ -1839,7 +1839,7 @@ class Lampcontrol extends Base_Controller {
             $sendData = $address.$sendData;
             
             if ($lampProData['protocoltype'] == 4) {
-                $res = lampMqttCmd('/lamp/TransIn/'.$lampProData['address'],'/lamp/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
+                $res = lampMqttCmd('/IDCOL/CmdInput/'.$lampProData['address'],'/lamp/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
             }else{
                 device_cmd($lampProData['deviceid'],pack('H*',$sendData));
                 $cmd = '{"type":"cmd","deviceId":"'.$lampProData['address'].'"}';
@@ -2046,7 +2046,7 @@ class Lampcontrol extends Base_Controller {
         if ($lampProData['protocoltype'] == 4 && $lampProData['lampprotocoltype'] == 1) {
             $sendData = '0103e0020020d212';
             
-            $res = lampMqttCmd('/lamp/TransIn/'.$lampProData['address'],'/lamp/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
+            $res = lampMqttCmd('/IDCOL/CmdInput/'.$lampProData['address'],'/lamp/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
             if (empty($res)) {
                 return array('result'=>1,'msg'=>'0016');
             }else{
@@ -2139,7 +2139,7 @@ class Lampcontrol extends Base_Controller {
                     $len = doubBitSubStr(base_convert(intval(mb_strlen($sendData)/4), 10, 16)).bitSubStr(base_convert(intval(mb_strlen($sendData)/2), 10, 16));
                     $sendData = '0110e002'.$len.$sendData;
                     $sendData .= crc16(pack('H*',$sendData));
-                    $res = lampMqttCmd('/lamp/TransIn/'.$lampProData['address'],'/lamp/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
+                    $res = lampMqttCmd('/IDCOL/CmdInput/'.$lampProData['address'],'/lamp/TransOut/'.$lampProData['address'],pack('H*','0001'.$sendData));
                     if (empty($res)) {
                         return array('result'=>1,'msg'=>'0016');
                     }else{
@@ -2535,7 +2535,7 @@ class Lampcontrol extends Base_Controller {
             $sendData = $address.'0304001014';
             
             if ($lampData['protocoltype'] == 4) {
-                $res = lampMqttCmd('/lamp/TransIn/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
+                $res = lampMqttCmd('/IDCOL/CmdInput/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
             }else{
                 device_cmd($lampData['deviceid'],pack('H*',$sendData));
                 $cmd = '{"type":"cmd","deviceId":"'.$lampData['address'].'"}';
@@ -2650,7 +2650,7 @@ class Lampcontrol extends Base_Controller {
         if ($lampData['protocoltype'] == 4 && $lampData['lampprotocoltype'] == 1) {
             $sendData = '0103e08d0027a23b';
             
-            $res = lampMqttCmd('/lamp/TransIn/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
+            $res = lampMqttCmd('/IDCOL/CmdInput/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
             if (empty($res)) {
                 exit(json_result('0016', $this->response['0016']));
             }else{
@@ -2922,7 +2922,7 @@ class Lampcontrol extends Base_Controller {
             $sendData = $address.'030328204b';
             
             if ($lampData['protocoltype'] == 4) {
-                $res = lampMqttCmd('/lamp/TransIn/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
+                $res = lampMqttCmd('/IDCOL/CmdInput/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
             }else{
                 device_cmd($lampData['deviceid'],pack('H*',$sendData));
                 $cmd = '{"type":"cmd","deviceId":"'.$lampData['address'].'"}';
@@ -3064,7 +3064,7 @@ class Lampcontrol extends Base_Controller {
         if ($lampData['protocoltype'] == 4 && $lampData['lampprotocoltype'] == 1) {
             $sendData = '0103e0020020d212';
             
-            $res = lampMqttCmd('/lamp/TransIn/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
+            $res = lampMqttCmd('/IDCOL/CmdInput/'.$lampData['address'],'/lamp/TransOut/'.$lampData['address'],pack('H*','0001'.$sendData));
             if (empty($res)) {
                 exit(json_result('0016', $this->response['0016']));
             }else{
@@ -3504,12 +3504,10 @@ class Lampcontrol extends Base_Controller {
             $join = [
                 // ['table'=>'history_info_log as HI','cond'=>'HI.lampid = RI.lampid and HI.updatetime = RI.updatetime','type'=>'inner'],
             ];
-            $where = ['HI.lampid'=>$lamp_id,'HI.updatetime >='=>$beginDate,'HI.updatetime <='=>$endDate];
-            $total = $this->RealtimeInfoLog_model->get_list_by_multi_join($where,'count(*) as total',NULL, NULL, $join, NULL, NUll, 'RI', true);
-            $total = $total['total'];
-
-            $fields = 'RI.batvoltage as battvoltage,RI.updatetime,RI.DayOverDisChgTimes as overtimes';
-            $res = $this->RealtimeInfoLog_model->get_list_by_join($where, $fields,$count, ($page-1)*$count, $join, 'RI.updatetime desc,RI.id desc', NUll, 'RI');
+            $where = ['lampid'=>$lamp_id,'updatetime >='=>$beginDate,'updatetime <='=>$endDate];
+            $total = $this->RealtimeInfoLog_model->get_count($where,'count(*) as total');
+            $fields = 'batvoltage as battvoltage,updatetime,DayOverDisChgTimes as overtimes';
+            $res = $this->RealtimeInfoLog_model->get_list($where, $fields,$count, ($page-1)*$count, 'updatetime desc,id desc');
         }else{
             $total = $this->Lamp_model->getCountForInfoLog($lamp_id, $table,$beginDate,$endDate);
             $res = $this->Lamp_model->getListForInfoLog($lamp_id, $table, ($page-1)*$count, $count,$beginDate,$endDate);

api/application/controllers/Project.php

@@ -334,7 +334,7 @@ class Project extends Base_Controller {
                     $sendData = $address.$sendData;
                     
                     if ($value['protocoltype'] == 4) {
-                        $res = lampMqttCmd('/lamp/TransIn/'.$value['address'],'/lamp/TransOut/'.$value['address'],pack('H*','0001'.$sendData),0);
+                        $res = lampMqttCmd('/IDCOL/CmdInput/'.$value['address'],'/lamp/TransOut/'.$value['address'],pack('H*','0001'.$sendData),0);
                     }else{
                         device_cmd($value['deviceid'],pack('H*',$sendData));
                     }