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..cd14b2b6 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; @@ -55,8 +56,7 @@ public class ScheduledJob { @Autowired private SarStandardInfoDao sarStandardInfoDao; - - @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 + @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 // @Scheduled(cron="*/5 * * * * ?") @Async public void schedulingTasks() { @@ -109,7 +109,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 +121,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; } 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 @@