Merge remote-tracking branch 'origin/master'

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/YfQxzDeviceImpl.java

@@ -18,7 +18,6 @@ import com.yunfeiyun.agmp.iot.common.service.IotAddressService;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iots.core.manager.MqttManager;
 import com.yunfeiyun.agmp.iots.device.common.DeviceAbstractImpl;
-import com.yunfeiyun.agmp.iots.device.domain.bzy.YfBzyTakephotoMsg;
 import com.yunfeiyun.agmp.iots.device.domain.yfqxz.YfQxzConfigMsg;
 import com.yunfeiyun.agmp.iots.device.domain.yfqxz.YfQxzLedMsg;
 import com.yunfeiyun.agmp.iots.device.domain.yfqxz.YfQxzMsg;
@@ -111,7 +110,7 @@ public class YfQxzDeviceImpl extends DeviceAbstractImpl implements IYfQxzDevice
                 if(!TextUtils.isEmpty(jobjParams.getString("content"))){
                     YfQxzLedMsg ledMsg = new YfQxzLedMsg();
                     ledMsg.setExt(cmdDistribution.getJsons());
-                    mqttMsgContent = JSON.toJSON(new YfBzyTakephotoMsg()).toString();
+                    mqttMsgContent = JSON.toJSON(ledMsg).toString();
                     log.info(TAG+"发送指令【led】 mqttMsgContent={}", mqttMsgContent);
                 }else{
                     YfQxzConfigMsg configMsg = new YfQxzConfigMsg();
@@ -125,7 +124,7 @@ public class YfQxzDeviceImpl extends DeviceAbstractImpl implements IYfQxzDevice
             case CmdDef.YfQxzCmdDef.CMD_LED:
                 YfQxzLedMsg ledMsg = new YfQxzLedMsg();
                 ledMsg.setExt(cmdDistribution.getJsons());
-                mqttMsgContent = JSON.toJSON(new YfBzyTakephotoMsg()).toString();
+                mqttMsgContent = JSON.toJSON(ledMsg).toString();
                 log.info(TAG+"发送指令【led】 mqttMsgContent={}", mqttMsgContent);
                 break;
             case CmdDef.YfQxzCmdDef.CMD_REFRESH:{

src/main/java/com/yunfeiyun/agmp/iots/device/serviceImp/YfScdDeviceImpl.java

@@ -102,6 +102,12 @@ public class YfScdDeviceImpl extends DeviceAbstractImpl implements IYfScdDevice
                 log.info("【杀虫灯】发送指令【refresh】 mqttMsgContent={}", mqttMsgContent);
                 break;
             }
+            case CmdDef.YfScdCmdDef.CMD_COMMON:{
+                JSONObject jobjParam = cmdDistribution.getJsons();
+                mqttMsgContent = JSONUtils.toJSONString(jobjParam);
+                log.info("【杀虫灯】发送指令【report】 mqttMsgContent={}", mqttMsgContent);
+                break;
+            }
         }
 
         if(StringUtils.isNotEmpty(mqttMsgContent)){