From eba0a973f03126d085abe02bef5c912be4047420 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 10 十一月 2023 22:40:55 +0800
Subject: [PATCH] 优化粮情返回与请求绑定
---
src/main/java/com/fzzy/protocol/weightyh/MessageConsumer.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/protocol/weightyh/MessageConsumer.java b/src/main/java/com/fzzy/protocol/weightyh/MessageConsumer.java
index 354596c..3e4fd02 100644
--- a/src/main/java/com/fzzy/protocol/weightyh/MessageConsumer.java
+++ b/src/main/java/com/fzzy/protocol/weightyh/MessageConsumer.java
@@ -3,10 +3,9 @@
import com.fzzy.api.utils.BytesUtil;
import com.fzzy.api.utils.SpringUtil;
import com.fzzy.gateway.GatewayUtils;
-import com.fzzy.gateway.api.DeviceReportService;
import com.fzzy.gateway.api.GatewayRemoteManager;
+import com.fzzy.gateway.data.BaseReqData;
import com.fzzy.gateway.entity.GatewayDevice;
-import com.fzzy.gateway.hx2023.service.HxGatewaySyncWeightImpl1;
import com.ld.io.api.IoMsgConsumer;
import com.ld.io.api.IoSession;
import lombok.extern.slf4j.Slf4j;
@@ -24,7 +23,7 @@
private long timeTag = 0;
- private GatewayRemoteManager reportService;
+ private GatewayRemoteManager gatewayRemoteManager;
@Override
public void consume(IoSession session, byte[] bytes) {
@@ -48,7 +47,7 @@
timeTag = System.currentTimeMillis();
String temp = strMsg.substring(2, 4);
- String symbol = HexASCIIToConvert(temp);
+ //String symbol = HexASCIIToConvert(temp);
temp = strMsg.substring(4, 16);
String w = HexASCIIToConvert(temp);
temp = strMsg.substring(16, 18);
@@ -73,11 +72,18 @@
}
//鐩存帴璋冪敤瀹炵幇绫伙紝鏇村瀹炵幇绫诲崟鐙皟鐢�
- if (null == reportService) {
- reportService = SpringUtil.getBean(GatewayRemoteManager.class);
+ if (null == gatewayRemoteManager) {
+ gatewayRemoteManager = SpringUtil.getBean(GatewayRemoteManager.class);
}
- reportService.getDeviceReportService(device.getProvinceProtocol()).report2GatewayBySn(weigh, device);
+ //鏁版嵁灏佽鎺ㄩ��
+ BaseReqData reqData = new BaseReqData();
+ reqData.setDevice(device);
+ reqData.setDeviceId(device.getDeviceId());
+ reqData.setProductId(device.getProductId());
+ reqData.setDeviceName(device.getDeviceName());
+ reqData.setWeight(weigh);
+ gatewayRemoteManager.getDeviceReportService(device.getPushProtocol()).reportWeightData(reqData);
}
/**
--
Gitblit v1.9.3