修改拓客统计和外显号问题

manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/api/ExtensionNumberController.java

@@ -24,7 +24,7 @@ public class ExtensionNumberController {
 
     @PostMapping("/add/extension")
     @ApiOperation("导入分机号和外显号")
-    public CommonResponse<String> addNumbers(@RequestParam(value = "file") MultipartFile file,
+    public CommonResponse<String> addNumbers(@RequestParam(value = "file",required = false) MultipartFile file,
                                              @RequestParam("display") Long display,
                                              @RequestParam("dyDisplay") Long dyDisplay,
                                              @RequestParam("deliveryDisplay") Long deliveryDisplay,

services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ReportTokerServiceImpl.java

@@ -50,14 +50,8 @@ public class ReportTokerServiceImpl implements ReportTokerService {
             throw new BadRequestException("请选择任务");
         }
         List<ReportToker> reportTokers = reportTokerRepository.queryAllByTimeAndTaskId(beginTime, endTime, reportTokerDTO.getTaskId(), reportTokerDTO.getMemberId());
-
-        long between = DateUtil.between(DateUtil.parseDate(endTime), DateUtil.parseDate(DateUtil.today()), DateUnit.DAY);
-        //TODO 需要实时查询当天的统计
-        if (between == DefaultNumberConstants.ZERO_NUMBER) {
-            List<ReportToker> tokers = reportSync.dealData(beginTime, endTime);
-            reportTokers.addAll(tokers);
-        }
-
+        List<ReportToker> todayData = getTodayData(reportTokerDTO.getEndTime());
+        reportTokers.addAll(todayData);
         return dealReportData(beginTime, endTime, reportTokerDTO.getTaskId(), reportTokerDTO.getMemberId(), reportTokers);
     }
 
@@ -68,6 +62,8 @@ public class ReportTokerServiceImpl implements ReportTokerService {
             throw new BadRequestException("请选择任务");
         }
         List<ReportToker> reportTokers = reportTokerRepository.queryAllByTimeAndTaskId(reportTokerDTO.getBeginTime(), reportTokerDTO.getEndTime(), reportTokerDTO.getTaskId(), null);
+        List<ReportToker> todayData = getTodayData(reportTokerDTO.getEndTime());
+        reportTokers.addAll(todayData);
         List<UploadTokerDTO> list = new ArrayList<>();
         for (ReportToker reportToker : reportTokers) {
             UploadTokerDTO uploadTokerDTO = new UploadTokerDTO();
@@ -94,6 +90,21 @@ public class ReportTokerServiceImpl implements ReportTokerService {
         }
     }
 
+    /**
+     * 实时处理当天的数据
+     *
+     * @param endTime
+     * @return
+     */
+    private List<ReportToker> getTodayData(String endTime) {
+        long between = DateUtil.between(DateUtil.parseDate(endTime), DateUtil.parseDate(DateUtil.today()), DateUnit.DAY);
+        //TODO 需要实时查询当天的统计
+        if (between == DefaultNumberConstants.ZERO_NUMBER) {
+            return reportSync.dealData(DateUtil.beginOfDay(DateUtil.date()).toString(), DateUtil.endOfDay(DateUtil.date()).toString());
+        }
+        return new ArrayList<>();
+    }
+
     /**
      * 只查任务的
      *
@@ -174,6 +185,8 @@ public class ReportTokerServiceImpl implements ReportTokerService {
         }
         List<HashMap<String, Object>> list = new ArrayList<>();
         List<ReportToker> tokers = reportTokerRepository.queryAllByTimeAndTaskIds(reportTokerDTO.getBeginTime(), reportTokerDTO.getEndTime(), reportTokerDTO.getTaskIds());
+        List<ReportToker> todayData = getTodayData(reportTokerDTO.getEndTime());
+        tokers.addAll(todayData);
         Map<Long, List<ReportToker>> tokerByTaskId = tokers.stream().collect(Collectors.groupingBy(ReportToker::getTaskId, Collectors.toList()));
         HashMap<String, Object> map = new HashMap<>();
         for (Long taskId : tokerByTaskId.keySet()) {