增加类型查询

device-api-service/src/main/java/com/xy/mapper/DeviceDataMapper.java

@@ -21,5 +21,6 @@ public interface DeviceDataMapper extends BaseMapper<DeviceData> {
     List<DeviceDataDto.DayChartVo> dayChart(@Param("mercId") Long mercId
             , @Param("beginDateInt") String beginDateInt
             , @Param("endDateInt") String endDateInt
+            , @Param("type") String type
     );
 }

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

@@ -300,8 +300,8 @@ public class DeviceDataServiceImpl extends ServiceImpl<DeviceDataMapper, DeviceD
 
     @ApiOperation("图表数据")
     @Override
-    public R<List<DeviceDataDto.DayChartVo>> dayChart(@RequestBody DeviceDataDto.DayChartDto dto) {
-        List<DeviceDataDto.DayChartVo> dayChartVos = baseMapper.dayChart(dto.getMercId(), dto.getBeginInt(), dto.getEndDateInt());
+    public R<List<DeviceDataDto.DayChartVo>> dayChart(@RequestBody @Valid DeviceDataDto.DayChartDto dto) {
+        List<DeviceDataDto.DayChartVo> dayChartVos = baseMapper.dayChart(dto.getMercId(), dto.getBeginInt(), dto.getEndDateInt(),dto.getType());
         Map<Integer, DeviceDataDto.DayChartVo> voMap = dayChartVos.stream().collect(Collectors.toMap(DeviceDataDto.DayChartVo::getTime, i -> i));
         List<String> dayList = DataTime.getBetweenDates(dto.getBeginDate().toString(), dto.getEndDate().toString(), true);
         List<Integer> dayList2 = dayList.stream().map(i -> Integer.valueOf(StrUtil.replace(i, "-", ""))).collect(Collectors.toList());

device-api-service/src/main/resources/mapper/DeviceDataMapper.xml

@@ -4,7 +4,7 @@
     <select id="dayChart" resultType="com.xy.dto.DeviceDataDto$DayChartVo">
         SELECT date_value as time, sum(sales_count) num, sum(sales_money) total_money
         FROM device_data
-        WHERE type = 'day'
+        WHERE type = #{type}
           and merc_id = #{mercId}
           and date_value BETWEEN #{beginDateInt} and #{endDateInt}
         GROUP BY date_value

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

@@ -30,6 +30,10 @@ public class DeviceDataDto {
         @ApiModelProperty(value = "商户ID")
         private Long mercId;
 
+        @ApiModelProperty(value = "统计类型（day,month,year）",required = true)
+        @NotNull(message = "统计类型不能为空")
+        private String type;
+
         @NotNull(message = "开始时间不能为空")
         @ApiModelProperty(value = "开始时间",required = true)
         @JsonFormat(pattern = "yyyy-MM-dd")