|
|
@@ -3,7 +3,10 @@ package com.ruoyi.job.task;
|
|
|
import com.usky.cdi.AlarmDataSyncTaskService;
|
|
|
import com.usky.cdi.RemotecdiTaskService;
|
|
|
import com.usky.common.core.utils.StringUtils;
|
|
|
+<<<<<<< HEAD
|
|
|
import com.usky.eg.RemoteEgService;
|
|
|
+=======
|
|
|
+>>>>>>> 4641a3f4aa6f0f34e4ce68e4f55ebeff029799e0
|
|
|
import com.usky.meeting.RemoteMeetingService;
|
|
|
import com.usky.ems.RemoteEmsTaskService;
|
|
|
import com.usky.fire.RemoteFireService;
|
|
|
@@ -71,28 +74,28 @@ public class RyTask {
|
|
|
remoteIotTaskService.dataOverviewJobData();
|
|
|
}
|
|
|
|
|
|
- public void deviceStatus() {
|
|
|
+ public void deviceStatus(){
|
|
|
System.out.println("deviceStatus start......");
|
|
|
remoteIotTaskService.deviceStatus();
|
|
|
}
|
|
|
|
|
|
- public void deviceOffLineAlarm() {
|
|
|
+ public void deviceOffLineAlarm(){
|
|
|
System.out.println("deviceOffLineAlarm start......");
|
|
|
remoteIotTaskService.deviceOffLineAlarm();
|
|
|
}
|
|
|
|
|
|
- public void customInfoStatus() {
|
|
|
+ public void customInfoStatus(){
|
|
|
System.out.println("customInfoStatus start......");
|
|
|
remoteIotTaskService.customInfoStatus();
|
|
|
}
|
|
|
|
|
|
- public void meetingInfoStatus() {
|
|
|
+ public void meetingInfoStatus(){
|
|
|
System.out.println("meetingInfoStatus start......");
|
|
|
remoteMeetingService.meetingInfoStatus();
|
|
|
}
|
|
|
|
|
|
// 报告提交提醒
|
|
|
- public void reportSubmissionReminder() {
|
|
|
+ public void reportSubmissionReminder(){
|
|
|
System.out.println("reportSubmissionReminder start......");
|
|
|
remotePmService.reportSubmissionReminder();
|
|
|
}
|