修改统计量

sms_water/src/main/java/com/huaxu/controller/MonitorInfoController.java

@@ -73,6 +73,7 @@ public class MonitorInfoController {
             sceneDeviceAttributeDto.setYear(dateTime.getYear());
             sceneDeviceAttributeDto.setMonth(dateTime.getMonthValue());
             sceneDeviceAttributeDto.setDay(dateTime.getDayOfMonth());
+            sceneDeviceAttributeDto.setSceneId(id);
             List<SceneDeviceAttributeDto> sceneDeviceAttributeDtos = monitorInfoService.findAttributeList(sceneDeviceAttributeDto);
             //取缓存里的数据
             byte[] bytes = redisUtil.get(("sms_water_" + item.getDeviceCode()).getBytes());
@@ -85,7 +86,7 @@ public class MonitorInfoController {
                 //将缓存中的实时数据放到map中方便进行遍历
                 for (MonitorDataValueEntity dateValue : monitorDataEntity.getDataValues()) {
                     map.put(dateValue.getAttributeId(), dateValue);
-                    System.out.println("dateValue.getAttributeId()" + dateValue.getAttributeId() + " " + dateValue);
+                    System.out.println("dateValue.getAttributeId()" + dateValue.getAttributeId() + " " + dateValue.getDataValue());
                 }
                 for (SceneDeviceAttributeDto itemAttribute : sceneDeviceAttributeDtos) {
                     System.out.println("itemAttribute.getAttributeId()" + itemAttribute.getAttributeId());
@@ -96,8 +97,11 @@ public class MonitorInfoController {
                     }
                     if (map.get(itemAttribute.getAttributeId()).getDataValue() != null && itemAttribute.getLatestValue() != null) {
                         attributeDiffValue = map.get(itemAttribute.getAttributeId()).getDataValue() - itemAttribute.getLatestValue();
+                        System.out.println(" map.get(itemAttribute.getAttributeId()).getDataValue()" +  map.get(itemAttribute.getAttributeId()).getDataValue());
+                        System.out.println("itemAttribute.getAttributeId(2)" + itemAttribute.getLatestValue());
                     } else if (map.get(itemAttribute.getAttributeId()).getDataValue() != null && itemAttribute.getLatestValue() == null) {
                         attributeDiffValue =  map.get(itemAttribute.getAttributeId()).getDataValue();
+                        System.out.println("itemAttribute.getAttributeId(2)" + attributeDiffValue);
                     }
 
                     switch (itemAttribute.getAttributeType()) {
@@ -115,6 +119,7 @@ public class MonitorInfoController {
                             break;
                     }
                 }
+                System.out.println("sceneUsageDto.intakeWaterUsage:"+sceneUsageDto.getIntakeWaterUsage());
                 if(sceneUsageDto.getYieldWaterUsage()==null)
                     sceneUsageDto.setYieldWaterUsage(sceneUsageDto.getYieldWaterUsage());
                 if(sceneUsageDto.getIntakeWaterUsage()==null)

sms_water/src/main/java/com/huaxu/dto/SceneDeviceAttributeDto.java

@@ -8,6 +8,10 @@ import lombok.Data;
 @Data
 @ApiModel(value = "设备属性信息")
 public class SceneDeviceAttributeDto {
+    /** 设备信息 */
+    @ApiModelProperty(value = "一级场景")
+    private Long sceneId;
+
     /** 设备信息 */
     @ApiModelProperty(value = "设备信息")
     private Long deviceId;

sms_water/src/main/resources/mapper/MonitorInfoMapper.xml

@@ -95,7 +95,7 @@
         </where>
     </select>
     <select id="findAttributeList" resultType="com.huaxu.dto.SceneDeviceAttributeDto">
-       SELECT IFNULL(a.REMARK,b.`NAME`) AS "attributeName",a.ATTRIBUTE_ID as "attributeId",
+       SELECT  IFNULL(a.REMARK,b.`NAME`) AS "attributeName",a.ATTRIBUTE_ID as "attributeId",
         c.min_value as "minValue" ,c.max_value as "maxValue" ,c.avg_value as "avgValue" ,
         c.sum_value as "sumValue" ,c.latest_value as "latestValue",
         a.PARM_TYPE as "attributeType"
@@ -113,6 +113,7 @@
         GROUP BY b.PARM_TYPE) as tab on a.PARM_TYPE=tab.PARM_TYPE and c.collect_date=tab.collect_date
         where
         a.DEVICE_ID = #{report.deviceId}
+        <if test="report.sceneId != null ">and a.PARENT_SCENE_ID = #{report.sceneId}</if>
         <if test="report.year != null ">and c.`YEAR`=#{report.year}</if>
         <if test="report.month != null ">and c.`MONTH`=#{report.month}</if>
         <if test="report.day != null ">and c.`DAY`=#{report.day}</if>