报表修改

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

@@ -11,6 +11,7 @@ import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @Data
 @ApiModel("统计报表日报月报年报")
@@ -43,6 +44,9 @@ public class ReportDto implements Serializable {
     @ApiModelProperty("设备数据")
     List<ReportAttributeDto> dataValues;
 
+    @ApiModelProperty("设备数据")
+    List<Map<String,Object>> dataMapValues;
+
     @ApiModelProperty(value = "统计时间")
     private String collectDate;
 }

sms_water/src/main/java/com/huaxu/service/DayReportService.java

@@ -21,10 +21,7 @@ import javax.annotation.Resource;
 
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.List;
-import java.util.Arrays;
+import java.util.*;
 
 /**
  * 日报Service接口
@@ -100,11 +97,11 @@ public class DayReportService extends ServiceImpl<DayReportMapper, DayReportEnti
             item.setDeviceIds(devices);
             //固定参数项
             int index = -1;
-            for (int i=0;i<reportDtos.size();i++) {
-                if(reportDtos.get(i).getHour().equals(item.getHour()))
+            for (int i = 0; i < reportDtos.size(); i++) {
+                if (reportDtos.get(i).getHour().equals(item.getHour()))
                     index = i;
             }
-            if(index!=-1) {
+            if (index != -1) {
                 if ((index + 2) <= reportDtos.size()) {
                     item.setYieldWaterUsage(reportDtos.get(index).getYieldWaterUsage() - reportDtos.get(index + 1).getYieldWaterUsage());
                     item.setIntakeWaterUsage(reportDtos.get(index).getIntakeWaterUsage() - reportDtos.get(index + 1).getIntakeWaterUsage());
@@ -120,6 +117,18 @@ public class DayReportService extends ServiceImpl<DayReportMapper, DayReportEnti
             //动态参数项
             List<ReportAttributeDto> reportAttributeDtos = dayReportMapper.findAttributeList(item);
             item.setDataValues(reportAttributeDtos);
+            List<Map<String, Object>> maps = new ArrayList<>();
+            for (int num = 0; num < reportAttributeDtos.size(); num++) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("attributeName", reportAttributeDtos.get(num).getAttributeName());
+                map.put("minValue" + num, reportAttributeDtos.get(num).getMinValue());
+                map.put("maxValue" + num, reportAttributeDtos.get(num).getMaxValue());
+                map.put("avgValue" + num, reportAttributeDtos.get(num).getAvgValue());
+                map.put("sumValue" + num, reportAttributeDtos.get(num).getSumValue());
+                map.put("latestValue" + num, reportAttributeDtos.get(num).getLatestValue());
+                maps.add(map);
+            }
+            item.setDataMapValues(maps);
         }
         return reportPage;
     }

sms_water/src/main/java/com/huaxu/service/MonthReportService.java

@@ -18,9 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * 日报Service接口
@@ -114,6 +112,18 @@ public class MonthReportService extends ServiceImpl<MonthReportMapper, MonthRepo
             //动态参数项
             List<ReportAttributeDto> reportAttributeDtos = monthReportMapper.findAttributeList(item);
             item.setDataValues(reportAttributeDtos);
+            List<Map<String, Object>> maps = new ArrayList<>();
+            for (int num = 0; num < reportAttributeDtos.size(); num++) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("attributeName", reportAttributeDtos.get(num).getAttributeName());
+                map.put("minValue" + num, reportAttributeDtos.get(num).getMinValue());
+                map.put("maxValue" + num, reportAttributeDtos.get(num).getMaxValue());
+                map.put("avgValue" + num, reportAttributeDtos.get(num).getAvgValue());
+                map.put("sumValue" + num, reportAttributeDtos.get(num).getSumValue());
+                map.put("latestValue" + num, reportAttributeDtos.get(num).getLatestValue());
+                maps.add(map);
+            }
+            item.setDataMapValues(maps);
         }
         return reportPage;
     }

sms_water/src/main/java/com/huaxu/service/YearReportService.java

@@ -20,9 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * 日报Service接口
@@ -113,6 +111,18 @@ public class YearReportService extends ServiceImpl<YearReportMapper, YearReportE
             //动态参数项
             List<ReportAttributeDto> reportAttributeDtos = yearReportMapper.findAttributeList(item);
             item.setDataValues(reportAttributeDtos);
+            List<Map<String, Object>> maps = new ArrayList<>();
+            for (int num = 0; num < reportAttributeDtos.size(); num++) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("attributeName", reportAttributeDtos.get(num).getAttributeName());
+                map.put("minValue" + num, reportAttributeDtos.get(num).getMinValue());
+                map.put("maxValue" + num, reportAttributeDtos.get(num).getMaxValue());
+                map.put("avgValue" + num, reportAttributeDtos.get(num).getAvgValue());
+                map.put("sumValue" + num, reportAttributeDtos.get(num).getSumValue());
+                map.put("latestValue" + num, reportAttributeDtos.get(num).getLatestValue());
+                maps.add(map);
+            }
+            item.setDataMapValues(maps);
         }
         return reportPage;
     }