From caf2599a9869244ded811018811c37a2aabac3fc Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 08 一月 2025 11:29:05 +0800
Subject: [PATCH] 优化测温协议
---
src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java
index c72c82a..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
@@ -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;
@@ -157,7 +158,7 @@
}
- // deviceReportService.pushGrainData2Cloud(pushData);
+ // deviceReportService.reportGrainDataByHand(pushData);
}
@@ -381,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());
--
Gitblit v1.9.3