From 6495040bbda5308c86e852ad1b080097bfa916a9 Mon Sep 17 00:00:00 2001 From: vince <757871790@qq.com> Date: 星期三, 09 七月 2025 09:22:17 +0800 Subject: [PATCH] 优化粮温检测 --- src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceTestPR.java index 7cd3ec7..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); } -- Gitblit v1.9.3