设备销售排行更改为data服务接口

device-api-service-merc-mini/pom.xml

@@ -35,5 +35,11 @@
             <version>1.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.xy</groupId>
+            <artifactId>data-api</artifactId>
+            <version>1.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceDataController.java

@@ -2,9 +2,9 @@ package com.xy.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import com.xy.annotate.RestMappingController;
-import com.xy.dto.DeviceDataDto;
+import com.xy.dto.DeviceDataDayDto;
 import com.xy.dto.be.MercDto;
-import com.xy.service.DeviceDataServiceImpl;
+import com.xy.service.DeviceDataDayService;
 import com.xy.service.be.MercService;
 import com.xy.utils.MercAuthUtils;
 import com.xy.utils.PageBean;
@@ -31,30 +31,30 @@ import java.util.List;
 @Api(tags = "小程序-设备销售数据统计")
 public class MercMiniDeviceDataController {
 
-    private final DeviceDataServiceImpl deviceDataService;
+    private final DeviceDataDayService deviceDataDayService;
     private final MercService mercService;
 
     @PostMapping("sumPage")
     @ApiOperation("设备销售数据统计分页")
-    public R<PageBean<DeviceDataDto.SumPageVo>> sumPage(@RequestBody @Valid DeviceDataDto.SumPageDto dto) {
+    public R<PageBean<DeviceDataDayDto.SumPageVo>> sumPage(@RequestBody @Valid DeviceDataDayDto.SumPageDto dto) {
         dto.setMercId(MercAuthUtils.getMercId());
         if (CollUtil.isEmpty(getMercDeviceIds())) {
             return R.ok(new PageBean<>());
         }
         dto.setMercDeviceIds(getMercDeviceIds());
-        return R.ok(deviceDataService.sumPage(dto).getData());
+        return R.ok(deviceDataDayService.sumPage(dto).getData());
     }
 
     @PostMapping("sumCount")
     @ApiOperation("设备销售数据统计总计")
-    public R<DeviceDataDto.SumCountVo> sumCount(@RequestBody @Valid DeviceDataDto.SumCountDto dto) {
+    public R<DeviceDataDayDto.SumCountVo> sumCount(@RequestBody @Valid DeviceDataDayDto.SumCountDto dto) {
         dto.setMercId(MercAuthUtils.getMercId());
         List<Long> mercDeviceIds = getMercDeviceIds();
         if (CollUtil.isEmpty(mercDeviceIds)) {
-            return R.ok(new DeviceDataDto.SumCountVo());
+            return R.ok(new DeviceDataDayDto.SumCountVo());
         }
         dto.setMercDeviceIds(mercDeviceIds);
-        return R.ok(deviceDataService.sumCount(dto).getData());
+        return R.ok(deviceDataDayService.sumCount(dto).getData());
     }
 
     /**