Merge branch 'master' of http://114.135.61.188:53000/UIMS/Code

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

@@ -60,7 +60,7 @@ public class DeviceTypeController {
     @ApiOperation(value = "批量同步设备类型")
     public AjaxMessage<Integer> batchAdd() {
         int result = 0;
-        DeviceTypeDto deviceTypeDto = restTemplate.getForObject("http://114.135.61.188:48322/unit/profiles/list", DeviceTypeDto.class);
+        DeviceTypeDto deviceTypeDto = restTemplate.getForObject(requestUrl, DeviceTypeDto.class);
         //判断是否存在，不存在则进行添加
         for (DeviceTypeEntity item : deviceTypeDto.getData()) {
             if (deviceTypeService.findListByName(item).size() == 0) {

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

@@ -176,16 +176,18 @@ public class DayReportService extends ServiceImpl<DayReportMapper, DayReportEnti
             deviceDto.setId(id);
             devices.add(deviceDto);
         }
-        //根据设备ID查询报表测点信息
-        DayReportEntity dayReportEntity = new DayReportEntity();
-        dayReportEntity.setYear(year);
-        dayReportEntity.setMonth(month);
-        dayReportEntity.setDay(day);
-        dayReportEntity.setTenantId(currentUser.getTenantId());
-        dayReportEntity.setType(type);
-        dayReportEntity.setDeviceIds(devices);
-        //查询到分页的行数
-        reportPage = dayReportMapper.findDevicePressPage(page, dayReportEntity);
+        if (devices.size() > 0) {
+            //根据设备ID查询报表测点信息
+            DayReportEntity dayReportEntity = new DayReportEntity();
+            dayReportEntity.setYear(year);
+            dayReportEntity.setMonth(month);
+            dayReportEntity.setDay(day);
+            dayReportEntity.setTenantId(currentUser.getTenantId());
+            dayReportEntity.setType(type);
+            dayReportEntity.setDeviceIds(devices);
+            //查询到分页的行数
+            reportPage = dayReportMapper.findDevicePressPage(page, dayReportEntity);
+        }
         return reportPage;
     }
 
@@ -199,15 +201,17 @@ public class DayReportService extends ServiceImpl<DayReportMapper, DayReportEnti
             deviceDto.setId(id);
             devices.add(deviceDto);
         }
-        //根据设备ID查询报表测点信息
-        DayReportEntity dayReportEntity = new DayReportEntity();
-        dayReportEntity.setYear(year);
-        dayReportEntity.setMonth(month);
-        dayReportEntity.setDay(day);
-        dayReportEntity.setTenantId(currentUser.getTenantId());
-        dayReportEntity.setDeviceIds(devices);
-        //查询到分页的行数
-        reportPage = dayReportMapper.findDeviceWaterPage(page, dayReportEntity);
+        if (devices.size() > 0) {
+            //根据设备ID查询报表测点信息
+            DayReportEntity dayReportEntity = new DayReportEntity();
+            dayReportEntity.setYear(year);
+            dayReportEntity.setMonth(month);
+            dayReportEntity.setDay(day);
+            dayReportEntity.setTenantId(currentUser.getTenantId());
+            dayReportEntity.setDeviceIds(devices);
+            //查询到分页的行数
+            reportPage = dayReportMapper.findDeviceWaterPage(page, dayReportEntity);
+        }
         return reportPage;
     }
     List<DayReportEntity> findDeviceLastDayValue(DayReportEntity dayReportEntity) {

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

@@ -170,15 +170,17 @@ public class MonthReportService extends ServiceImpl<MonthReportMapper, MonthRepo
             deviceDto.setId(id);
             devices.add(deviceDto);
         }
