From 390f7a3aedd617b952fd940bfad6991820dfef36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com> Date: Thu, 10 Oct 2024 10:34:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=AA=E9=98=B3=E8=83=BD=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zc/business/controller/DcDeviceController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java index 4746e7fe..44db9039 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java @@ -342,7 +342,7 @@ public class DcDeviceController extends BaseController { parameter.put("deviceType","15"); parameter.put("endStakeMark",endStakeMark); parameter.put("startStakeMark",startStakeMark); - parameter.put("deviceState","1"); + // parameter.put("deviceState","1"); // StakeMarkUtils.stakeMarkToInt() //facilitiesType @@ -402,7 +402,7 @@ public class DcDeviceController extends BaseController { parameter.put("deviceType","15"); parameter.put("endStakeMark",endStakeMark); parameter.put("startStakeMark",startStakeMark); - parameter.put("deviceState","1"); + // parameter.put("deviceState","1"); // 创建一个映射来存储按小时汇总的数据 Map allDevicesHourlyAggregates = new TreeMap<>(); @@ -468,12 +468,11 @@ public class DcDeviceController extends BaseController { parameters.put("deviceType", "15"); parameters.put("endStakeMark", endStakeMark); parameters.put("startStakeMark", startStakeMark); - parameters.put("deviceState", "1"); + // parameters.put("deviceState", "1"); // List propertyIds = Arrays.asList("visibility", "wetSlipperyCoefficient", "waterFilmIceSnowValue"); - List propertyIds = Arrays.asList( -"cumulativeElectricityConsumptionInTheYear", //当年累计用电量 + List propertyIds = Arrays.asList("cumulativeElectricityConsumptionInTheYear", //当年累计用电量 "cumulativeElectricityConsumptionOnTheDay",//当日累计用电量 "theAccumulatedChargeOfTheYear",//当年累计充电量 "dailyAccumulatedCharge"//当日累计充电量 @@ -557,7 +556,8 @@ public class DcDeviceController extends BaseController { if (element.isJsonObject()) { JsonObject item = element.getAsJsonObject(); if (item.has("property") && item.has("formatValue")) { - if (item.get("property").getAsString().equals("visibility")){//dischargeEquipmentStatus + //todo 判断属性是否为 dischargeEquipmentStatus + if (item.get("property").getAsString().equals("dischargeEquipmentStatus")){//dischargeEquipmentStatus if (item.get("formatValue").getAsString().equals("故障")){ i++; }