DMP下载文件数据加入时间

src/main/java/com/baiyee/adcallback/service/impl/DmpMonitorNumServiceImpl.java

@@ -2,8 +2,12 @@ package com.baiyee.adcallback.service.impl;
 
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.text.StrPool;
+import com.baiyee.adcallback.api.constants.SqlConstant;
 import com.baiyee.adcallback.api.dto.DmpMonitorJpaDto;
 import com.baiyee.adcallback.api.dto.DmpMonitorNumDto;
+import com.baiyee.adcallback.common.enums.DeliveryPlatformEnum;
+import com.baiyee.adcallback.common.enums.TableEnum;
 import com.baiyee.adcallback.service.DmpMonitorNumService;
 import lombok.RequiredArgsConstructor;
 import org.hibernate.query.internal.NativeQueryImpl;
@@ -44,34 +48,37 @@ public class DmpMonitorNumServiceImpl implements DmpMonitorNumService {
         HashMap<String, Object> map = new HashMap<>();
         for (String tag : dmpMonitorNumDto.getTags()) {
             List<DmpMonitorJpaDto> imel = getImeiNum(dmpMonitorNumDto.getStartTime(), dmpMonitorNumDto.getEndTime(), tag);
-            List<String> list = imel.stream().map(DmpMonitorJpaDto::getImei).collect(Collectors.toList());
-            map.put(tag, list);
+            map.put(tag, imel);
         }
         return map;
     }
 
     private List<DmpMonitorJpaDto> getImeiNum(Date startDate, Date endDate, String tag) {
         List<DmpMonitorJpaDto> imel = new ArrayList<>();
-        String tagName = tag.split("-").length > 0 ? tag.split("-")[0] : null;
-        if (tagName == null) {
-            return imel;
-        }
-        switch (tagName) {
-            case "jl":
-            case "juqian1":
-                imel = getImeiNumJpa("tb_jl_backdata", startDate, endDate, tag);
+
+        int value = tag.contains(StrPool.UNDERLINE) ? DeliveryPlatformEnum.getValue
+                (tag.substring(0, tag.indexOf(StrPool.DASHED))) : tag.equalsIgnoreCase(SqlConstant.TABLE_JU_QIAN) ? 1 : 999;
+
+        switch (value) {
+            case 1:
+                // 巨量
+                imel = getImeiNumJpa(TableEnum.JL.getTableName(), startDate, endDate, tag);
                 break;
-            case "bd":
-                imel = getImeiNumJpa("tb_bd_backdata", startDate, endDate, tag);
+            case 2:
+                // 快手
+                imel = getImeiNumJpa(TableEnum.KS.getTableName(), startDate, endDate, tag);
                 break;
-            case "ks":
-                imel = getImeiNumJpa("tb_ks_backdata", startDate, endDate, tag);
+            case 3:
+                // UC
+                imel = getImeiNumJpa(TableEnum.UC.getTableName(), startDate, endDate, tag);
                 break;
-            case "uc":
-                imel = getImeiNumJpa("tb_uc_backdata", startDate, endDate, tag);
+            case 4:
+                // VIVO
+                imel = getImeiNumJpa(TableEnum.VIVO.getTableName(), startDate, endDate, tag);
                 break;
-            case "vivo":
-                imel = getImeiNumJpa("tb_vivo_backdata", startDate, endDate, tag);
+            case 5:
+                //百度
+                imel = getImeiNumJpa(TableEnum.BD.getTableName(), startDate, endDate, tag);
                 break;
             default:
                 break;