Browse Source

Merge remote-tracking branch 'origin/master'

yumeng 5 years ago
parent
commit
e44305b490

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouNowDateCampaignJob.java

@@ -35,7 +35,7 @@ public class KuaishouNowDateCampaignJob implements Job {
             @Override
             @Override
             public void run() {
             public void run() {
                 //1:查询当日数据
                 //1:查询当日数据
-                Date endDate  = DateUtils.getDate();
+                Date endDate  = new Date();
                 String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", DateUtils.formatDate(endDate), -1);
                 String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", DateUtils.formatDate(endDate), -1);
                 SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
                 SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
                 Date startDate = sim.parse(anotherDay);
                 Date startDate = sim.parse(anotherDay);

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouNowDateCreativeJob.java

@@ -35,7 +35,7 @@ public class KuaishouNowDateCreativeJob implements Job {
             @Override
             @Override
             public void run() {
             public void run() {
                 //1:查询当日数据
                 //1:查询当日数据
-                Date endDate  = DateUtils.getDate();
+                Date endDate  = new Date();
                 String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", DateUtils.formatDate(endDate), -1);
                 String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", DateUtils.formatDate(endDate), -1);
                 SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
                 SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
                 Date startDate = sim.parse(anotherDay);
                 Date startDate = sim.parse(anotherDay);

+ 1 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouNowDateGroupJob.java

@@ -2,7 +2,6 @@ package org.jeecg.modules.ctop.job;
 
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import lombok.SneakyThrows;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -12,7 +11,6 @@ import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 
 
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
@@ -37,7 +35,7 @@ public class KuaishouNowDateGroupJob implements Job {
             @Override
             @Override
             public void run() {
             public void run() {
                 //1:查询当日数据
                 //1:查询当日数据
-                Date endDate  = DateUtils.getDate();
+                Date endDate  = new Date();
                 String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", DateUtils.formatDate(endDate), -1);
                 String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", DateUtils.formatDate(endDate), -1);
                 SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
                 SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
                 Date startDate = sim.parse(anotherDay);
                 Date startDate = sim.parse(anotherDay);

+ 1 - 1
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouNowDateCampaignJob.java

@@ -28,7 +28,7 @@ public class KuaishouNowDateCampaignJob {
     @XxlJob("kuaishouNowDateCampaign")
     @XxlJob("kuaishouNowDateCampaign")
     public ReturnT<String> execute(String param) throws Exception {
     public ReturnT<String> execute(String param) throws Exception {
         //1:查询当日数据
         //1:查询当日数据
-        Date endDate = DateUtils.getDate();
+        Date endDate = new Date();
         String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", DateUtils.formatDate(endDate), -1);
         String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", DateUtils.formatDate(endDate), -1);
         SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
         Date startDate = sim.parse(anotherDay);
         Date startDate = sim.parse(anotherDay);

+ 1 - 1
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouNowDateCreativeJob.java

@@ -27,7 +27,7 @@ public class KuaishouNowDateCreativeJob {
 
 
     @XxlJob("kuaishouNowDateCreative")
     @XxlJob("kuaishouNowDateCreative")
     public ReturnT<String> execute(String param) throws Exception {
     public ReturnT<String> execute(String param) throws Exception {
-        Date endDate = DateUtils.getDate();
+        Date endDate = new Date();
         String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", DateUtils.formatDate(endDate), -1);
         String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", DateUtils.formatDate(endDate), -1);
         SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
         Date startDate = sim.parse(anotherDay);
         Date startDate = sim.parse(anotherDay);

+ 1 - 1
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaishouNowDateGroupJob.java

@@ -28,7 +28,7 @@ public class KuaishouNowDateGroupJob {
     @XxlJob("kuaishouNowDateGroup")
     @XxlJob("kuaishouNowDateGroup")
     public ReturnT<String> execute(String param) throws Exception {
     public ReturnT<String> execute(String param) throws Exception {
         //1:查询当日数据
         //1:查询当日数据
-        Date endDate = DateUtils.getDate();
+        Date endDate = new Date();
         String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", DateUtils.formatDate(endDate), -1);
         String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", DateUtils.formatDate(endDate), -1);
         SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
         Date startDate = sim.parse(anotherDay);
         Date startDate = sim.parse(anotherDay);