diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java index ac8e7f5..be8d019 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java @@ -25,7 +25,7 @@ * * 每6小时计算一次采集数据 */ - @Scheduled(cron = "0 */10 * * * ?") +// @Scheduled(cron = "0 */10 * * * ?") public void execute() { System.out.println("task --------------------"); carService.trackInspection(); diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java index ac8e7f5..be8d019 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java @@ -25,7 +25,7 @@ * * 每6小时计算一次采集数据 */ - @Scheduled(cron = "0 */10 * * * ?") +// @Scheduled(cron = "0 */10 * * * ?") public void execute() { System.out.println("task --------------------"); carService.trackInspection(); diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/JobRecordController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/JobRecordController.java index 3cfd256..ccb0231 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/JobRecordController.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/JobRecordController.java @@ -60,6 +60,7 @@ if (ToolUtil.isNotEmpty(endTime)) { query.le(JobConstant.END_TIME, endTime); } + query.orderBy("START_TIME", false); List records = jobRecordService.selectRecordsPage(page, scope, query); page.setRecords(records); return ResponseData.success(super.packForBT(page)); diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java index ac8e7f5..be8d019 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java @@ -25,7 +25,7 @@ * * 每6小时计算一次采集数据 */ - @Scheduled(cron = "0 */10 * * * ?") +// @Scheduled(cron = "0 */10 * * * ?") public void execute() { System.out.println("task --------------------"); carService.trackInspection(); diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/JobRecordController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/JobRecordController.java index 3cfd256..ccb0231 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/JobRecordController.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/JobRecordController.java @@ -60,6 +60,7 @@ if (ToolUtil.isNotEmpty(endTime)) { query.le(JobConstant.END_TIME, endTime); } + query.orderBy("START_TIME", false); List records = jobRecordService.selectRecordsPage(page, scope, query); page.setRecords(records); return ResponseData.success(super.packForBT(page)); diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java index 45dfaef..07ee1f7 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java @@ -40,6 +40,7 @@ JobStatisticsDay queryRes = jobStatisticsDayService.selectOne(query); if (queryRes != null) { statisticsDay.setId(queryRes.getId()); + statisticsDay.setCount(queryRes.getCount() + statisticsDay.getCount()); this.jobStatisticsDayService.updateById(statisticsDay); } else { this.save(statisticsDay); diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java index ac8e7f5..be8d019 100644 --- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java +++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/alarm/strategy/job/SanitationAlarmTask.java @@ -25,7 +25,7 @@ * * 每6小时计算一次采集数据 */ - @Scheduled(cron = "0 */10 * * * ?") +// @Scheduled(cron = "0 */10 * * * ?") public void execute() { System.out.println("task --------------------"); carService.trackInspection(); diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/JobRecordController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/JobRecordController.java index 3cfd256..ccb0231 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/JobRecordController.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/JobRecordController.java @@ -60,6 +60,7 @@ if (ToolUtil.isNotEmpty(endTime)) { query.le(JobConstant.END_TIME, endTime); } + query.orderBy("START_TIME", false); List records = jobRecordService.selectRecordsPage(page, scope, query); page.setRecords(records); return ResponseData.success(super.packForBT(page)); diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java index 45dfaef..07ee1f7 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobSanitationSupportServiceImpl.java @@ -40,6 +40,7 @@ JobStatisticsDay queryRes = jobStatisticsDayService.selectOne(query); if (queryRes != null) { statisticsDay.setId(queryRes.getId()); + statisticsDay.setCount(queryRes.getCount() + statisticsDay.getCount()); this.jobStatisticsDayService.updateById(statisticsDay); } else { this.save(statisticsDay); diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobStatisticsDayMapper.xml b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobStatisticsDayMapper.xml index 770de56..275d2d1 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobStatisticsDayMapper.xml +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobStatisticsDayMapper.xml @@ -44,7 +44,7 @@