From 4204771472ec3d636acf4da81104096849d564c2 Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Tue, 31 Aug 2021 14:03:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6=E5=88=9D?=
 =?UTF-8?q?=E6=AC=A1=E4=BF=AE=E6=94=B9~~?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/scheduled/ScheduledJob.java    | 20 +++++++++++--------
 .../da/scheduled/dao/SarStandardInfoDao.java  |  2 +-
 .../da/scheduled/dao/SarStandardItemDao.java  |  2 +-
 3 files changed, 14 insertions(+), 10 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 c9e0cd00..355af8ff 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
@@ -54,8 +54,8 @@ public class ScheduledJob {
 
 
 
-    @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
-//    @Scheduled(cron="*/5 * * * * ?")
+//    @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
+    @Scheduled(cron="*/5 * * * * ?")
     @Async
     public void WarningSchedulingTasks() {
 
@@ -82,44 +82,48 @@ public class ScheduledJob {
 
         LinkedList<WarningEO> warningList = new LinkedList<>();//需预警的标准和条款列表集合
         //分解单(条款) 新车型 mark=1
-        List<WarningEO> itemForXCXSSRQ = sarStandardItemDao.selectWithinTerm(term, "XCXSSRQ");
+        List<WarningEO> itemForXCXSSRQ = sarStandardItemDao.selectWithinTerm(term, "XCXSSRQ", "APPLY_ARCTIC");
         for (WarningEO warningEO : itemForXCXSSRQ) {
             warningEO.setId(UUIDUtils.randomUUID20())
                     .setPower("1")
                     .setMark("1")
-                    .setPutTime(warningEO.getXCXSSRQ());
+                    .setPutTime(warningEO.getXCXSSRQ())
+                    .setApplyType(warningEO.getApplyType());
         }
         warningList.addAll(itemForXCXSSRQ);
 
         //分解单(条款) 在产车型 mark=2
-        List<WarningEO> itemForZCCSSRQ = sarStandardItemDao.selectWithinTerm(term, "ZCCSSRQ");
+        List<WarningEO> itemForZCCSSRQ = sarStandardItemDao.selectWithinTerm(term, "ZCCSSRQ", "APPLY_ARCTIC");
         for (WarningEO warningEO : itemForZCCSSRQ) {
             warningEO.setId(UUIDUtils.randomUUID20())
                     .setPower("1")
                     .setMark("2")
-                    .setPutTime(warningEO.getZCCSSRQ());
+                    .setPutTime(warningEO.getZCCSSRQ())
+                    .setApplyType(warningEO.getApplyType());
         }
         warningList.addAll(itemForZCCSSRQ);
 
         //标准 新车型 预警 mark=3
-        List<WarningEO> standInfoXCXSSRQ = sarStandardInfoDao.selectWithinTerm(term, "XCXSSRQ");
+        List<WarningEO> standInfoXCXSSRQ = sarStandardInfoDao.selectWithinTerm(term, "XCXSSRQ", "CLLX");
         for (WarningEO warningEO : standInfoXCXSSRQ) {
             warningEO.setId(UUIDUtils.randomUUID20())
                     .setPower("1")
                     .setMark("3")
                     .setPutTime(warningEO.getXCXSSRQ())
+                    .setApplyType(warningEO.getApplyType())
                     .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear());
         }
         warningList.addAll(standInfoXCXSSRQ);
 
 
         //标准 在产车型 mark=4
-        List<WarningEO> standInfoZCCSSRQ = sarStandardInfoDao.selectWithinTerm(term, "ZCCSSRQ");
+        List<WarningEO> standInfoZCCSSRQ = sarStandardInfoDao.selectWithinTerm(term, "ZCCSSRQ", "CLLX");
         for (WarningEO warningEO : standInfoZCCSSRQ) {
             warningEO.setId(UUIDUtils.randomUUID20())
                     .setPower("1")
                     .setMark("4")
                     .setPutTime(warningEO.getZCCSSRQ())
+                    .setApplyType(warningEO.getApplyType())
                     .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear());
         }
         warningList.addAll(standInfoZCCSSRQ);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java
index 4b2fb0c2..3ad24478 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java
@@ -12,7 +12,7 @@ import java.util.List;
 @Repository
 public interface SarStandardInfoDao{
 
-    public List<WarningEO> selectWithinTerm(DataDTO date, String str);
+    public List<WarningEO> selectWithinTerm(DataDTO date, String str, String CLLX);
 
     public int updateStandardInfo(@Param("id")String id, @Param("textStatus") String textStatus);
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java
index 5e5b2fec..9b32eb40 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java
@@ -11,6 +11,6 @@ import java.util.List;
 @Repository
 public interface SarStandardItemDao extends BaseMapper{
 
-    public List<WarningEO> selectWithinTerm(DataDTO date, String str);
+    public List<WarningEO> selectWithinTerm(DataDTO date, String str, String applyType);
 
 }