From 234e4aa036b3deebfc037e00c8c28f5fbbe04484 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 1 Dec 2021 15:31:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/scheduled/ScheduledJob.java | 178 ++++++------------ .../scheduled/dao/SarStandardWarningDao.java | 4 +- .../sarStandWarning/SarStandardWarningDao.xml | 23 +++ 3 files changed, 78 insertions(+), 127 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 2f1b1283..4127374c 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 @@ -3,7 +3,7 @@ package com.adc.da.scheduled; import com.adc.da.scheduled.dao.SarStandardInfoDao; 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.TermDTO; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo; @@ -61,129 +61,57 @@ public class ScheduledJob { // @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 -//// @Scheduled(cron="*/5 * * * * ?") -// @Async -// public void WarningSchedulingTasks() { -// Logger logger = LoggerFactory.getLogger(ScheduledJob.class); -// -// /** -// * 1.查询标准属性字段表(sar_stand_attr_info) XCXSSEQ ZCCSSRQ ZRGCS -// * 联接标准信息表sar_standards_info表的STAND_NAME -// * 2.查询分解单(条款表) -// * 3.查询预警表 -// * 4.去掉预警表中已存在的的数据 -// * 5.插入预警表 -// */ -// -// /** -// mark:标识预警的种类 -// 3：新车标准预警 -// 4：在产车标准预警 -// 1：新车条款预警 -// 2：在产车条款预警 -// */ -// -// //删除不在预警范围的标准 -// QueryWrapper earlyWarningEOQW = new QueryWrapper<>(); -// earlyWarningEOQW.lt("PUT_TIME",LocalDate.now()); -// int remove = sarStandardWarningDao.delete(earlyWarningEOQW); -// System.out.println(remove); -// -// -// System.out.println("开始执行预警!!!"); -// -// DataDTO term = new DataDTO(); //预警期限(当前日期至3个月后) -// -// LinkedList warningList = new LinkedList<>();//需预警的标准和条款列表集合 -// //分解单(条款) 新车型 mark=1 -// List itemForXCXSSRQ = sarStandardItemDao.selectWithinTerm(term, "XCXSSRQ"); -// for (EarlyWarningEO warningEO : itemForXCXSSRQ) { -// warningEO.setId(UUIDUtils.randomUUID20()) -// .setPower("1") -// .setMark("1"); -//// .setPutTime(warningEO.getXCXSSRQ()); -//// .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); -// } -// warningList.addAll(itemForXCXSSRQ); -// -// //分解单(条款) 在产车型 mark=2 -// List itemForZCCSSRQ = sarStandardItemDao.selectWithinTerm(term, "ZCCSSRQ"); -// for (EarlyWarningEO warningEO : itemForZCCSSRQ) { -// warningEO.setId(UUIDUtils.randomUUID20()) -// .setPower("1") -// .setMark("2"); -//// .setPutTime(warningEO.getZCCSSRQ()); -//// .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); -// -// } -// warningList.addAll(itemForZCCSSRQ); -// -// //标准 新车型 预警 mark=3 -// List standInfoXCXSSRQ = sarStandardInfoDao.selectWithinTerm(term, "XCXSSRQ"); -// for (EarlyWarningEO warningEO : standInfoXCXSSRQ) { -// warningEO.setId(UUIDUtils.randomUUID20()) -// /** -// * //如果插入的值均为NULL，则根据索引的原理， -// * 全NULL值不被记录在索引上，所以插入全NULL值时，可以有重复的 -// * 则此处设为 '-1' -// */ -// .setItemsId("-1") -// .setPower("1") -// .setMark("3"); -//// .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); -// -// -// //实施日期达到预警时间,但在产车实施日期不在时间内 -// /** -// * 2021/9/9取消限制 -// */ -//// if (term.isTerm(warningEO.getXCXSSRQ())){ -//// warningEO.setPutTime(warningEO.getXCXSSRQ()); -//// } -//// warningEO.setPutTime(warningEO.getXCXSSRQ()); -// -// } -// warningList.addAll(standInfoXCXSSRQ); -// -// -// //标准 在产车型 mark=4 -// List standIdZCCSSRQ = sarStandardInfoDao.selectWithinTerm(term, "ZCCSSRQ"); -// -// List standInfoZCCSSRQ = standIdZCCSSRQ.stream() -// .map(id -> { -// EarlyWarningEO earlyWarningEO = new EarlyWarningEO(); -// earlyWarningEO.setStandId(id) -// .setItemsId("-1") -// .setPower("1") -// .setMark("4"); -// return earlyWarningEO; -// }).collect(Collectors.toList()); -// warningList.addAll(standInfoZCCSSRQ); -// -// -//// .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); -// //实施日期达到预警时间,但在产车实施日期不在时间内 -// /** -// * 2021/9/9取消限制 -// */ -//// if (term.isTerm(warningEO.getZCCSSRQ())){ -//// warningEO.setPutTime(warningEO.getZCCSSRQ()); -//// } -//// warningEO.setPutTime(warningEO.getZCCSSRQ()); -// -// -// //持久化至预警表 忽略标准id和标志位都一样的数据 -// if (warningList.size()!=0){ -// //此表的STAND_ID和MARK字段以及ITEMS_ID字段需个建立唯一性约束 -// int count = sarStandardWarningDao.ignoreInsert(warningList); -// logger.info("==================================预警结束======================================"); -// logger.info("==================================预警结束======================================"); -// logger.info("已预警"+ count+"条标准或条款!!"); -// logger.info("==================================预警结束======================================"); -// logger.info("==================================预警结束======================================"); -// -// } -// } + @Scheduled(cron="*/5 * * * * ?") + @Async + public void WarningSchedulingTasks() { + Logger logger = LoggerFactory.getLogger(ScheduledJob.class); + + /** + * 1.查询标准属性字段表(sar_stand_attr_info) XCXSSEQ ZCCSSRQ ZRGCS + * 联接标准信息表sar_standards_info表的STAND_NAME + * 2.查询分解单(条款表) + * 3.查询预警表 + * 4.去掉预警表中已存在的的数据 + * 5.插入预警表 + */ + + /** + mark:标识预警的种类 + 3：新车标准预警 + 4：在产车标准预警 + 1：新车条款预警 + 2：在产车条款预警 + + 2021/12/1 日需求修改 + 分为标准预警与条款预警 + mark:标识预警的种类 stand 标准 item 条款 + */ + + //删除不在预警范围的标准 + int remove = sarStandardWarningDao.cancelWarning(); + + logger.info("=========================================================================="); + logger.info("取消"+remove+"条预警"); + logger.info("开始执行预警!!!"); + logger.info("=========================================================================="); + + TermDTO term = new TermDTO(); //预警期限(当前日期至3个月后) + + + List warningList = sarStandardWarningDao.getWarningId(term); + + //持久化至预警表 忽略标准id和标志位都一样的数据 + if (warningList.size()!=0){ + //此表的STAND_ID和MARK字段以及ITEMS_ID字段需个建立唯一性约束 + int count = sarStandardWarningDao.ignoreInsert(warningList); + logger.info("==================================预警结束======================================"); + logger.info("==================================预警结束======================================"); + logger.info("已预警"+ count+"条标准或条款!!"); + logger.info("==================================预警结束======================================"); + logger.info("==================================预警结束======================================"); + + } + } @@ -202,7 +130,7 @@ public class ScheduledJob { public void TextStatusSchedulingTasks() { QueryWrapper wrapper = new QueryWrapper<>(); - DataDTO data = new DataDTO(LocalDate.now(), LocalDate.now()); + TermDTO data = new TermDTO(LocalDate.now(), LocalDate.now()); /** *实施日期是当前系统时间的标准文本状态变为'现行有效' diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java index bd34e078..89bd37f0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardWarningDao.java @@ -13,10 +13,10 @@ import java.util.List; @Repository public interface SarStandardWarningDao extends BaseMapper { - public int ignoreInsert(@Param(value = "warningEOS") LinkedList warningEOS); + public int ignoreInsert(@Param(value = "warningEOS") List warningEOS); public int cancelWarning(); -// public List getWarningId(TermDTO term); + public List getWarningId(TermDTO term); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml index 3217bffa..4e664dcd 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml @@ -59,4 +59,27 @@ + + +