From a4e24bd0fee0001df00eaacb5dbe1fdfabed7f85 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 20 Apr 2022 17:04:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScreenProjectDataPushMinuteTaskImpl.java  | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenProjectDataPushMinuteTaskImpl.java b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenProjectDataPushMinuteTaskImpl.java
index 9e0d1c2..a65bb77 100644
--- a/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenProjectDataPushMinuteTaskImpl.java
+++ b/epdc-cloud-job/src/main/java/com/elink/esua/epdc/service/impl/ScreenProjectDataPushMinuteTaskImpl.java
@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.commons.tools.utils.DateUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.ScreenRecordDao;
 import com.elink.esua.epdc.dto.analysis.pc.screen.form.ScreenProjectFormDTO;
 import com.elink.esua.epdc.entity.ScreenRecordEntity;
@@ -120,15 +121,18 @@ public class ScreenProjectDataPushMinuteTaskImpl implements ScreenProjectDataMon
             screenProjectFormDTO.setYearMonthDay(screenRecordEntity.getStatisticsTime());
         }
 
-        analysisFeignClient.uploadProjectInfo(screenProjectFormDTO);
-
-        //记录此次统计时间 并更新时间或者新增
-        screenRecordEntity.setStatisticsTime(new Date());
-        if (StringUtils.isNotBlank(screenRecordEntity.getId())) {
-            screenRecordDao.updateById(screenRecordEntity);
-        } else {
-            screenRecordEntity.setJobName("uploadProjectInfo");
-            screenRecordDao.insert(screenRecordEntity);
+        Result result = analysisFeignClient.uploadProjectInfo(screenProjectFormDTO);
+
+        // [0:失败；1：成功] 成功后修改时间
+        if("1".equals(result.getData())){
+            //记录此次统计时间 并更新时间或者新增
+            screenRecordEntity.setStatisticsTime(new Date());
+            if (StringUtils.isNotBlank(screenRecordEntity.getId())) {
+                screenRecordDao.updateById(screenRecordEntity);
+            } else {
+                screenRecordEntity.setJobName("uploadProjectInfo");
+                screenRecordDao.insert(screenRecordEntity);
+            }
         }
 
         logger.info("<" + methodName + "|项目信息上报>定时任务执行结束");
@@ -158,17 +162,21 @@ public class ScreenProjectDataPushMinuteTaskImpl implements ScreenProjectDataMon
             screenProjectFormDTO.setYearMonthDay(screenRecordEntity.getStatisticsTime());
         }
 
-        analysisFeignClient.uploadProjectProcess(screenProjectFormDTO);
-
-        //记录此次统计时间 并更新时间或者新增
-        screenRecordEntity.setStatisticsTime(new Date());
-        if (StringUtils.isNotBlank(screenRecordEntity.getId())) {
-            screenRecordDao.updateById(screenRecordEntity);
-        } else {
-            screenRecordEntity.setJobName("uploadProjectProcess");
-            screenRecordDao.insert(screenRecordEntity);
+        Result result = analysisFeignClient.uploadProjectProcess(screenProjectFormDTO);
+
+        // [0:失败；1：成功] 成功后修改时间
+        if("1".equals(result.getData())){
+            //记录此次统计时间 并更新时间或者新增
+            screenRecordEntity.setStatisticsTime(new Date());
+            if (StringUtils.isNotBlank(screenRecordEntity.getId())) {
+                screenRecordDao.updateById(screenRecordEntity);
+            } else {
+                screenRecordEntity.setJobName("uploadProjectProcess");
+                screenRecordDao.insert(screenRecordEntity);
+            }
         }
 
+
         logger.info("<" + methodName + "|项目处理流程信息上报>定时任务执行结束");
     }
 }