From 960ea90b4a5b226c38ed720417c66e821a4a0a04 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 1 Dec 2021 19:08:59 +0800 Subject: [PATCH] =?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') )