From 509e68b6d50a96cc6392adff9f59913466f539e9 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 5 Jan 2022 10:13:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/sarStandWarning/EarlyWraningEOMapper.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 165cf244..e8abcc3b 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 @@ -191,7 +191,7 @@ APPLY_TYPE , attr .ZRGCS AS DUTY_ENGINEER , - NULL AS ITEMS_ID , + ITEMS_ID , NULL AS ITEMS_NUM , NULL AS ITEMS_NAME , NULL AS POLICY_ID , NULL AS POLICY_NAME , @@ -273,10 +273,11 @@ WARNING_RESULT LEFT JOIN ( - SELECT law_id,MIN(SSRQ) SSRQ_MIN FROM warning_date - GROUP BY warning_date.law_id + SELECT item_id,law_id,MIN(SSRQ) SSRQ_MIN FROM warning_date + GROUP BY warning_date.law_id,item_id ) warning_date ON warning_date.law_id = WARNING_RESULT.STAND_ID + AND warning_date.item_id = WARNING_RESULT.ITEMS_ID ORDER BY warning_date.SSRQ_MIN From 475a245e392cdb0a3e70501c9df9c0b1c9f233e0 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 5 Jan 2022 10:14:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=B9=E4=BA=86=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/scheduled/ScheduledJob.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 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 cc442699..9424c392 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 @@ -115,7 +115,6 @@ public class ScheduledJob { logger.info("开始执行预警!!!"); logger.info("========================================================================================================"); - logger.info("========================================================================================================"); //删除不在预警范围的标准 int remove = sarStandardWarningDao.autoCancelWarning(); @@ -186,6 +185,14 @@ public class ScheduledJob { // @Scheduled(cron="*/5 * * * * ?") @Async public void TextStatusSchedulingTasks() { + Logger logger = LoggerFactory.getLogger(ScheduledJob.class); + + + logger.info("========================================================================================================="); + logger.info("========================================================================================================="); + logger.info("开始更新文本状态!!!"); + logger.info("========================================================================================================="); + logger.info("========================================================================================================="); QueryWrapper wrapper = new QueryWrapper<>(); TermDTO data = new TermDTO(LocalDate.now(), LocalDate.now()); @@ -294,7 +301,8 @@ public class ScheduledJob { System.out.println("代替标准状态更新:id为"+key+"文本状态更新失败"); } } - + logger.info("==================================更新文本状态结束======================================"); + logger.info("==================================更新文本状态结束======================================"); } } From 8eeb61a354a93bccfd4a65fea7615ec8c0f004b2 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 5 Jan 2022 14:26:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=97=A5=E6=9C=9F3?= =?UTF-8?q?=E5=B9=B436=E4=B8=AA=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/scheduled/entity/TermDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java index 1c9aa42e..a148c45d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java @@ -37,8 +37,8 @@ public class TermDTO { public TermDTO() { //系统当前日期 LocalDate starDate = LocalDate.now(); - //系统当前日期3个月后 - LocalDate endDate = LocalDate.now().plusMonths(12); + //系统当前日期36个月后 + LocalDate endDate = LocalDate.now().plusMonths(36); convertToStr(starDate,endDate); }