From 75d200d320ef2569bab4f73d2381c55efb92ebb8 Mon Sep 17 00:00:00 2001
From: "yqyg16603827325@126.com" <yqyg16603827325@126.com>
Date: Thu, 28 Oct 2021 17:46:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E8=AF=BB=E5=8F=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=80=82=E5=BA=94=E5=88=86=E8=A1=A8=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/hchbox/job/ObtainInfoExportDelJob.java | 3 ++-
 .../src/main/java/com/hchbox/job/ObtainInfoJob.java      | 2 ++
 .../java/com/hchbox/module/dao/TopTradeRepository.java   | 2 +-
 .../src/main/java/com/hchbox/module/entity/TopTrade.java | 9 ++++++---
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ObtainInfoExportDelJob.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ObtainInfoExportDelJob.java
index e76a420..ec08d74 100644
--- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ObtainInfoExportDelJob.java
+++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ObtainInfoExportDelJob.java
@@ -1,5 +1,6 @@
 package com.hchbox.job;
 
+import cn.hutool.core.date.DateUtil;
 import com.dangdang.ddframe.job.api.ShardingContext;
 import com.dangdang.ddframe.job.api.simple.SimpleJob;
 import com.example.autoconfig.ElasticSimpleJob;
@@ -34,7 +35,7 @@ public class ObtainInfoExportDelJob implements SimpleJob {
 
     @Override
     public void execute(ShardingContext shardingContext) {
-        log.info("===============ObtainInfoExportDelJob定时器触发执行================");
+        log.info("===============ObtainInfoExportDelJob备份数据到本地开始,{}================", DateUtil.date());
         obtainInfoExportDelJob.obtainInfoService.selectExportDel();
     }
 }
diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ObtainInfoJob.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ObtainInfoJob.java
index 0918dd9..2beb3f2 100644
--- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ObtainInfoJob.java
+++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/job/ObtainInfoJob.java
@@ -1,5 +1,6 @@
 package com.hchbox.job;
 
+import cn.hutool.core.date.DateUtil;
 import com.dangdang.ddframe.job.api.ShardingContext;
 import com.dangdang.ddframe.job.api.simple.SimpleJob;
 import com.example.autoconfig.ElasticSimpleJob;
@@ -33,6 +34,7 @@ public class ObtainInfoJob implements SimpleJob {
 
     @Override
     public void execute(ShardingContext shardingContext) {
+        log.info("===============ObtainInfoJob同步前一天数据开始,{}================", DateUtil.date());
         obtainInfoJob.obtainInfoService.selectAllSave();
     }
 }
diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/TopTradeRepository.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/TopTradeRepository.java
index 118ba4e..720f398 100644
--- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/TopTradeRepository.java
+++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/TopTradeRepository.java
@@ -27,6 +27,6 @@ public interface TopTradeRepository extends JpaRepository<TopTrade, Long>, JpaSp
      * 抽取前天数据
      * @return
      */
-    @Query(value = " from TopTrade where 1 = 1")
+    @Query(value = "select * from top_trade where date(gmt_sync) = date_sub(curdate(),interval 1 day)",nativeQuery = true)
     List<TopTrade> findAllByGmtSync();
 }
diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/entity/TopTrade.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/entity/TopTrade.java
index c017f76..b844897 100644
--- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/entity/TopTrade.java
+++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/entity/TopTrade.java
@@ -3,6 +3,8 @@ package com.hchbox.module.entity;
 import com.hchbox.model.entity.BaseTrade;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -13,13 +15,14 @@ import java.io.Serializable;
  * @description /
  * @date 2021-08-13
  **/
+@Getter
+@Setter
 @Entity
-@Data
 @Table(name = "top_trade")
 public class TopTrade extends BaseTrade implements Serializable {
-    private static final long serialVersionUID = -7591788824668705732L;
+
+    private static final long serialVersionUID = -6270860811404254046L;
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     @ApiModelProperty(value = "id")
     private Long id;