From b3f34374327db922013714e006485f31ebb2989e Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Sat, 18 May 2024 18:48:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=90=A8=E8=BE=BE=E6=8E=A5=E5=8F=A3=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhgd/xmgl/task/ElectricalTask.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/task/ElectricalTask.java b/src/main/java/com/zhgd/xmgl/task/ElectricalTask.java index f6c9b327b..857fb0fad 100644 --- a/src/main/java/com/zhgd/xmgl/task/ElectricalTask.java +++ b/src/main/java/com/zhgd/xmgl/task/ElectricalTask.java @@ -93,7 +93,7 @@ public class ElectricalTask { /** * 获取电箱情况 每5分钟触发任务 */ - @Scheduled(cron = "0 30 * * * ?") + @Scheduled(cron = "0 0/1 * * * ?") @RequestMapping("/xmgl/task/getElectricData") public void getElectricData() { log.info("获取设备数据 每1分钟触发任务"); @@ -140,11 +140,16 @@ public class ElectricalTask { log.info("电箱实时数据" + execute.body()); JSONObject result = JSONObject.parseObject(execute.body()).getJSONObject("result"); JSONObject metric = result.getJSONObject("metric"); - String temperatures = result.getJSONArray("temperatures").getJSONObject(0).getString("temperature"); - ElectricalData electricalData = new ElectricalData(devId, metric.getString("modified"), metric.getString("voltage_a"), - metric.getString("voltage_b"), - metric.getString("voltage_c"), metric.getString("current_a"), metric.getString("current_b"), metric.getString("current_c"), - result.getJSONArray("leakages").getJSONObject(0).getString("leakage"), + String temperatures = String.format("%.1f", Double.parseDouble(result.getJSONArray("temperatures").getJSONObject(0).getString("temperature"))); + ElectricalData electricalData = new ElectricalData(devId, + metric.getString("modified"), + String.format("%.1f", Double.parseDouble(metric.getString("voltage_a"))), + String.format("%.1f", Double.parseDouble(metric.getString("voltage_b"))), + String.format("%.1f", Double.parseDouble(metric.getString("voltage_c"))), + String.format("%.1f", Double.parseDouble(metric.getString("current_a"))), + String.format("%.1f", Double.parseDouble(metric.getString("current_b"))), + String.format("%.1f", Double.parseDouble(metric.getString("current_c"))), + String.format("%.1f", Double.parseDouble(result.getJSONArray("leakages").getJSONObject(0).getString("leakage"))), temperatures, temperatures, temperatures, temperatures); electricalDataService.saveElectricalData(electricalData);