协鼎登录更改

sms_water/src/main/java/com/huaxu/quartz/job/MonitorDataReportByDayJob.java

@@ -1,5 +1,7 @@
 package com.huaxu.quartz.job;
 
+import com.huaxu.quartz.service.DataAlarmDayJobService;
+import com.huaxu.quartz.service.DataAlarmHourJobService;
 import com.huaxu.service.MonitorDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.Job;
@@ -7,6 +9,7 @@ import org.quartz.JobExecutionContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.io.Serializable;
 
 /**
@@ -21,6 +24,8 @@ public  class MonitorDataReportByDayJob implements Job, Serializable {
     @Autowired
     private MonitorDataService monitorDataService;
 
+    @Resource
+    private DataAlarmHourJobService dataAlarmHourJobService;
 
 
     @Override
@@ -28,6 +33,7 @@ public  class MonitorDataReportByDayJob implements Job, Serializable {
         try {
             log.info("日报报任务开始执行");
             monitorDataService.getMonitorDataReportByHour();
+            dataAlarmHourJobService.execute();
             log.info("日报任务执行结束");
         } catch (Exception e) {
             e.printStackTrace();

sms_water/src/main/java/com/huaxu/quartz/job/MonitorDataReportByMonthJob.java

@@ -1,5 +1,7 @@
 package com.huaxu.quartz.job;
 
+import com.huaxu.quartz.service.DataAlarmDayJobService;
+import com.huaxu.quartz.service.DataAlarmMonthJobService;
 import com.huaxu.service.MonitorDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.Job;
@@ -8,6 +10,7 @@ import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.io.Serializable;
 
 /**
@@ -23,11 +26,15 @@ public  class MonitorDataReportByMonthJob implements Job, Serializable {
     @Autowired
     private MonitorDataService monitorDataService;
 
+    @Resource
+    private DataAlarmDayJobService dataAlarmDayJobService;
+
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException {
         try{
             log.info("月报报任务开始执行");
             monitorDataService.getMonitorDataByDay();
+            dataAlarmDayJobService.execute();
             log.info("月报任务执行结束");
         }catch (Exception e){
             e.printStackTrace();

sms_water/src/main/java/com/huaxu/quartz/job/MonitorDataReportByYearJob.java

@@ -1,5 +1,6 @@
 package com.huaxu.quartz.job;
 
+import com.huaxu.quartz.service.DataAlarmMonthJobService;
 import com.huaxu.service.MonitorDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.Job;
@@ -8,6 +9,7 @@ import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.io.Serializable;
 
 /**
@@ -23,11 +25,15 @@ public  class MonitorDataReportByYearJob implements Job, Serializable {
     @Autowired
     private MonitorDataService monitorDataService;
 
+    @Resource
+    private DataAlarmMonthJobService dataAlarmMonthJobService;
+
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException {
         try{
             log.info("年报报任务开始执行");
             monitorDataService.getMonitorDataByMonth();
+            dataAlarmMonthJobService.execute();
             log.info("年报任务执行结束");
         }catch (Exception e){
             e.printStackTrace();

sms_water/src/main/java/com/huaxu/rabbitmq/DataAlarmHandler.java

@@ -32,6 +32,6 @@ public class DataAlarmHandler implements CommandLineRunner {
 
     @Override
     public void run(String... args) throws Exception {
-        monitorDataService.getMonitorDataReportByHour();
+         //monitorDataService.getMonitorDataReportByHour();
     }
 }