bug修复

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/dao/DayReportMapper.java

@@ -70,10 +70,10 @@ public interface DayReportMapper extends BaseMapper<DayReportEntity> {
     * 查询属性集合
     * @author Andy
     * @date 18:48 2021/8/17
-    * @param reportDto:
+    * @param reportVo:
     * @return java.util.List<ReportAttributeVo>
     **/
-    List<ReportAttributeVo> findAttributeList(@Param("report") ReportDto reportDto);
+    List<ReportAttributeVo> findAttributeList(@Param("report") ReportVo reportVo);
 
     /**
     * 查询集合

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/dao/MonthReportMapper.java

@@ -71,10 +71,10 @@ public interface MonthReportMapper extends BaseMapper<MonthReportEntity> {
     * findAttributeList
     * @author Andy
     * @date 9:17 2021/8/18
-    * @param reportDto:
+    * @param reportVo:
     * @return java.util.List<ReportAttributeVo>
     **/
-    List<ReportAttributeVo> findAttributeList(@Param("report") ReportDto reportDto);
+    List<ReportAttributeVo> findAttributeList(@Param("report") ReportVo reportVo);
 
     /**
     * findReport

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/dao/YearReportMapper.java

@@ -69,10 +69,10 @@ public interface YearReportMapper extends BaseMapper<YearReportEntity> {
     * 查询属性
     * @author Andy
     * @date 18:16 2021/8/17
-    * @param reportDto:
+    * @param reportVo:
     * @return java.util.List<ReportAttributeVo>
     **/
-    List<ReportAttributeVo> findAttributeList(@Param("report") ReportDto reportDto);
+    List<ReportAttributeVo> findAttributeList(@Param("report") ReportVo reportVo);
 
     /**
     * 查询集合

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/AbstractReportService.java

@@ -87,14 +87,12 @@ public abstract class AbstractReportService<M extends BaseMapper<T>, T> extends
             if (total == 0){
                 item.setReportTitle(reportTitleDtos);
             }
-            ReportDto dto = new ReportDto();
-            BeanCopyUtils.copyProperties(item,dto, ReportDto.class);
             // 固定参数项
-            calcUsage(dto, reportList);
+            calcUsage(item, reportList);
             Integer parentSceneId = item.getParentSceneId();
             item.setParentSceneId(null);
             //动态参数项
-            List<ReportAttributeVo> reportAttributeDtos = this.findAttributeList(dto);
+            List<ReportAttributeVo> reportAttributeDtos = this.findAttributeList(item);
             item.setParentSceneId(parentSceneId);
             Map<String, ReportAttributeVo> mapData = new LinkedHashMap<>();
             for (ReportAttributeVo itemData : reportAttributeDtos) {
@@ -464,12 +462,10 @@ public abstract class AbstractReportService<M extends BaseMapper<T>, T> extends
             item.setCollectDate(this.formatCollectDate(item));
             item.setDeviceIds(devices);
             item.setDataTitle(dataTitle);
-            ReportDto rDto = new ReportDto();
-            BeanCopyUtils.copyProperties(item, rDto, ReportDto.class);
             // 固定参数项
-            calcUsage(rDto, reportDtos);
+            calcUsage(item, reportDtos);
             // 动态参数项
-            List<ReportAttributeVo> vos = this.findAttributeList(rDto);
+            List<ReportAttributeVo> vos = this.findAttributeList(item);
             Map<String, ReportAttributeVo> mapData = new LinkedHashMap<>();
             for (ReportAttributeVo itemData : vos) {
                 if (!mapData.containsKey(itemData.getAttributeName())) {
@@ -491,7 +487,7 @@ public abstract class AbstractReportService<M extends BaseMapper<T>, T> extends
         }
     }
 
-    public void calcReportUsage(int index, List<ReportVo> reportDtos, ReportDto item){
+    public void calcReportUsage(int index, List<ReportVo> reportDtos, ReportVo item){
         String name = "水源水厂";
         Double power = reportDtos != null&&reportDtos.get(index) != null ? reportDtos.get(index).getPowerUsage() : 0;
         Double water = reportDtos != null&&reportDtos.get(index) != null ? reportDtos.get(index).getIntakeWaterUsage() : 0;
@@ -567,12 +563,13 @@ public abstract class AbstractReportService<M extends BaseMapper<T>, T> extends
     **/
     public Page<ReportVo> findPageReport(IPage<ReportDto> page, ReportQueryDto queryDto, boolean isPipe) {
         // 查询场景下的所有设备信息
-        List<DeviceVo> devices = null;
+        List<DeviceVo> devices;
         if (isPipe){
             devices = devicesToList(queryDto.getIds());
         } else {
             devices = findDevices(queryDto.getIds());
         }
+
         if (devices.size() == 0) {
             return new Page<>();
         }
@@ -633,14 +630,14 @@ public abstract class AbstractReportService<M extends BaseMapper<T>, T> extends
      * @param item
      * @param reportDtos
      */
-    abstract void calcUsage(ReportDto item, List<ReportVo> reportDtos);
+    abstract void calcUsage(ReportVo item, List<ReportVo> reportDtos);
 
     /**
      * 查询属性
      * @param item
      * @return
      */
-    abstract List<ReportAttributeVo> findAttributeList(ReportDto item);
+    abstract List<ReportAttributeVo> findAttributeList(ReportVo item);
 
     /**
     * 格式化日期

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/DayReportService.java

@@ -68,7 +68,7 @@ public class DayReportService extends AbstractReportService<DayReportMapper, Day
     }
 
     @Override
-    public void calcUsage(ReportDto item, List<ReportVo> reportDtos) {
+    public void calcUsage(ReportVo item, List<ReportVo> reportDtos) {
         if (item == null || reportDtos.size() == 0) {
             return;
         }
@@ -107,7 +107,7 @@ public class DayReportService extends AbstractReportService<DayReportMapper, Day
     }
 
     @Override
-    public List<ReportAttributeVo> findAttributeList(ReportDto item) {
+    public List<ReportAttributeVo> findAttributeList(ReportVo item) {
         return dayReportMapper.findAttributeList(item);
     }
 

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/MonthReportService.java

@@ -111,7 +111,7 @@ public class MonthReportService extends AbstractReportService<MonthReportMapper,
     }
 
     @Override
-    public void calcUsage(ReportDto item, List<ReportVo> reportDtos) {
+    public void calcUsage(ReportVo item, List<ReportVo> reportDtos) {
         if (item == null || reportDtos.size() == 0) {
             return;
         }
@@ -135,7 +135,7 @@ public class MonthReportService extends AbstractReportService<MonthReportMapper,
 
 
     @Override
-    public List<ReportAttributeVo> findAttributeList(ReportDto item) {
+    public List<ReportAttributeVo> findAttributeList(ReportVo item) {
         return monthReportMapper.findAttributeList(item);
     }
 

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/YearReportService.java

@@ -78,7 +78,7 @@ public class YearReportService extends AbstractReportService<YearReportMapper, Y
     }
 
     @Override
-    public void calcUsage(ReportDto item, List<ReportVo> reportDtos) {
+    public void calcUsage(ReportVo item, List<ReportVo> reportDtos) {
         if (item == null || reportDtos.size()==0 ) {
             return;
         }
@@ -101,7 +101,7 @@ public class YearReportService extends AbstractReportService<YearReportMapper, Y
     }
 
     @Override
-    public List<ReportAttributeVo> findAttributeList(ReportDto item) {
+    public List<ReportAttributeVo> findAttributeList(ReportVo item) {
         return yearReportMapper.findAttributeList(item);
     }