From d977214a56e33f75a021fec75e9917b25c34c744 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 1 Dec 2021 11:25:56 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IWarningDateService.java | 8 ++++ .../Impl/EarlyWarningEOServiceImpl.java | 4 -- .../service/Impl/WarningDateServiceImpl.java | 11 +++++ .../impl/SarStandardsInfoServiceImpl.java | 13 ++++-- .../sarStandWarning/EarlyWraningEOMapper.xml | 42 ++++++------------- 5 files changed, 40 insertions(+), 38 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/IWarningDateService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/WarningDateServiceImpl.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/IWarningDateService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/IWarningDateService.java new file mode 100644 index 00000000..6e206854 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/IWarningDateService.java @@ -0,0 +1,8 @@ +package com.adc.da.slrs.sarStandWarning.service; + +import com.adc.da.slrs.sarStandWarning.entity.WarningDate; +import com.baomidou.mybatisplus.extension.service.IService; + +public interface IWarningDateService extends IService { + +} 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 7ddabbbc..fa113ac5 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,12 +1,10 @@ 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.entity.StandWarningEO; import com.adc.da.slrs.sarStandWarning.service.EarlyWarningEOService; -import com.adc.da.sys.util.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,9 +14,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; @Service("EarlyWarningEOService") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/WarningDateServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/WarningDateServiceImpl.java new file mode 100644 index 00000000..e8dd0771 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/WarningDateServiceImpl.java @@ -0,0 +1,11 @@ +package com.adc.da.slrs.sarStandWarning.service.Impl; + +import com.adc.da.slrs.sarStandWarning.dao.WarningDateDao; +import com.adc.da.slrs.sarStandWarning.entity.WarningDate; +import com.adc.da.slrs.sarStandWarning.service.IWarningDateService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service +public class WarningDateServiceImpl extends ServiceImpl implements IWarningDateService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index fd3084ff..8984d362 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.sarPosition.entity.TsPosition; import com.adc.da.slrs.sarPosition.service.ITsPositionService; import com.adc.da.slrs.sarStandWarning.dao.WarningDateDao; import com.adc.da.slrs.sarStandWarning.entity.WarningDate; +import com.adc.da.slrs.sarStandWarning.service.Impl.WarningDateServiceImpl; import com.adc.da.slrs.sarUser.entity.TsUser; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.att.vo.AttFileVo; @@ -125,6 +126,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl multiTimeMap) throws Exception { @@ -1052,8 +1055,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl0){ - warningDateDao.deleteById(standId); - //TODO 实施日期存表 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("law_id",standId); + warningDateService.remove(wrapper); + warningDateService.saveBatch(warningDateList); } } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index 82229446..387b731c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -51,7 +51,7 @@ AND ( - DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') >= DATE_FORMAT( + DATE_FORMAT(sarInfo.PUT_TIME, '%Y-%m-%d') >= DATE_FORMAT( #{waringEO.endPutTime}, '%Y-%m-%d' ) @@ -65,16 +65,10 @@ AND ( - DATE_FORMAT( attr.SSRQ, '%Y-%m-%d') >= DATE_FORMAT( - #{waringEO.startSSRQ}, - '%Y-%m-%d' - ) - + sarInfo.ID IN (SELECT DISTINCT law_id FROM warning_date as t WHERE + DATE_FORMAT(t.SSRQ, '%Y-%m-%d') >= DATE_FORMAT(#{waringEO.startSSRQ}, '%Y-%m-%d') AND - DATE_FORMAT( attr.SSRQ, '%Y-%m-%d') <= DATE_FORMAT( - #{waringEO.endSSRQ}, - '%Y-%m-%d' - ) + DATE_FORMAT(t.SSRQ, '%Y-%m-%d') <= DATE_FORMAT(#{waringEO.endSSRQ}, '%Y-%m-%d') AND t.time_name = 'SSRQ' ) ) @@ -98,37 +92,25 @@ LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID POWER = '1' - + AND (MARK = 'stand') AND attr.CLLX LIKE CONCAT('%', #{waringEO.applyType},'%') AND ( - DATE_FORMAT( attr.XCXSSRQ, '%Y-%m-%d') >= DATE_FORMAT( - #{waringEO.startXCXSSRQ}, - '%Y-%m-%d' - ) - + sarInfo.ID IN (SELECT DISTINCT law_id FROM warning_date as t WHERE + DATE_FORMAT(t.SSRQ, '%Y-%m-%d') >= DATE_FORMAT(#{waringEO.startXCXSSRQ}, '%Y-%m-%d') AND - DATE_FORMAT( attr.XCXSSRQ, '%Y-%m-%d') <= DATE_FORMAT( - #{waringEO.endXCXSSRQ}, - '%Y-%m-%d' - ) + DATE_FORMAT(t.SSRQ, '%Y-%m-%d') <= DATE_FORMAT(#{waringEO.endXCXSSRQ}, '%Y-%m-%d') AND t.time_name = 'XCXSSRQ' ) ) AND ( - DATE_FORMAT( attr.ZCCSSRQ, '%Y-%m-%d') >= DATE_FORMAT( - #{waringEO.startZCCSSRQ}, - '%Y-%m-%d' - ) - + sarInfo.ID IN (SELECT DISTINCT law_id FROM warning_date as t WHERE + DATE_FORMAT(t.SSRQ, '%Y-%m-%d') >= DATE_FORMAT(#{waringEO.startZCCSSRQ}, '%Y-%m-%d') AND - DATE_FORMAT( attr.ZCCSSRQ, '%Y-%m-%d') <= DATE_FORMAT( - #{waringEO.endZCCSSRQ}, - '%Y-%m-%d' - ) + DATE_FORMAT(t.SSRQ, '%Y-%m-%d') <= DATE_FORMAT(#{waringEO.startZCCSSRQ}, '%Y-%m-%d') AND t.time_name = 'ZCCSSRQ' ) ) @@ -156,7 +138,7 @@ LEFT JOIN sar_stand_attr_info AS attr ON attr.STAND_ID = warning.STAND_ID POWER = '1' - + AND (MARK = 'item') AND items.APPLY_ARCTIC LIKE CONCAT('%', #{waringEO.applyType},'%') From 1973529a69b4a6a07b3cb062ddc43f6c1fed3086 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 1 Dec 2021 11:27:07 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduled/dao/SarStandardWarningDao.java | 9 ++++-- .../sarStandWarning/SarStandardWarningDao.xml | 29 +++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) 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 004701e3..bd34e078 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 @@ -1,17 +1,22 @@ package com.adc.da.scheduled.dao; -import com.adc.da.scheduled.entity.WarningEO; +import com.adc.da.scheduled.entity.TermDTO; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.service.IService; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.LinkedList; +import java.util.List; @Repository public interface SarStandardWarningDao extends BaseMapper { public int ignoreInsert(@Param(value = "warningEOS") LinkedList warningEOS); + + + public int cancelWarning(); + +// 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 ab43a5b0..3217bffa 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 @@ -28,6 +28,35 @@ + + DELETE + FROM + sar_stand_warning + WHERE + STAND_ID IN ( + SELECT + law_id + FROM + warning_date + WHERE + DATE_FORMAT(SSRQ, '%Y-%m-%d') lt; DATE_FORMAT(now(), '%Y-%m-%d') + UNION + SELECT + ID + FROM + sar_standards_info + WHERE + DATE_FORMAT(PUT_TIME, '%Y-%m-%d') lt; DATE_FORMAT(now(), '%Y-%m-%d') + UNION + SELECT + STAND_ID + FROM + sar_stand_items + WHERE + DATE_FORMAT(XCXSSRQ, '%Y-%m-%d') lt; DATE_FORMAT(now(), '%Y-%m-%d') + OR DATE_FORMAT(ZCCSSRQ, '%Y-%m-%d') lt; DATE_FORMAT(now(), '%Y-%m-%d') + ) + From 03b8e3ee677aa1b152bb0c3203d50f7b13172424 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 1 Dec 2021 11:27:34 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=8C=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/scheduled/entity/{DataDTO.java => TermDTO.java} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/{DataDTO.java => TermDTO.java} (95%) 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/TermDTO.java similarity index 95% rename from adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/DataDTO.java rename to adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java index 7effccb0..ee311e48 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/TermDTO.java @@ -16,7 +16,7 @@ import java.util.Date; @Data @Accessors(chain = true) -public class DataDTO { +public class TermDTO { /** * 预警的期限为系统日期的次日至3个月后 */ @@ -28,14 +28,14 @@ public class DataDTO { // private String str; - public DataDTO() { + public TermDTO() { LocalDate starDate = LocalDate.now();//系统当前日期 LocalDate endDate = LocalDate.now().plusMonths(3);//系统当前日期3个月后 convertToStr(starDate,endDate); } - public DataDTO(LocalDate startDate,LocalDate endDate){ + public TermDTO(LocalDate startDate, LocalDate endDate){ convertToStr(startDate,endDate); } From e89725a2f7c64432e0a27763fc4a289998fe66cd Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 1 Dec 2021 11:28:23 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=8C=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/scheduled/dao/SarStandardInfoDao.java | 6 ++---- .../java/com/adc/da/scheduled/dao/SarStandardItemDao.java | 4 ++-- .../mybatis/mapper/sarStandWarning/SarStandardInfo.xml | 2 +- .../mybatis/mapper/sarStandWarning/SarStandardItem.xml | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) 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 e94e6d07..5fcefabf 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 @@ -1,10 +1,8 @@ package com.adc.da.scheduled.dao; -import com.adc.da.scheduled.entity.DataDTO; -import com.adc.da.scheduled.entity.WarningEO; +import com.adc.da.scheduled.entity.TermDTO; -import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -13,7 +11,7 @@ import java.util.List; @Repository public interface SarStandardInfoDao{ - public List selectWithinTerm(DataDTO date, String str); + public List selectWithinTerm(TermDTO date, String str); 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..6472758c 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 @@ -1,6 +1,6 @@ package com.adc.da.scheduled.dao; -import com.adc.da.scheduled.entity.DataDTO; +import com.adc.da.scheduled.entity.TermDTO; import com.adc.da.scheduled.entity.WarningEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -11,6 +11,6 @@ import java.util.List; @Repository public interface SarStandardItemDao extends BaseMapper{ - public List selectWithinTerm(DataDTO date, String str); + public List selectWithinTerm(TermDTO date, String str); } 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 a8bedcc1..44bd0401 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 @@ -18,7 +18,7 @@ - SELECT info.ID FROM diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml index 18a45507..c2ffba00 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml @@ -19,7 +19,7 @@ - SELECT items.ID, items.ITEMS_NUM, 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 05/12] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=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 @@ + + + From f76e0aabe54fdb969073391e4c9c26968df6e139 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 1 Dec 2021 16:49:45 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BA=8B=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandardsInfoServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 8984d362..91c7ebed 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -819,7 +819,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Wed, 1 Dec 2021 19:00:55 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=8D=95=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarModelTreeServiceImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java index faba2999..ee783e2a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/service/impl/SarModelTreeServiceImpl.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** *

@@ -62,8 +64,11 @@ public class SarModelTreeServiceImpl extends ServiceImpl{ - switch (item.getHasChildren()){ + List collect = children.stream() + .filter(item -> !parent.getModel().equals(item.getModel())).collect(Collectors.toList()); + + collect.forEach(item-> { + switch (item.getHasChildren()) { case "0": item.setLeaf(true); break; @@ -73,6 +78,8 @@ public class SarModelTreeServiceImpl extends ServiceImpl Date: Wed, 1 Dec 2021 19:08:59 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E9=A2=84=E8=AD=A6=20=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/scheduled/ScheduledJob.java | 8 ++++-- .../scheduled/dao/SarStandardWarningDao.java | 2 +- .../entity/EarlyWarningEO.java | 22 ++++++--------- .../sarStandWarning/SarStandardWarningDao.xml | 28 ++++++------------- 4 files changed, 25 insertions(+), 35 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 4127374c..321aca5c 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 @@ -23,6 +23,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import java.time.LocalDate; import java.util.*; @@ -62,7 +63,7 @@ public class ScheduledJob { // @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 @Scheduled(cron="*/5 * * * * ?") - @Async +// @Async public void WarningSchedulingTasks() { Logger logger = LoggerFactory.getLogger(ScheduledJob.class); @@ -88,7 +89,7 @@ public class ScheduledJob { */ //删除不在预警范围的标准 - int remove = sarStandardWarningDao.cancelWarning(); + int remove = sarStandardWarningDao.autoCancelWarning(); logger.info("=========================================================================="); logger.info("取消"+remove+"条预警"); @@ -100,6 +101,9 @@ public class ScheduledJob { List warningList = sarStandardWarningDao.getWarningId(term); + warningList.forEach(item->{ + item.setId(UUIDUtils.randomUUID20()); + }); //持久化至预警表 忽略标准id和标志位都一样的数据 if (warningList.size()!=0){ //此表的STAND_ID和MARK字段以及ITEMS_ID字段需个建立唯一性约束 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 89bd37f0..701d18d6 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 @@ -16,7 +16,7 @@ public interface SarStandardWarningDao extends BaseMapper { public int ignoreInsert(@Param(value = "warningEOS") List warningEOS); - public int cancelWarning(); + public int autoCancelWarning(); public List getWarningId(TermDTO term); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index d8e1839b..c87af9ea 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -34,19 +34,19 @@ public class EarlyWarningEO extends BaseEntity { private String standId; @ApiModelProperty("标准类别") - @TableField("STAND_TYPE") + @TableField(exist = false) private String standType; @ApiModelProperty("标准号") - @TableField("STAND_CODE") + @TableField(exist = false) private String standCode; @ApiModelProperty("标准名称") - @TableField("STAND_NAME") + @TableField(exist = false) private String standName; @ApiModelProperty("发布日期") - @TableField("PUT_TIME") + @TableField(exist = false) @DateTimeFormat(pattern="yyyy-MM-dd") private Date putTime; @@ -54,30 +54,26 @@ public class EarlyWarningEO extends BaseEntity { private Date lastTime; @ApiModelProperty("适用车型") - @TableField("APPLY_TYPE") + @TableField(exist = false) private String applyType; @ApiModelProperty("责任工程师") - @TableField("DUTY_ENGINEER") + @TableField(exist = false) private String dutyEngineer; @ApiModelProperty("条款（分解单）id") - @TableField("ITEMS_ID") + @TableField(exist = false) private String itemsId; @ApiModelProperty("条款（分解单）编号") - @TableField("ITEMS_NUM") + @TableField(exist = false) private String itemsNum; - @ApiModelProperty("条款（分解单）名称") - @TableField("ITEMS_NAME") - private String itemsName; + @TableField("POLICY_ID") private String policyId; - @TableField("POLICY_NAME") - private String policyName; @TableField("MARK") private String mark; 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 4e664dcd..4c21182a 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 @@ -4,34 +4,24 @@ - REPLACE INTO sar_stand_warning (ID,STAND_ID, STAND_TYPE, STAND_CODE,STAND_NAME,PUT_TIME,APPLY_TYPE,DUTY_ENGINEER,ITEMS_ID,ITEMS_NUM,ITEMS_NAME,POLICY_ID,POLICY_NAME,MARK,POWER) + REPLACE INTO sar_stand_warning (ID,STAND_ID,ITEMS_ID,POLICY_ID,MARK,POWER) VALUES ( #{item.id} ,#{item.standId} - ,#{item.standType} - ,#{item.standCode} - ,#{item.standName} - ,#{item.putTime} - ,#{item.applyType} - ,#{item.dutyEngineer} ,#{item.itemsId} - ,#{item.itemsNum} - ,#{item.itemsName} ,#{item.policyId} - ,#{item.policyName} ,#{item.mark} ,#{item.power} ) - - DELETE - FROM - sar_stand_warning + + UPDATE sar_stand_warning + SET POWER ='0' WHERE STAND_ID IN ( SELECT @@ -39,29 +29,29 @@ FROM warning_date WHERE - DATE_FORMAT(SSRQ, '%Y-%m-%d') lt; DATE_FORMAT(now(), '%Y-%m-%d') + DATE_FORMAT(SSRQ, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d') UNION SELECT ID FROM sar_standards_info WHERE - DATE_FORMAT(PUT_TIME, '%Y-%m-%d') lt; DATE_FORMAT(now(), '%Y-%m-%d') + DATE_FORMAT(PUT_TIME, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d') UNION SELECT STAND_ID FROM sar_stand_items WHERE - DATE_FORMAT(XCXSSRQ, '%Y-%m-%d') lt; DATE_FORMAT(now(), '%Y-%m-%d') - OR DATE_FORMAT(ZCCSSRQ, '%Y-%m-%d') lt; DATE_FORMAT(now(), '%Y-%m-%d') + DATE_FORMAT(XCXSSRQ, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d') + OR DATE_FORMAT(ZCCSSRQ, '%Y-%m-%d') < DATE_FORMAT(now(), '%Y-%m-%d') )