~czt/igds-api.git

			@@ -6,9 +6,11 @@
			import com.fzzy.gateway.api.DeviceReportService;
			import com.fzzy.gateway.entity.GatewayDevice;
			import com.fzzy.gateway.hx2023.ScConstant;
			import com.fzzy.gateway.hx2023.data.KafaGrainData;
			import com.fzzy.gateway.hx2023.data.WebSocketPacket;
			import com.fzzy.gateway.hx2023.data.WebSocketPacketHeader;
			import com.fzzy.gateway.hx2023.data.WeightInfo;
			import com.fzzy.gateway.hx2023.kafka.KafkaDeviceReport;
			import com.fzzy.gateway.hx2023.websocket.WebSocketDeviceReport;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.stereotype.Component;
			@@ -22,6 +24,8 @@

			@Resource
			private WebSocketDeviceReport webSocketDeviceReport;
			@Resource
			private KafkaDeviceReport kafkaDeviceReport;

			@Override
			public String getProvinceProtocol() {
			@@ -44,6 +48,8 @@
			//productId的值在webSocket执行发送方法中补充
			WebSocketPacketHeader header = new WebSocketPacketHeader();
			header.setDeviceName(device.getDeviceName());
			header.setProductId("hx-weigh-big-01");
			//header.set
			packet.setHeaders(header);
			packet.setMessageType(ScConstant.MESSAGE_TYPE_REPORT_PROPERTY);
			packet.setDeviceId(device.getDeviceId());
			@@ -53,7 +59,7 @@
			weightInfo.setGrossWeight(weigh);
			weightInfo.setNetWeight(weigh);
			weightInfo.setNetWeight(weigh);

			weightInfo.setWeightUnit("KG");
			JSONObject jsonObject = new JSONObject();
			jsonObject.put("weightInfo", JSONObject.toJSONString(weightInfo));

			@@ -71,4 +77,10 @@

			return null;
			}

			@Override
			public String pushGrainData2Cloud(KafaGrainData data) {

			return kafkaDeviceReport.sendGrainData2Cloud(data);
			}
			}