XMPoleManager.git

			@@ -6,19 +6,27 @@
			import com.aliyuncs.exceptions.ClientException;
			import com.aliyuncs.iot.model.v20180120.*;
			import com.sandu.common.execption.BusinessException;
			import com.sandu.ximon.admin.dto.DeviceStatus;
			import com.sandu.ximon.admin.localMQTT.util.HexFrameUtils;
			import com.sandu.ximon.admin.localMQTT.util.MqttClientUtil;
			import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
			import com.sandu.ximon.admin.manager.iot.frame.inner.BaseResponseInnerFrame;
			import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
			import com.sandu.ximon.admin.manager.iot.rrpc.dto.InvokeParam;
			import com.sandu.ximon.admin.manager.iot.rrpc.dto.WrapResponseCommonFrame;
			import com.sandu.ximon.admin.manager.iot.rrpc.enums.DeviceStateEnum;
			import com.sandu.ximon.admin.manager.iot.rrpc.topic.IBaseTopic;
			import com.sandu.ximon.admin.manager.iot.rrpc.topic.ICustomizeTopic;
			import com.sandu.ximon.admin.manager.iot.rrpc.util.FrameUtils;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.BeanUtils;

			import java.util.ArrayList;
			import java.util.Base64;
			import java.util.List;
			import java.util.Map;

			import static com.sandu.ximon.admin.localMQTT.callback.StatusMqttCallBack.localMqttConnectStatusMap;

			/**
			* @author chenjiantian
			@@ -52,47 +60,53 @@

			@Override
			public CommonFrame sendRRPC(String deviceName, InvokeParam invokeParam) {
			InvokeThingServiceResponse.Data data = invokeThing(deviceName, invokeParam, false);
			if (data == null) {
			return null;
			}
			String result = data.getResult();
			result = result.replace("\\", "");
			Map map = JSON.parseObject(result, Map.class);
			result = (String) map.get("msg");
			return FrameUtils.transformMessageToFrame(result);
			// InvokeThingServiceResponse.Data data = invokeThing(deviceName, invokeParam, false);
			// if (data == null) {
			// return null;
			// }
			// String result = data.getResult();
			// result = result.replace("\\", "");
			// Map map = JSON.parseObject(result, Map.class);
			// result = (String) map.get("msg");
			String result = MqttClientUtil.sendMqttMsg(deviceName,invokeParam.getFrame());
			return HexFrameUtils.transformMessageToFrame(result);
			}

			@Override
			public CommonFrame sendRRPC(String deviceName, IRequestFrame iRequestFrame) {
			InvokeParam param = new InvokeParam();
			param.setOperate("1001");
			param.setFrame(iRequestFrame.getEncodeFrame());
			InvokeThingServiceResponse.Data data = invokeThing(deviceName, param, false);
			if (data == null) {
			return null;
			}
			String result = data.getResult();
			result = result.replace("\\", "");
			Map map = JSON.parseObject(result, Map.class);
			result = (String) map.get("msg");
			return FrameUtils.transformMessageToFrame(result);
			// InvokeParam param = new InvokeParam();
			// param.setOperate("1001");
			// param.setFrame(iRequestFrame.getEncodeFrame());
			// InvokeThingServiceResponse.Data data = invokeThing(deviceName, param, false);
			// if (data == null) {
			// return null;
			// }
			// String result = data.getResult();
			// result = result.replace("\\", "");
			// Map map = JSON.parseObject(result, Map.class);
			// result = (String) map.get("msg");
			String frame = FrameUtils.transformMessageToFrame(iRequestFrame.getEncodeFrame()).toString();
			String result = MqttClientUtil.sendMqttMsg(deviceName,frame);
			log.info("自定义sendRRPC:请求帧：{},\n,响应帧:{}",iRequestFrame.toString(),result);
			return HexFrameUtils.transformMessageToFrame(result);
			}

			@Override
			public CommonFrame sendRRPC(String deviceName, IRequestFrame iRequestFrame, boolean resendFlag) {
			InvokeParam param = new InvokeParam();
			param.setOperate("1001");
			param.setFrame(iRequestFrame.getEncodeFrame());
			InvokeThingServiceResponse.Data data = invokeThing(deviceName, param, true);
			if (data == null) {
			return null;
			}
			String result = data.getResult();
			result = result.replace("\\", "");
			Map map = JSON.parseObject(result, Map.class);
			result = (String) map.get("msg");
			return FrameUtils.transformMessageToFrame(result);
			// InvokeParam param = new InvokeParam();
			// param.setOperate("1001");
			// param.setFrame(iRequestFrame.getEncodeFrame());
			// InvokeThingServiceResponse.Data data = invokeThing(deviceName, param, true);
			// if (data == null) {
			// return null;
			// }
			// String result = data.getResult();
			// result = result.replace("\\", "");
			// Map map = JSON.parseObject(result, Map.class);
			// result = (String) map.get("msg");
			String frame = FrameUtils.transformMessageToFrame(iRequestFrame.getEncodeFrame()).toString();
			String result = MqttClientUtil.sendMqttMsg(deviceName,frame);
			return HexFrameUtils.transformMessageToFrame(result);
			}


			@@ -175,14 +189,23 @@

			@Override
			public List<BatchGetDeviceStateResponse.DeviceStatus> batchGetDeviceState(List<String> deviceNames) {
			BatchGetDeviceStateRequest request = new BatchGetDeviceStateRequest();
			request.setDeviceNames(deviceNames);
			request.setProductKey(getProductKey());
			BatchGetDeviceStateResponse response = invokeSync(request);
			if (response != null && response.getSuccess()) {
			return response.getDeviceStatusList();
			}
			return null;
			List<BatchGetDeviceStateResponse.DeviceStatus> statusList = new ArrayList<>();

			deviceNames.forEach(l -> {
			BatchGetDeviceStateResponse.DeviceStatus deviceStatus = new BatchGetDeviceStateResponse.DeviceStatus();
			deviceStatus.setDeviceName(l);

			if (localMqttConnectStatusMap.get(l)!=null &&
			localMqttConnectStatusMap.get(l)== 0){
			deviceStatus.setStatus("OFFLINE");
			}else {
			deviceStatus.setStatus("ONLINE");
			}
			statusList.add(deviceStatus);
			});


			return statusList;
			}

			/**