Compare commits

..

No commits in common. '103453c04deee45df03a3aa55abdc14820e62151' and '91e98a0711d0cc0cf8a904a43a7b9104956c927d' have entirely different histories.

  1. 13
      src/main/java/com/biutag/supervisiondata/service/impl/ModelClueServiceImpl.java
  2. 9
      src/main/java/com/biutag/supervisiondata/task/TaskService.java

13
src/main/java/com/biutag/supervisiondata/service/impl/ModelClueServiceImpl.java

@ -1053,7 +1053,7 @@ public class ModelClueServiceImpl implements ModelClueService {
private void getModelCluesForModel22(String param, List<ModelClue> modelClues) { private void getModelCluesForModel22(String param, List<ModelClue> modelClues) {
System.out.println("模型22开始查询数据库"); System.out.println("模型22开始查询数据库");
// 定时任务 // 定时任务
String sql = "select * from \"JSDZ_4GDB\".\"v_anomaly_statistics\" where CREATETIME " + getYesterdayString() ; String sql = "select * from \"JSDZ_4GDB\".\"v_anomaly_statistics\" where CREATETIME = '" + getYesterdayString() + "'";
List<Map<String, Object>> sqlList = modelClueDataDMRepository.selectByUniqueKeys(sql); List<Map<String, Object>> sqlList = modelClueDataDMRepository.selectByUniqueKeys(sql);
System.out.println("模型22查询数据库完毕,结果数量:" + sqlList.size()); System.out.println("模型22查询数据库完毕,结果数量:" + sqlList.size());
if (sqlList.isEmpty()) { if (sqlList.isEmpty()) {
@ -1490,15 +1490,10 @@ public class ModelClueServiceImpl implements ModelClueService {
} }
private static String getYesterdayString() { private static String getYesterdayString() {
// LocalDate today = LocalDate.now();
// LocalDate result = today.minusDays(1);
// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
// return result.format(formatter);
LocalDate yesterday = LocalDate.now().minusDays(1);
LocalDate today = LocalDate.now(); LocalDate today = LocalDate.now();
String start = yesterday + " 00:00:00"; LocalDate result = today.minusDays(1);
String end = today + " 00:00:00"; DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
return ">= TIMESTAMP '" + start + "' AND CREATETIME < TIMESTAMP '" + end + "'"; return result.format(formatter);
} }
private static String getTodayString() { private static String getTodayString() {

9
src/main/java/com/biutag/supervisiondata/task/TaskService.java

@ -185,7 +185,7 @@ public class TaskService {
@Scheduled(cron = "0 33 3 * * *") @Scheduled(cron = "0 33 3 * * *")
public void runModel16() { public void runModel16() {
log.info("开始执行模型16"); log.info("开始执行模型16");
modelClueService.generate(16); modelClueService.generate(15);
log.info("模型16执行完毕"); log.info("模型16执行完毕");
} }
@ -223,13 +223,6 @@ public class TaskService {
} }
} }
@Scheduled(cron = "0 38 3 * * *")
public void runModel() {
log.info("开始执行模型18");
modelClueService.generate(18);
log.info("模型18执行完毕");
}
@Scheduled(cron = "0 44 3 * * *") @Scheduled(cron = "0 44 3 * * *")
public void runModel31() { public void runModel31() {
log.info("开始执行模型31"); log.info("开始执行模型31");

Loading…
Cancel
Save