From 7c8ee46d1b33e0c94424065345e3ff0eeb5dc537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=BE=E9=85=92?= Date: Wed, 1 Jan 2025 18:03:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=AD=98=E6=B5=81?= =?UTF-8?q?=E9=87=8F=E8=AE=A1=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=E7=B4=AF?= =?UTF-8?q?=E8=AE=A1=E6=B5=81=E9=87=8F=E6=95=B4=E6=95=B0=E4=BD=8D=E4=B8=8E?= =?UTF-8?q?=E5=B0=8F=E6=95=B0=E4=BD=8D=E6=8B=BC=E6=8E=A5=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fastbee/iot/timer/NGFlowDeviceDateTask.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/timer/NGFlowDeviceDateTask.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/timer/NGFlowDeviceDateTask.java index 17098e8..c65b5b4 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/timer/NGFlowDeviceDateTask.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/timer/NGFlowDeviceDateTask.java @@ -9,13 +9,14 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.fastbee.common.exception.ServiceException; import com.fastbee.common.utils.DateUtils; -import com.fastbee.deviceData.api.devlink.service.ZhanLianBaseService; -import com.fastbee.deviceData.api.devlink.service.ZhanLianConfig; + + import com.fastbee.iot.domain.DeviceReportInfo;; import com.fastbee.iot.domain.NgFlowDeviceData; import com.fastbee.iot.mapper.DeviceReportInfoMapper; import com.fastbee.iot.mapper.NgFlowDeviceDataMapper; import com.fastbee.iot.service.INgFlowDeviceDataService; +import com.fastbee.iot.zhanlian.ZhanLianConfig; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; @@ -92,9 +93,7 @@ public class NGFlowDeviceDateTask { } public String getAuth(ZhanLianConfig zhanLianConfig){ - String ak = zhanLianConfig.getAk(); - String sk = zhanLianConfig.getSk(); - String authId = zhanLianConfig.getAuthId(); + String sign; long time = System.currentTimeMillis(); String message = "ak=" + ak + "&authId=" + authId + "&time=" + time; @@ -231,7 +230,8 @@ public class NGFlowDeviceDateTask { //拼接累计流量整数部分加小数部分 String l = deviceRealTimeData.get("sumFlow_l"); String f = deviceRealTimeData.get("sumFlow_F"); - ngFlowDeviceData.setSumFlow(l+f); + double v = Double.parseDouble(l) + Double.parseDouble(f); + ngFlowDeviceData.setSumFlow(String.valueOf(v)); //瞬时流量 ngFlowDeviceData.setInFlow(deviceRealTimeData.get("inFlow")); //实时时间 @@ -277,7 +277,7 @@ public class NGFlowDeviceDateTask { public static void main(String[] args) { NGFlowDeviceDateTask ngFlowDeviceDateTask = new NGFlowDeviceDateTask(); - Map deviceRealTimeData =ngFlowDeviceDateTask.getDeviceRealTimeData("3855"); + Map deviceRealTimeData =ngFlowDeviceDateTask.getDeviceRealTimeData("3834"); System.err.println(deviceRealTimeData); }