From 1e2c09a610eedacd7da77498e01fa00c467dbcf2 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Tue, 24 Aug 2021 16:02:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=9C=A8=E7=B3=BB=E7=BB=9F=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/adc/da/scheduled/ScheduledJob.java     | 13 +++++--------
 .../java/com/adc/da/scheduled/entity/DataDTO.java   | 11 ++++++++++-
 .../service/Impl/EarlyWarningEOServiceImpl.java     |  5 ++++-
 3 files changed, 19 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 77f6c4ef..81ee5c0f 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
@@ -80,14 +80,11 @@ public class ScheduledJob {
          */
         System.out.println("开始执行预警!!!");
         //预警期限
-        DataDTO dataDTO = new DataDTO();
-        dataDTO.setStartDate(LocalDate.now().plusDays(1)) //系统日期的下一天
-                .setEndDate(LocalDate.now().plusMonths(3).plusDays(1));//系统日期3个月后
-
+        DataDTO term = new DataDTO();
         LinkedList<WarningEO> warningList = new LinkedList<>();
 
         //分解单(条款) 新车型 mark=1
-        List<WarningEO> itemForXCXSSRQ = sarStandardItemDao.select(dataDTO, "XCXSSRQ");
+        List<WarningEO> itemForXCXSSRQ = sarStandardItemDao.select(term, "XCXSSRQ");
         for (WarningEO warningEO : itemForXCXSSRQ) {
             warningEO.setId(UUIDUtils.randomUUID20())
                     .setPower("1")
@@ -97,7 +94,7 @@ public class ScheduledJob {
         warningList.addAll(itemForXCXSSRQ);
 
         //分解单(条款) 在产车型 mark=2
-        List<WarningEO> itemForZCCSSRQ = sarStandardItemDao.select(dataDTO, "ZCCSSRQ");
+        List<WarningEO> itemForZCCSSRQ = sarStandardItemDao.select(term, "ZCCSSRQ");
         for (WarningEO warningEO : itemForZCCSSRQ) {
             warningEO.setId(UUIDUtils.randomUUID20())
                     .setPower("1")
@@ -107,7 +104,7 @@ public class ScheduledJob {
         warningList.addAll(itemForZCCSSRQ);
 
         //标准 新车型 预警 mark=3
-        List<WarningEO> standInfoXCXSSRQ = sarStandardInfoDao.select(dataDTO, "XCXSSRQ");
+        List<WarningEO> standInfoXCXSSRQ = sarStandardInfoDao.select(term, "XCXSSRQ");
         for (WarningEO warningEO : standInfoXCXSSRQ) {
             warningEO.setId(UUIDUtils.randomUUID20())
                     .setPower("1")
@@ -118,7 +115,7 @@ public class ScheduledJob {
 
 
         //标准 在产车型 mark=4
-        List<WarningEO> standInfoZCCSSRQ = sarStandardInfoDao.select(dataDTO, "ZCCSSRQ");
+        List<WarningEO> standInfoZCCSSRQ = sarStandardInfoDao.select(term, "ZCCSSRQ");
         for (WarningEO warningEO : standInfoZCCSSRQ) {
             warningEO.setId(UUIDUtils.randomUUID20())
                     .setPower("1")
diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java
index a1977028..16c3c424 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java
@@ -1,5 +1,6 @@
 package com.adc.da.scheduled.entity;
 
+import com.adc.da.base.entity.BaseEntity;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -8,11 +9,19 @@ import java.time.LocalDate;
 @Data
 @Accessors(chain = true)
 public class DataDTO {
+    /**
+     * 预警的期限为系统日期的次日至3个月后
+     */
+
 
     private LocalDate startDate;
 
     private LocalDate endDate;
 
-    private String str;
+//    private String str;
 
+    public DataDTO() {
+        this.startDate =LocalDate.now().plusDays(1); //系统日期的下一天
+        this.endDate = LocalDate.now().plusMonths(3).plusDays(1);//系统日期3个月后
+    }
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java
index b8965a78..0b67b072 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java
@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sarStandWarning.service.Impl;
 
 
+import com.adc.da.scheduled.entity.DataDTO;
 import com.adc.da.slrs.sarStandWarning.dao.EarlyWarningEODao;
 import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO;
 import com.adc.da.slrs.sarStandWarning.service.EarlyWarningEOService;
@@ -107,7 +108,9 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
         return "更改成功";
     }
     private IPage<EarlyWarningEO> getEarlyWarningEOIPage(int current,int pageSize, QueryWrapper<EarlyWarningEO> wrapper) {
-        wrapper.eq("power",1);
+        DataDTO dataDTO = new DataDTO();
+        wrapper.eq("power",1)
+                .between("PUT_TIME",dataDTO.getStartDate(),dataDTO.getEndDate());
         Page<EarlyWarningEO> page = new Page<>(current, pageSize);
         IPage<EarlyWarningEO> userIPage = earlyWarningEODao.selectPage(page, wrapper);
         System.out.println("总条数"+userIPage.getTotal());