From 083eb4417a04201f1eb755faab8ee7121b3c7f16 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 17 十一月 2023 16:19:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/protocol/weightyh/MessageConsumer.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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..b41d6c9 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) {
@@ -36,7 +35,7 @@
*/
public void analysisInfo(String ip, Integer port, byte[] bytes) {
String strMsg = BytesUtil.bytesToString(bytes);
- //log.debug("寮�濮嬭В鏋愬湴纾呰繑鍥炰俊鎭�=" + strMsg);
+
if (strMsg.length() < 22) {
return;
}
@@ -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);
@@ -57,12 +56,11 @@
//鏈�缁堥噸閲忕粨鏋�
double weigh = Double.valueOf(w) / d;
-
+ log.debug("WEIGHT-MESSAGE=" + strMsg);
log.debug("----------鍦扮绉伴噸鏁板�艰В鏋�------{}", weigh);
//褰撳墠鍦扮鍗忚涓嶆敮鎸佷紶閫扴N锛屼娇鐢ㄥ眬鍩熺綉IP浣滀负SN
String sn = ip;
-
//鏍规嵁淇℃伅鑾峰彇璁惧
GatewayDevice device = GatewayUtils.getCacheByDeviceSn(sn);
@@ -73,11 +71,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