FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into 'FOTON'

Browse Source 
Develop master

See merge request LiuChao/foton-slrs-system-rest!350
This commit is contained in:
王夏晖
2022-01-05 08:57:10 +08:00
parent 4b2b0bc865 62072ceeca
commit a02d0657a0
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+9 -4
View File
@@ -109,13 +109,18 @@ public class ScheduledJob {
// }; // };
// //
// runnable.run(); // runnable.run();
logger.info("=========================================================================================================");
logger.info("=========================================================================================================");
logger.info("开始执行预警!!!");
logger.info("========================================================================================================");
logger.info("========================================================================================================");
//删除不在预警范围的标准 //删除不在预警范围的标准
int remove = sarStandardWarningDao.autoCancelWarning(); int remove = sarStandardWarningDao.autoCancelWarning();
logger.info("==========================================================================");
logger.info("取消"+remove+"条预警"); logger.info("取消"+remove+"条预警");
logger.info("开始执行预警!!!");
logger.info("==========================================================================");
//预警期限(当前日期至3个月后) //预警期限(当前日期至3个月后)
TermDTO term = new TermDTO(); TermDTO term = new TermDTO();
//查询符合预警期限的标准 多个 //查询符合预警期限的标准 多个
adc-da-slrs/src/main/java/com/adc/da/scheduled/entity/TermDTO.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class TermDTO {
//系统当前日期 //系统当前日期
LocalDate starDate = LocalDate.now(); LocalDate starDate = LocalDate.now();
//系统当前日期3个月后 //系统当前日期3个月后
LocalDate endDate = LocalDate.now().plusMonths(3); LocalDate endDate = LocalDate.now().plusMonths(12);
convertToStr(starDate,endDate); convertToStr(starDate,endDate);
} }