From 6a9cf62f7ca4b45c48a571c63fd484c186070a0e Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 19 一月 2024 23:53:12 +0800
Subject: [PATCH] 增加油罐仓的解析2
---
src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java
index 2bf419b..7cd3ec7 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java
@@ -73,7 +73,7 @@
return "ERROR锛氬綋鍓嶈澶囨病鏈夐厤缃竷绾胯鍒欙紝鏃犳硶鎵ц";
}
- BaseResp resp = gatewayRemoteManager.getSyncGrainService(data.getSyncProtocol()).syncGrain2(reqData);
+ BaseResp resp = gatewayRemoteManager.getSyncGrainService(data.getSyncProtocol()).syncGrain(reqData);
//鑷姩鎺ㄩ��
if (200 == resp.getCode() && reqData.isAutoReplay()) {
@@ -153,11 +153,11 @@
if (null == deviceReportService) {
- deviceReportService = gatewayRemoteManager.getDeviceReportService(device.getProvinceProtocol());
+ deviceReportService = gatewayRemoteManager.getDeviceReportService(device.getPushProtocol());
}
- deviceReportService.pushGrainData2Cloud(pushData);
+ // deviceReportService.pushGrainData2Cloud(pushData);
}
@@ -290,7 +290,6 @@
@Expose
public String ajaxTestWeight(Map<String,Object> data) throws Exception {
double weigh = (double) data.get("weight");
- double deviceId = (double) data.get("deviceId");
List<GatewayDevice> devices = listAll();
@@ -382,7 +381,7 @@
lpr.setCarNumber(carNumber);
JSONObject jsonObject = new JSONObject();
jsonObject.put("carNumber", carNumber);
- jsonObject.put("position", "big");
+ jsonObject.put("position", device.getPosition());
packet.setProperties(jsonObject);
packet.setTimestamp(System.currentTimeMillis());
@@ -401,5 +400,23 @@
log.info("-----------test-------------------");
return "SUCCESS";
}
+
+
+ /**
+ *
+ * gatewayDeviceTestPR#testIde
+ * 娴嬭瘯涓嬭鍒嗘満
+ * @param data
+ * @return
+ */
+ @Expose
+ public String testIde(Map<String,Object> data) throws Exception {
+ String deviceId = (String) data.get("deviceId");
+ String bizType = (String) data.get("bizType");
+
+ log.info("-----------涓嬭鍒嗘満璋冭瘯-璁惧={},浜嬩欢={}",deviceId,bizType);
+
+ return "SUCCESS";
+ }
}
--
Gitblit v1.9.3