From e5e40869b53a0e8c9c4e86d3f488dceb08b3b845 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 31 十月 2023 12:18:11 +0800
Subject: [PATCH] 四川省网关接口相关11
---
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
index 32656b2..1135ee6 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -117,7 +117,7 @@
* gatewayDeviceService#ajaxTestGrain
* 绮儏鎺ㄩ�佹祴璇�
*
- * @param param
+ * @param parameter
* @return
*/
@Expose
@@ -133,18 +133,17 @@
Date dayTime = (Date) parameter.get("dayTime");
if (null == dayTime) dayTime = new Date();
- QueryParam param = new QueryParam();
- param.setDayTime(dayTime);
- param.setStart(DateUtil.getCurZero(dayTime));
- param.setEnd(DateUtil.getNextZero(dayTime));
+
+ Date start = DateUtil.getCurZero(dayTime);
+ Date end = DateUtil.getNextZero(dayTime);
//濡傛灉閮ㄧ讲FZZY-IGDS-V40鐗堟湰绯荤粺
- return this.pushByV40(list, param);
+ return this.pushByV40(list, start,end);
}
- private String pushByV40(List<GatewayDevice> list, QueryParam param) {
+ private String pushByV40(List<GatewayDevice> list, Date start,Date end) {
String depotIdSys;
List<Fz40Grain> listGrain;
@@ -162,7 +161,7 @@
continue;
}
- listGrain = fzzy40CommonService.listGrain(depotIdSys, param.getStart(), param.getEnd());
+ listGrain = fzzy40CommonService.listGrain(depotIdSys, start, end);
if (null == listGrain || listGrain.isEmpty()) {
log.info("---------璁惧---{}--鏈悓姝ュ埌绮儏淇℃伅锛岃纭褰撳墠鏉′欢涓嬫槸鍚︽湁鏁版嵁",device.getDeviceName());
@@ -198,7 +197,7 @@
GrainData result = new GrainData();
result.setMessageId(ScConstant.getMessageId());
- result.setDeviceId(device.getDeviceId());
+ result.setDeviceID(device.getDeviceId());
result.setAvgTemperature(lastData.getTempAve() + "");
result.setMinTemperature(lastData.getTempMin() + "");
result.setMaxTemperature(lastData.getTempMax() + "");
@@ -252,7 +251,6 @@
result.setMinX(cableNum + "");
result.setMinZ(curTemp);
}
-
details.add(new GrainDataDetail(cableNum, layerNumber, position, curTemp));
--
Gitblit v1.9.3