单台设备销售统计

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

@@ -6,6 +6,7 @@ import com.xy.dto.DeviceDataDayDto;
 import com.xy.dto.be.MercDto;
 import com.xy.service.DeviceDataDayService;
 import com.xy.service.be.MercService;
+import com.xy.utils.Emptys;
 import com.xy.utils.MercAuthUtils;
 import com.xy.utils.PageBean;
 import com.xy.utils.R;
@@ -38,10 +39,15 @@ public class MercMiniDeviceDataController {
     @ApiOperation("设备销售数据统计分页")
     public R<PageBean<DeviceDataDayDto.SumPageVo>> sumPage(@RequestBody @Valid DeviceDataDayDto.SumPageDto dto) {
         dto.setMercId(MercAuthUtils.getMercId());
-        if (CollUtil.isEmpty(getMercDeviceIds())) {
-            return R.ok(new PageBean<>());
+        if (Emptys.check(dto.getDeviceId())) {
+            dto.setMercDeviceIds(CollUtil.newArrayList(dto.getDeviceId()));
+        }else{
+            List<Long> mercDeviceIds = getMercDeviceIds();
+            if (CollUtil.isEmpty(mercDeviceIds)) {
+                return R.ok(new PageBean<>());
+            }
+            dto.setMercDeviceIds(mercDeviceIds);
         }
-        dto.setMercDeviceIds(getMercDeviceIds());
         return R.ok(deviceDataDayService.sumPage(dto).getData());
     }
 
@@ -49,11 +55,15 @@ public class MercMiniDeviceDataController {
     @ApiOperation("设备销售数据统计总计")
     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 DeviceDataDayDto.SumCountVo());
+        if (Emptys.check(dto.getDeviceId())) {
+            dto.setMercDeviceIds(CollUtil.newArrayList(dto.getDeviceId()));
+        }else{
+            List<Long> mercDeviceIds = getMercDeviceIds();
+            if (CollUtil.isEmpty(mercDeviceIds)) {
+                return R.ok(new DeviceDataDayDto.SumCountVo());
+            }
+            dto.setMercDeviceIds(mercDeviceIds);
         }
-        dto.setMercDeviceIds(mercDeviceIds);
         return R.ok(deviceDataDayService.sumCount(dto).getData());
     }