From 12bfdf99612cd5b99f83746a7c35ce7f0c1b547b Mon Sep 17 00:00:00 2001 From: bynt <13586541001@163.com> Date: Mon, 6 Nov 2023 09:56:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=89=E6=96=B9=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baiyee/adcallback/api/dto/TripartiteDTO.java | 14 +++++++++----- .../adcallback/api/dto/TripartitePlatformDTO.java | 2 ++ .../TbJlTripartiteDataEntityRepository.java | 2 +- .../entity/TbJlTripartiteDataEntity.java | 5 +++++ .../impl/AdOriginalityManageServiceImpl.java | 1 + .../service/impl/TripartiteServiceImpl.java | 1 - .../adcallback/task/TripartiteRecordTask.java | 4 ++-- 7 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/baiyee/adcallback/api/dto/TripartiteDTO.java b/src/main/java/com/baiyee/adcallback/api/dto/TripartiteDTO.java index bd8822e..deaac9a 100644 --- a/src/main/java/com/baiyee/adcallback/api/dto/TripartiteDTO.java +++ b/src/main/java/com/baiyee/adcallback/api/dto/TripartiteDTO.java @@ -11,21 +11,25 @@ public class TripartiteDTO { private String imei; - public TripartiteDTO(String imei, String oaid) { - this.imei = imei; - this.oaid = oaid; - } private String oaid; - private Integer sourceType; + private String pushType; + private Integer sourceType; public TripartiteDTO() { } + public TripartiteDTO(String imei, String oaid, String pushType, Integer sourceType) { + this.imei = imei; + this.oaid = oaid; + this.pushType = pushType; + this.sourceType = sourceType; + } + public TripartiteDTO(String imei, String oaid, Integer sourceType) { this.imei = imei; this.oaid = oaid; diff --git a/src/main/java/com/baiyee/adcallback/api/dto/TripartitePlatformDTO.java b/src/main/java/com/baiyee/adcallback/api/dto/TripartitePlatformDTO.java index b7ab767..60cc8af 100644 --- a/src/main/java/com/baiyee/adcallback/api/dto/TripartitePlatformDTO.java +++ b/src/main/java/com/baiyee/adcallback/api/dto/TripartitePlatformDTO.java @@ -15,4 +15,6 @@ public class TripartitePlatformDTO { private Integer type; + private String pushType; + } diff --git a/src/main/java/com/baiyee/adcallback/repository/TbJlTripartiteDataEntityRepository.java b/src/main/java/com/baiyee/adcallback/repository/TbJlTripartiteDataEntityRepository.java index 53968a0..6a56d66 100644 --- a/src/main/java/com/baiyee/adcallback/repository/TbJlTripartiteDataEntityRepository.java +++ b/src/main/java/com/baiyee/adcallback/repository/TbJlTripartiteDataEntityRepository.java @@ -26,7 +26,7 @@ public interface TbJlTripartiteDataEntityRepository extends BaseRepository= :startDate and gmtCreate < :endDate") List queryPlateFormDTO(@Param("imeiStrFirst") String imeiStrFirst, @Param("imeiSecond") String imeiSecond, @Param("startDate") DateTime startDate, @Param("endDate") DateTime endDate); diff --git a/src/main/java/com/baiyee/adcallback/repository/entity/TbJlTripartiteDataEntity.java b/src/main/java/com/baiyee/adcallback/repository/entity/TbJlTripartiteDataEntity.java index 1195006..b46b290 100644 --- a/src/main/java/com/baiyee/adcallback/repository/entity/TbJlTripartiteDataEntity.java +++ b/src/main/java/com/baiyee/adcallback/repository/entity/TbJlTripartiteDataEntity.java @@ -80,6 +80,11 @@ public class TbJlTripartiteDataEntity { @Column(name = "monit_type") private String monitType; + @Basic + @Column(name = "push_type") + private String pushType; + + @Basic @Column(name = "account_id") private Integer accountId; diff --git a/src/main/java/com/baiyee/adcallback/service/impl/AdOriginalityManageServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/AdOriginalityManageServiceImpl.java index 0fb2de0..4b7cdde 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/AdOriginalityManageServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/AdOriginalityManageServiceImpl.java @@ -233,6 +233,7 @@ public class AdOriginalityManageServiceImpl implements AdOriginalityManageServic // 数据入库 build.setSourceType(1); BeanUtil.copyProperties(dto, build); + build.setPushType(dto.getChannelCode()); BeanUtil.copyProperties(dto, convertDTO); build.setOtherInfo(JSONUtil.toJsonStr(convertDTO)); TbJlTripartiteDataEntity result = jlThirdDataEntityRepository.save(build); diff --git a/src/main/java/com/baiyee/adcallback/service/impl/TripartiteServiceImpl.java b/src/main/java/com/baiyee/adcallback/service/impl/TripartiteServiceImpl.java index c5c1f7d..23d8c95 100644 --- a/src/main/java/com/baiyee/adcallback/service/impl/TripartiteServiceImpl.java +++ b/src/main/java/com/baiyee/adcallback/service/impl/TripartiteServiceImpl.java @@ -7,7 +7,6 @@ import com.baiyee.adcallback.service.TripartiteService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.time.OffsetDateTime; import java.util.List; /** diff --git a/src/main/java/com/baiyee/adcallback/task/TripartiteRecordTask.java b/src/main/java/com/baiyee/adcallback/task/TripartiteRecordTask.java index a127e74..553537d 100644 --- a/src/main/java/com/baiyee/adcallback/task/TripartiteRecordTask.java +++ b/src/main/java/com/baiyee/adcallback/task/TripartiteRecordTask.java @@ -69,13 +69,13 @@ public class TripartiteRecordTask { if (StringUtils.isNotBlank(dto.getImei()) && !dto.getImei().equalsIgnoreCase(SpecialCheckParmConstant.ZERO_JL_IDFA)) { TripartitePlatformDTO build = - TripartitePlatformDTO.builder().type(0).nid(dto.getImei()).build(); + TripartitePlatformDTO.builder().type(0).nid(dto.getImei()).pushType(dto.getPushType()).build(); list.add(build); } if (StringUtils.isNotBlank(dto.getOaid()) && !dto.getOaid().equalsIgnoreCase(SpecialCheckParmConstant.ZERO_JL_IDFA)) { TripartitePlatformDTO build = - TripartitePlatformDTO.builder().type(1).nid(dto.getOaid()).build(); + TripartitePlatformDTO.builder().type(1).nid(dto.getOaid()).pushType(dto.getPushType()).build(); list.add(build); } });