Merge branch 'master' into test

device-api-service/src/main/java/com/xy/service/DeviceDataServiceImpl.java

@@ -333,7 +333,8 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
         PageBean pageBean = pageByMercAndDate.getPage();
         LambdaQueryWrapper<DeviceData> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(pageByMercAndDate, DeviceData.class)
                 .in(DeviceData::getDeviceId)
-                .in(DeviceData::getDateValue)
+                .ge(DeviceData::getDateValue, pageByMercAndDate.getBeginDateValue())
+                .le(DeviceData::getDateValue, pageByMercAndDate.getEndDateValue())
                 .build()
                 .orderByDesc(DeviceData::getCreateTime);
         IPage<DeviceData> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
@@ -345,7 +346,8 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
     public R<Long> pageByMercAndDateCount(DeviceDataDto.PageByMercAndDate pageByMercAndDate) {
         LambdaQueryWrapper<DeviceData> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(pageByMercAndDate, DeviceData.class)
                 .in(DeviceData::getDeviceId)
-                .in(DeviceData::getDateValue)
+                .ge(DeviceData::getDateValue, pageByMercAndDate.getBeginDateValue())
+                .le(DeviceData::getDateValue, pageByMercAndDate.getEndDateValue())
                 .build()
                 .orderByDesc(DeviceData::getCreateTime);
         long count = count(lambdaQueryWrapper);

device-api/src/main/java/com/xy/dto/DeviceDataDto.java

@@ -376,9 +376,13 @@ public class DeviceDataDto {
         @ApiModelProperty(value = "统计类型;year|month|day")
         private String type;
 
-        @NotEmpty(message = "mercId不能为空")
-        @ApiModelProperty(value = "日期")
-        private List<String> dateValue;
+        @NotBlank(message = "beginDateValue不能为空")
+        @ApiModelProperty(value = "统计开始日期")
+        private Integer beginDateValue;
+
+        @NotBlank(message = "beginDateValue不能为空")
+        @ApiModelProperty(value = "统计结束日期")
+        private Integer endDateValue;
 
         @ApiModelProperty(value = "设备ID")
         private List<Long> deviceId;