太阳能统计

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<String, Double> 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<String> propertyIds = Arrays.asList("visibility", "wetSlipperyCoefficient", "waterFilmIceSnowValue");
 
-        List<String> propertyIds = Arrays.asList(
+        List<String> propertyIds = Arrays.asList("cumulativeElectricityConsumptionInTheYear", //当年累计用电量
-"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++;
                                 }