异常数据采集 接入bug 修改

src/main/java/com/tidecloud/dataacceptance/service/impl/GK309GpsServerHandler.java

@@ -109,7 +109,7 @@ public class GK309GpsServerHandler extends HexBinaryAcceptanceHandlerAdapter {
                 byte[] bytes = byteMerger(getOriginalData(in, deviceId), DateUtil.formatDate2String(new Date()).getBytes());
                 sendMsg2Kafka(bytes, deviceId, channel);// 心跳数据对接
                 deviceMsgClient.acceptDeviceMsgParam("kangkaisi",
-                        deviceId,2,
+                        deviceId,1,
                         DatatypeConverter.printHexBinary(bytes), System.currentTimeMillis());
             } else if (LOCATION_MSG == msgType) {
                 logger.info("GPS 定位包");

src/main/java/com/tidecloud/dataacceptance/service/impl/JSTGPServerHandler.java

@@ -70,7 +70,7 @@ public class JSTGPServerHandler extends HexBinaryAcceptanceHandlerAdapter {
 			if (Constants.MSG_TERMINAL_LOCATION_INFO_UPLOAD == header.getMsgId() || Constants.JT808_BATTERY == header.getMsgId()) {
 				sendMsg2Kafka(byteMerger(dataByteArray, DateUtil.formatDate2String(new Date()).getBytes()), packageData.getDeviceId(), channel);
 			}
-			this.processPackageData(packageData);
+			this.processPackageData(packageData,dataByteArray);
 		} catch (Exception e) {
 			logger.error(e.getLocalizedMessage());
 		}
@@ -84,7 +84,7 @@ public class JSTGPServerHandler extends HexBinaryAcceptanceHandlerAdapter {
 		return byte_3;
 	}
 
-	private void processPackageData(PackageData packageData) {
+	private void processPackageData(PackageData packageData,byte[] dataByteArray) {
 		final MsgHeader header = packageData.getMsgHeader();
 
 		// 1. 终端心跳-消息体为空 ==> 平台通用应答
@@ -96,7 +96,7 @@ public class JSTGPServerHandler extends HexBinaryAcceptanceHandlerAdapter {
 				logger.info("<<<<<[终端心跳],phone={},flowid={}", header.getTerminalPhone(), header.getFlowId());
 				deviceMsgClient.acceptDeviceMsgParam("jinshatian",
 						packageData.getDeviceId(),
-						1, JSON.toJSONString(packageData, true), System.currentTimeMillis());
+						1, JSON.toJSONString(dataByteArray, true), System.currentTimeMillis());
 			} catch (Exception e) {
 				logger.error("<<<<<[终端心跳]处理错误,phone={},flowid={},err={}", header.getTerminalPhone(), header.getFlowId(),
 						e.getMessage());
@@ -148,7 +148,7 @@ public class JSTGPServerHandler extends HexBinaryAcceptanceHandlerAdapter {
 				logger.info("<<<<<[位置信息],phone={},flowid={}", header.getTerminalPhone(), header.getFlowId());
 				deviceMsgClient.acceptDeviceMsgParam("jinshatian",
 						packageData.getDeviceId(),
-						2, JSON.toJSONString(packageData, true), System.currentTimeMillis());
+						2, JSON.toJSONString(dataByteArray, true), System.currentTimeMillis());
 			} catch (Exception e) {
 				logger.error("<<<<<[位置信息]处理错误,phone={},flowid={},err={}", header.getTerminalPhone(), header.getFlowId(),
 						e.getMessage());