luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复保存流量计实时数据累计流量整数位与小数位拼接错误问题

Browse Source
This commit is contained in:
蒾酒 2025-01-01 18:03:00 +08:00
parent 58c96a07df
commit 7c8ee46d1b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/timer/NGFlowDeviceDateTask.java
View File

@ -9,13 +9,14 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.fastbee.common.exception.ServiceException; import com.fastbee.common.exception.ServiceException;
import com.fastbee.common.utils.DateUtils; 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.DeviceReportInfo;;
import com.fastbee.iot.domain.NgFlowDeviceData; import com.fastbee.iot.domain.NgFlowDeviceData;
import com.fastbee.iot.mapper.DeviceReportInfoMapper; import com.fastbee.iot.mapper.DeviceReportInfoMapper;
import com.fastbee.iot.mapper.NgFlowDeviceDataMapper; import com.fastbee.iot.mapper.NgFlowDeviceDataMapper;
import com.fastbee.iot.service.INgFlowDeviceDataService; import com.fastbee.iot.service.INgFlowDeviceDataService;
import com.fastbee.iot.zhanlian.ZhanLianConfig;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
@ -92,9 +93,7 @@ public class NGFlowDeviceDateTask {
} }
public String getAuth(ZhanLianConfig zhanLianConfig){ public String getAuth(ZhanLianConfig zhanLianConfig){
String ak = zhanLianConfig.getAk();
String sk = zhanLianConfig.getSk();
String authId = zhanLianConfig.getAuthId();
String sign; String sign;
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
String message = "ak=" + ak + "&authId=" + authId + "&time=" + time; String message = "ak=" + ak + "&authId=" + authId + "&time=" + time;
@ -231,7 +230,8 @@ public class NGFlowDeviceDateTask {
//拼接累计流量整数部分加小数部分 //拼接累计流量整数部分加小数部分
String l = deviceRealTimeData.get("sumFlow_l"); String l = deviceRealTimeData.get("sumFlow_l");
String f = deviceRealTimeData.get("sumFlow_F"); 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")); ngFlowDeviceData.setInFlow(deviceRealTimeData.get("inFlow"));
//实时时间 //实时时间
@ -277,7 +277,7 @@ public class NGFlowDeviceDateTask {
public static void main(String[] args) { public static void main(String[] args) {
NGFlowDeviceDateTask ngFlowDeviceDateTask = new NGFlowDeviceDateTask(); NGFlowDeviceDateTask ngFlowDeviceDateTask = new NGFlowDeviceDateTask();
Map<String, String> deviceRealTimeData =ngFlowDeviceDateTask.getDeviceRealTimeData("3855"); Map<String, String> deviceRealTimeData =ngFlowDeviceDateTask.getDeviceRealTimeData("3834");
System.err.println(deviceRealTimeData); System.err.println(deviceRealTimeData);
} }