~czt/igds-api.git

			@@ -3,14 +3,15 @@
			import com.alibaba.fastjson2.JSONObject;
			import com.fzzy.gateway.GatewayUtils;
			import com.fzzy.gateway.api.GatewayRemoteManager;
			import com.fzzy.gateway.hx2023.data.CloudSendData;
			import com.fzzy.gateway.data.BaseResp;
			import com.fzzy.gateway.entity.GatewayDevice;
			import com.fzzy.gateway.hx2023.ScConstant;
			import com.fzzy.gateway.data.BaseResp;
			import com.fzzy.gateway.hx2023.data.CloudSendData;
			import com.fzzy.gateway.hx2023.data.SyncReqData;
			import com.fzzy.mqtt.MqttGatewayService;
			import com.fzzy.mqtt.MqttProviderConfig;
			import com.fzzy.mqtt.MqttPublishService;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Component;

			import javax.annotation.Resource;
			@@ -25,7 +26,7 @@
			@Resource
			private GatewayRemoteManager gatewayRemoteManager;
			@Resource
			private MqttProviderConfig providerClient;
			private MqttGatewayService mqttGatewayService;


			/**
			@@ -33,7 +34,7 @@
			*
			* @param message
			*/
			public void onReceiveMessage(String message) {
			public void onReceiveMessage(String topic,String message) {

			try {
			CloudSendData cloudSendData = JSONObject.parseObject(message, CloudSendData.class);
			@@ -47,7 +48,7 @@
			}

			} catch (Exception e) {

			log.error("--------执行异常-----{}",e);
			}

			}
			@@ -70,13 +71,15 @@

			//自动推送
			if (200 == resp.getCode() && syncReqData.isAutoReplay()) {
			String topic = "/${productId}/${deviceId}/properties/report";
			String topic = ScConstant.TOPIC_REPORT;

			topic = topic.replace("${productId}", device.getProductId()).replace("${deviceId}", device.getDeviceId());

			providerClient.publish(topic, resp.getData());
			mqttGatewayService.publishMqttWithTopic(resp.getData(), topic);

			log.info("=======粮情推送==========={}", resp.getData());
			log.info("----------------------------推送MQTT信息---------------------------");
			log.info("-----TOPIC-----{}",topic);
			log.info("-----Message-----{}",resp.getData());
			}
			}
			}