From facc0ea3fa37091a98aa1e0a0d1081fd32fba28e Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期六, 27 一月 2024 11:38:29 +0800
Subject: [PATCH] 优化协议
---
src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 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..d6cbee4 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java
@@ -1,9 +1,10 @@
package com.fzzy.gateway.service;
-import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson.JSONObject;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.data.GatewayDeviceType;
import com.fzzy.api.utils.DateUtil;
+import com.fzzy.async.fzzy40.Fzzy40CommonService;
import com.fzzy.async.fzzy40.entity.Fz40Grain;
import com.fzzy.gateway.api.GatewayDeviceReportService;
import com.fzzy.gateway.api.GatewayRemoteManager;
@@ -35,8 +36,8 @@
@Resource
private GatewayDeviceRep gatewayDeviceRep;
-// @Resource
-// private Fzzy40CommonService fzzy40CommonService;
+ @Resource
+ private Fzzy40CommonService fzzy40CommonService;
@Resource
private GatewayRemoteManager gatewayRemoteManager;
// @Resource
@@ -73,7 +74,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()) {
@@ -119,7 +120,7 @@
}
- private String pushByV40(List<GatewayDevice> list, Date start, Date end) {
+ public String pushByV40(List<GatewayDevice> list, Date start, Date end) {
String depotIdSys;
List<Fz40Grain> listGrain;
@@ -138,8 +139,8 @@
}
//TODO ----銆�
- // listGrain = fzzy40CommonService.listGrain(depotIdSys, start, end);
- listGrain = null;
+ listGrain = fzzy40CommonService.listGrain(depotIdSys, start, end);
+ //listGrain = null;
if (null == listGrain || listGrain.isEmpty()) {
log.info("---------璁惧---{}--鏈悓姝ュ埌绮儏淇℃伅锛岃纭褰撳墠鏉′欢涓嬫槸鍚︽湁鏁版嵁", device.getDeviceName());
continue;
@@ -153,11 +154,11 @@
if (null == deviceReportService) {
- deviceReportService = gatewayRemoteManager.getDeviceReportService(device.getProvinceProtocol());
+ deviceReportService = gatewayRemoteManager.getDeviceReportService(device.getPushProtocol());
}
- deviceReportService.pushGrainData2Cloud(pushData);
+ // deviceReportService.reportGrainDataByHand(pushData);
}
@@ -290,7 +291,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 +382,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 +401,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