-        //根据设备ID查询报表测点信息
-        MonthReportEntity monthReportEntity = new MonthReportEntity();
-        monthReportEntity.setYear(year);
-        monthReportEntity.setMonth(month);
-        monthReportEntity.setTenantId(currentUser.getTenantId());
-        monthReportEntity.setType(type);
-        monthReportEntity.setDeviceIds(devices);
-        //查询到分页的行数
-        reportPage = monthReportMapper.findDevicePressPage(page, monthReportEntity);
+        if (devices.size() > 0) {
+            //根据设备ID查询报表测点信息
+            MonthReportEntity monthReportEntity = new MonthReportEntity();
+            monthReportEntity.setYear(year);
+            monthReportEntity.setMonth(month);
+            monthReportEntity.setTenantId(currentUser.getTenantId());
+            monthReportEntity.setType(type);
+            monthReportEntity.setDeviceIds(devices);
+            //查询到分页的行数
+            reportPage = monthReportMapper.findDevicePressPage(page, monthReportEntity);
+        }
         return reportPage;
     }
 
@@ -192,14 +194,16 @@ public class MonthReportService extends ServiceImpl<MonthReportMapper, MonthRepo
             deviceDto.setId(id);
             devices.add(deviceDto);
         }
-        //根据设备ID查询报表测点信息
-        MonthReportEntity monthReportEntity = new MonthReportEntity();
-        monthReportEntity.setYear(year);
-        monthReportEntity.setMonth(month);
-        monthReportEntity.setTenantId(currentUser.getTenantId());
-        monthReportEntity.setDeviceIds(devices);
-        //查询到分页的行数
-        reportPage = monthReportMapper.findDeviceWaterPage(page, monthReportEntity);
+        if (devices.size() > 0) {
+            //根据设备ID查询报表测点信息
+            MonthReportEntity monthReportEntity = new MonthReportEntity();
+            monthReportEntity.setYear(year);
+            monthReportEntity.setMonth(month);
+            monthReportEntity.setTenantId(currentUser.getTenantId());
+            monthReportEntity.setDeviceIds(devices);
+            //查询到分页的行数
+            reportPage = monthReportMapper.findDeviceWaterPage(page, monthReportEntity);
+        }
         return reportPage;
     }
    public List<MonthReportEntity> findAmountBySceneIds(MonthReportEntity monthReportEntity) {

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

@@ -171,14 +171,16 @@ public class YearReportService extends ServiceImpl<YearReportMapper, YearReportE
             deviceDto.setId(id);
             devices.add(deviceDto);
         }
-        //根据设备ID查询报表测点信息
-        YearReportEntity yearReportEntity = new YearReportEntity();
-        yearReportEntity.setYear(year);
-        yearReportEntity.setTenantId(currentUser.getTenantId());
-        yearReportEntity.setType(type);
-        yearReportEntity.setDeviceIds(devices);
-        //查询到分页的行数
-        reportPage = yearReportMapper.findDevicePressPage(page, yearReportEntity);
+        if (devices.size() > 0) {
+            //根据设备ID查询报表测点信息
+            YearReportEntity yearReportEntity = new YearReportEntity();
+            yearReportEntity.setYear(year);
+            yearReportEntity.setTenantId(currentUser.getTenantId());
+            yearReportEntity.setType(type);
+            yearReportEntity.setDeviceIds(devices);
+            //查询到分页的行数
+            reportPage = yearReportMapper.findDevicePressPage(page, yearReportEntity);
+        }
         return reportPage;
     }
 
@@ -192,13 +194,15 @@ public class YearReportService extends ServiceImpl<YearReportMapper, YearReportE
             deviceDto.setId(id);
             devices.add(deviceDto);
         }
-        //根据设备ID查询报表测点信息
-        YearReportEntity yearReportEntity = new YearReportEntity();
-        yearReportEntity.setYear(year);
-        yearReportEntity.setTenantId(currentUser.getTenantId());
-        yearReportEntity.setDeviceIds(devices);
-        //查询到分页的行数
-        reportPage = yearReportMapper.findDeviceWaterPage(page, yearReportEntity);
+        if (devices.size() > 0) {
+            //根据设备ID查询报表测点信息
+            YearReportEntity yearReportEntity = new YearReportEntity();
+            yearReportEntity.setYear(year);
+            yearReportEntity.setTenantId(currentUser.getTenantId());
+            yearReportEntity.setDeviceIds(devices);
+            //查询到分页的行数
+            reportPage = yearReportMapper.findDeviceWaterPage(page, yearReportEntity);
+        }
         return reportPage;
     }
    public List<YearReportEntity> findAmountTotalBySceneIds(YearReportEntity yearReportEntity) {