From 2576e39da150b6ad7d860807a79e8e4ff45d78a5 Mon Sep 17 00:00:00 2001 From: wjt Date: Fri, 10 Nov 2023 10:42:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=A3=9E=E9=B1=BC=E7=BA=BF?= =?UTF-8?q?=E7=B4=A2=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/OceanEngineResponseDTO.java | 23 +++++++ .../impl/OceanEngineClueServiceImpl.java | 66 ++++++++----------- 2 files changed, 50 insertions(+), 39 deletions(-) create mode 100644 admin/src/main/java/com/baiye/modules/distribute/dto/OceanEngineResponseDTO.java diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/OceanEngineResponseDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/OceanEngineResponseDTO.java new file mode 100644 index 0000000..84fdff4 --- /dev/null +++ b/admin/src/main/java/com/baiye/modules/distribute/dto/OceanEngineResponseDTO.java @@ -0,0 +1,23 @@ +package com.baiye.modules.distribute.dto; + +import cn.hutool.core.text.CharSequenceUtil; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +/** + * @author wjt + * @date 2023/11/10 + */ +@Data +public class OceanEngineResponseDTO { + private Object data; + + @JsonProperty("code") + private Integer code; + + @JsonProperty("message") + private String message; + + @JsonProperty("request_id") + private String requestId = CharSequenceUtil.EMPTY; +} diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/OceanEngineClueServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/OceanEngineClueServiceImpl.java index 9aea748..f48e789 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/OceanEngineClueServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/OceanEngineClueServiceImpl.java @@ -1,8 +1,6 @@ package com.baiye.modules.distribute.service.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.text.StrPool; import cn.hutool.core.util.URLUtil; import cn.hutool.http.HttpRequest; @@ -12,6 +10,7 @@ import cn.hutool.json.JSONUtil; import com.baiye.constant.DefaultNumberConstants; import com.baiye.constant.UrlConstant; import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl; +import com.baiye.modules.distribute.dto.OceanEngineResponseDTO; import com.baiye.modules.distribute.entity.DirectClueEntity; import com.baiye.modules.distribute.entity.OceanEngineSourceEntity; import com.baiye.modules.distribute.entity.OceanEngineToken; @@ -19,14 +18,10 @@ import com.baiye.modules.distribute.mapper.OceanEngineSourceMapper; import com.baiye.modules.distribute.service.DirectClueService; import com.baiye.modules.distribute.service.OceanEngineClueService; import com.baiye.modules.distribute.service.OceanEngineService; -import com.baiye.system.constant.DateConst; -import com.baiye.system.constant.LetterConst; import com.baiye.util.AESUtils; import com.baiye.util.MobileUtil; -import com.baiye.utils.SerialCode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.ballcat.security.properties.SecurityProperties; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,8 +31,6 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.util.*; import java.util.concurrent.CompletableFuture; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /** * @author wjt @@ -62,12 +55,10 @@ public class OceanEngineClueServiceImpl extends ExtendServiceImpl advertiserIds = oceanEngineToken.getAdvertiserIds(); - log.info("=================== 获取到的广告主ids {} ===================", JSONUtil.toJsonStr(advertiserIds)); CompletableFuture.runAsync(() -> getAdvertiser(oceanEngineToken.getUserId(), accessToken, advertiserIds, startTime, endTime)); } } @@ -79,24 +70,25 @@ public class OceanEngineClueServiceImpl extends ExtendServiceImpl advertisers, Date startTime, Date endTime) { - + log.info("=================== 巨量飞鱼,拉取用户{} ===================", userId); if (CollUtil.isEmpty(advertisers)) { + log.info("=================== 巨量飞鱼,拉取用户{} 无管家 ===================", userId); return; } List advertiseList = getAdvertiseIds(accessToken, advertisers); if (CollUtil.isEmpty(advertiseList)) { + log.info("=================== 巨量飞鱼,拉取用户{} 无广告商 ===================", userId); return; } Map map = new HashMap<>(5); map.put("advertiser_ids", advertiseList.toString()); map.put("start_time", startTime); map.put("end_time", endTime); - log.info("=================== 巨量飞鱼请求 {} ===================", JSONUtil.toJsonStr(map)); JSONArray array = reqOceanEngineClue(accessToken, map); + log.info("=================== 巨量飞鱼,线索数量{} ===================", array.size()); if (CollUtil.isEmpty(array)) { return; } - log.info("=================== 巨量飞鱼返回{} ===================", array.size()); parseAndSaveData(userId, array); } @@ -115,18 +107,21 @@ public class OceanEngineClueServiceImpl extends ExtendServiceImpl map, String accessToken) { String body = HttpRequest.get(UrlConstant.SYNC_CLUE_URL + "?" + URLUtil.buildQuery(map, Charset.defaultCharset())).header("Access-Token", accessToken).execute().body(); - JSONObject response = JSONUtil.parseObj(body); - if (response.getInt("code") == 0 && response.getStr("data") != null) { - return JSONUtil.parseObj(response.getStr("data")); + OceanEngineResponseDTO response = JSONUtil.toBean(body, OceanEngineResponseDTO.class); + if (response.getCode() == 0) { + if (response.getData() != null) { + return JSONUtil.parseObj(response.getData()); + } + } else { + log.error("获取飞鱼线索失败 {}", response); } return null; } @@ -168,8 +167,8 @@ public class OceanEngineClueServiceImpl extends ExtendServiceImpl