From 05994c6014c1d372a167d8f68d1a4a60220b0156 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Fri, 27 Aug 2021 11:24:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7=E4=B8=8E=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E8=B7=B3=E9=A1=B5~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/scheduled/ScheduledJob.java | 11 +++++++---- .../java/com/adc/da/scheduled/entity/WarningEO.java | 5 +++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index 3261df90..80feeba5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -5,6 +5,7 @@ import com.adc.da.scheduled.dao.SarStandardItemDao; import com.adc.da.scheduled.dao.SarStandardWarningDao; import com.adc.da.scheduled.entity.DataDTO; import com.adc.da.scheduled.entity.WarningEO; +import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.util.UUIDUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -56,8 +57,8 @@ public class ScheduledJob { private SarStandardInfoDao sarStandardInfoDao; - @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 -// @Scheduled(cron="*/5 * * * * ?") +// @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 + @Scheduled(cron="*/5 * * * * ?") @Async public void schedulingTasks() { @@ -109,7 +110,8 @@ public class ScheduledJob { warningEO.setId(UUIDUtils.randomUUID20()) .setPower("1") .setMark("3") - .setPutTime(warningEO.getXCXSSRQ()); + .setPutTime(warningEO.getXCXSSRQ()) + .setStandCode(warningEO.getStandSort()+" "+warningEO.getStandNum()+"-"+warningEO.getStandYear()); } warningList.addAll(standInfoXCXSSRQ); @@ -120,7 +122,8 @@ public class ScheduledJob { warningEO.setId(UUIDUtils.randomUUID20()) .setPower("1") .setMark("4") - .setPutTime(warningEO.getZCCSSRQ()); + .setPutTime(warningEO.getZCCSSRQ()) + .setStandCode(warningEO.getStandSort()+" "+warningEO.getStandNum()+"-"+warningEO.getStandYear()); } warningList.addAll(standInfoZCCSSRQ); diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java index dcfa2df3..cf8f1a4d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/WarningEO.java @@ -19,4 +19,9 @@ public class WarningEO extends EarlyWarningEO { private Date ZCCSSRQ; + private String standNum; + + private String standSort; + + private String standYear; } From 8cf4fec559c19238469ece0f445a35a3ad8a6412 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Fri, 27 Aug 2021 11:25:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7=E4=B8=8E=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E8=B7=B3=E9=A1=B5~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/sarStandWarning/SarStandardInfo.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml index 518aa911..d90455ed 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml @@ -5,8 +5,10 @@ - + + + @@ -18,6 +20,8 @@