From fd0a728489fef3e847c2b5e974a2b133925c1ee5 Mon Sep 17 00:00:00 2001 From: wjt Date: Thu, 8 Jun 2023 18:50:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=95=E6=94=BE=E5=8E=8B?= =?UTF-8?q?=E7=BC=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TbBDNewBackdataEntityRepository.java | 6 +++--- .../TbGdtNewBackdataEntityRepository.java | 4 ++-- .../TbJLV1BackdataEntityRepository.java | 4 ++-- .../TbJLV2BackdataEntityRepository.java | 4 ++-- .../TbKSNewBackdataEntityRepository.java | 4 ++-- .../baiyee/adcallback/task/TfSourceTask.java | 21 ++++++++++--------- src/main/resources/application-prod.yml | 2 +- 7 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/baiyee/adcallback/repository/TbBDNewBackdataEntityRepository.java b/src/main/java/com/baiyee/adcallback/repository/TbBDNewBackdataEntityRepository.java index 2b36c6f..2626c0d 100644 --- a/src/main/java/com/baiyee/adcallback/repository/TbBDNewBackdataEntityRepository.java +++ b/src/main/java/com/baiyee/adcallback/repository/TbBDNewBackdataEntityRepository.java @@ -14,9 +14,9 @@ import java.util.List; public interface TbBDNewBackdataEntityRepository extends JpaRepository { - /** * 查询数据 + * * @param imeiStrFirst * @param imeiSecond * @param startDate @@ -29,6 +29,6 @@ public interface TbBDNewBackdataEntityRepository extends JpaRepository= :startDate and gmtCreate < :endDate and tag in :tag group by imei,tag") List queryPlateFormDTO(@Param("imeiStrFirst") String imeiStrFirst, @Param("imeiSecond") String imeiSecond, @Param("startDate") DateTime startDate, @Param("endDate") DateTime endDate, @Param("tag") List tag); - @Query(value = "SELECT * FROM tb_bd_new_backdata WHERE imei != '' AND imei != '__imei__' AND gmt_create > ?1 AND gmt_create < ?2", nativeQuery = true) - List queryByDate(String startDate, String endDate); + @Query("SELECT t FROM TbBdNewBackdataEntity t WHERE t.imei != '' AND t.imei != '__imei__' AND t.gmtCreate > ?1 AND t.gmtCreate < ?2") + List queryByDate(DateTime startDate, DateTime endDate); } diff --git a/src/main/java/com/baiyee/adcallback/repository/TbGdtNewBackdataEntityRepository.java b/src/main/java/com/baiyee/adcallback/repository/TbGdtNewBackdataEntityRepository.java index 5d6bfbf..3f06968 100644 --- a/src/main/java/com/baiyee/adcallback/repository/TbGdtNewBackdataEntityRepository.java +++ b/src/main/java/com/baiyee/adcallback/repository/TbGdtNewBackdataEntityRepository.java @@ -30,6 +30,6 @@ public interface TbGdtNewBackdataEntityRepository extends JpaRepository= :startDate and gmtCreate < :endDate and tag in :tag and deviceOsType = :models group by imei,tag") List queryPlateFormDTO(@Param("imeiStrFirst") String imeiStrFirst, @Param("imeiSecond") String imeiSecond, @Param("startDate") DateTime startDate, @Param("endDate") DateTime endDate, @Param("tag") List tag, @Param("models") String models); - @Query(value = "SELECT * FROM tb_gdt_new_backdata WHERE imei != '' AND imei != '__imei__' AND gmt_create > ?1 AND gmt_create < ?2", nativeQuery = true) - List queryByDate(String startDate, String endDate); + @Query("SELECT t FROM TbGdtNewBackdataEntity t WHERE t.imei != '' AND t.imei != '__imei__' AND t.gmtCreate > ?1 AND t.gmtCreate < ?2") + List queryByDate(DateTime startDate, DateTime endDate); } diff --git a/src/main/java/com/baiyee/adcallback/repository/TbJLV1BackdataEntityRepository.java b/src/main/java/com/baiyee/adcallback/repository/TbJLV1BackdataEntityRepository.java index f08092b..34539b5 100644 --- a/src/main/java/com/baiyee/adcallback/repository/TbJLV1BackdataEntityRepository.java +++ b/src/main/java/com/baiyee/adcallback/repository/TbJLV1BackdataEntityRepository.java @@ -37,8 +37,8 @@ public interface TbJLV1BackdataEntityRepository extends JpaRepository= :startDate and gmtCreate < :endDate and tag in :tag group by imei,tag") List queryPlateFormDTO(@Param("imeiStrFirst") String imeiStrFirst, @Param("imeiSecond") String imeiSecond, @Param("startDate") DateTime startDate, @Param("endDate") DateTime endDate, @Param("tag") List tag); - @Query(value = "SELECT * FROM tb_jl_v1_backdata WHERE imei != '' AND imei != '__IMEI__' AND gmt_create > ?1 AND gmt_create < ?2", nativeQuery = true) - List queryByDate(String startDate, String endDate); + @Query("SELECT t FROM TbJLBackDataV1Entity t WHERE t.imei != '' AND t.imei != '__IMEI__' AND t.gmtCreate > ?1 AND t.gmtCreate < ?2") + List queryByDate(DateTime startDate, DateTime endDate); List queryBytag(String s); } diff --git a/src/main/java/com/baiyee/adcallback/repository/TbJLV2BackdataEntityRepository.java b/src/main/java/com/baiyee/adcallback/repository/TbJLV2BackdataEntityRepository.java index 0ebb76c..6b3aa07 100644 --- a/src/main/java/com/baiyee/adcallback/repository/TbJLV2BackdataEntityRepository.java +++ b/src/main/java/com/baiyee/adcallback/repository/TbJLV2BackdataEntityRepository.java @@ -21,8 +21,8 @@ public interface TbJLV2BackdataEntityRepository extends JpaRepository queryAllImeiByDate(Date startDate, Date endDate); - @Query(value = "SELECT * FROM tb_jl_v2_backdata WHERE imei != '' AND imei != '__IMEI__' AND gmt_create > ?1 AND gmt_create < ?2", nativeQuery = true) - List queryByDate(String startDate, String endDate); + @Query("SELECT t FROM TbJLBackDataV2Entity t WHERE t.imei != '' AND t.imei != '__IMEI__' AND t.gmtCreate > ?1 AND t.gmtCreate < ?2") + List queryByDate(DateTime startDate, DateTime endDate); /** * 查询数据 diff --git a/src/main/java/com/baiyee/adcallback/repository/TbKSNewBackdataEntityRepository.java b/src/main/java/com/baiyee/adcallback/repository/TbKSNewBackdataEntityRepository.java index 76a7834..15cfa86 100644 --- a/src/main/java/com/baiyee/adcallback/repository/TbKSNewBackdataEntityRepository.java +++ b/src/main/java/com/baiyee/adcallback/repository/TbKSNewBackdataEntityRepository.java @@ -29,6 +29,6 @@ public interface TbKSNewBackdataEntityRepository extends JpaRepository= :startDate and gmtCreate < :endDate and tag in :tag group by imei,tag") List queryPlateFormDTO(@Param("imeiStrFirst") String imeiStrFirst, @Param("imeiSecond") String imeiSecond, @Param("startDate") DateTime startDate, @Param("endDate") DateTime endDate, @Param("tag") List tag); - @Query(value = "SELECT * FROM tb_ks_new_backdata WHERE imei != '' AND imei != '__imei__' AND gmt_create > ?1 AND gmt_create < ?2", nativeQuery = true) - List queryByDate(String startDate, String endDate); + @Query("SELECT t FROM TbKSNewBackdataEntity t WHERE t.imei != '' AND t.imei != '__imei__' AND t.gmtCreate > ?1 AND t.gmtCreate < ?2") + List queryByDate(DateTime startDate, DateTime endDate); } diff --git a/src/main/java/com/baiyee/adcallback/task/TfSourceTask.java b/src/main/java/com/baiyee/adcallback/task/TfSourceTask.java index abbf384..c9bc7c7 100644 --- a/src/main/java/com/baiyee/adcallback/task/TfSourceTask.java +++ b/src/main/java/com/baiyee/adcallback/task/TfSourceTask.java @@ -2,6 +2,7 @@ package com.baiyee.adcallback.task; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.text.csv.CsvWriter; import cn.hutool.core.util.RandomUtil; @@ -56,13 +57,13 @@ public class TfSourceTask { @Transactional(rollbackFor = Exception.class) public void tfSource() { log.info("++++++++++++++++++++++TfSource Sync start time {} ++++++++++++++++", DateUtil.now()); - String startTime = DateUtil.format(DateUtil.yesterday(), "yyyy-MM-dd 00:00:00"); - String endTime = DateUtil.format(DateUtil.yesterday(), "yyyy-MM-dd 23:59:59"); + DateTime startTime = DateUtil.beginOfDay(DateUtil.yesterday()); + DateTime endTime = DateUtil.endOfDay(DateUtil.yesterday()); List list = new ArrayList<>(); - //jlv2 - obtainDateByJlV2(startTime, endTime, list); //jlv1 obtainDateByJlv1(startTime, endTime, list); + //jlv2 + obtainDateByJlV2(startTime, endTime, list); //gdt obtainDateByGdt(startTime, endTime, list); //ks @@ -100,7 +101,7 @@ public class TfSourceTask { * @param list */ private String generateFile(String tag, String format, String password, List list) { - String filePath = path + format; + String filePath = path + File.separator + format; File file = new File(filePath + File.separator + tag + ".csv"); CsvWriter writer = new CsvWriter(file, StandardCharsets.UTF_8); writer.writeBeans(list); @@ -140,7 +141,7 @@ public class TfSourceTask { return null; } - private void obtainDateByJlV2(String startTime, String endTime, List list) { + private void obtainDateByJlV2(DateTime startTime, DateTime endTime, List list) { List jlV2Data = tbJLV2BackdataEntityRepository.queryByDate(startTime, endTime); if (CollUtil.isNotEmpty(jlV2Data)) { List tfSourceDTOS = Convert.toList(TfSourceDTO.class, jlV2Data); @@ -148,7 +149,7 @@ public class TfSourceTask { } } - private void obtainDateByJlv1(String startTime, String endTime, List list) { + private void obtainDateByJlv1(DateTime startTime, DateTime endTime, List list) { List jlV1Data = tbJLV1BackdataEntityRepository.queryByDate(startTime, endTime); if (CollUtil.isNotEmpty(jlV1Data)) { List tfSourceDTOS = Convert.toList(TfSourceDTO.class, jlV1Data); @@ -156,7 +157,7 @@ public class TfSourceTask { } } - private void obtainDateByGdt(String startTime, String endTime, List list) { + private void obtainDateByGdt(DateTime startTime, DateTime endTime, List list) { List jlV2Data = tbGdtNewBackdataEntityRepository.queryByDate(startTime, endTime); if (CollUtil.isNotEmpty(jlV2Data)) { List tfSourceDTOS = Convert.toList(TfSourceDTO.class, jlV2Data); @@ -164,7 +165,7 @@ public class TfSourceTask { } } - private void obtainDateByKs(String startTime, String endTime, List list) { + private void obtainDateByKs(DateTime startTime, DateTime endTime, List list) { List jlV2Data = tbKSNewBackdataEntityRepository.queryByDate(startTime, endTime); if (CollUtil.isNotEmpty(jlV2Data)) { List tfSourceDTOS = Convert.toList(TfSourceDTO.class, jlV2Data); @@ -172,7 +173,7 @@ public class TfSourceTask { } } - private void obtainDateByBd(String startTime, String endTime, List list) { + private void obtainDateByBd(DateTime startTime, DateTime endTime, List list) { List jlV2Data = tbBDNewBackdataEntityRepository.queryByDate(startTime, endTime); if (CollUtil.isNotEmpty(jlV2Data)) { List tfSourceDTOS = Convert.toList(TfSourceDTO.class, jlV2Data); diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index d678bbc..750c1b3 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -58,7 +58,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource # 数据库驱动类名 driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/db_ad?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true + url: jdbc:mysql://localhost:3306/db_ad1?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&rewriteBatchedStatements=true username: root password: Yuyou@2020 # 规则配置