Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-backend/service-backend-api/src/main/java/com/usky/backend/domain/DataTVResponseVO.java

@@ -17,6 +17,8 @@ public class DataTVResponseVO implements Serializable {
     private String installAddress;
     //设备状态;1：在线，2：离线
     private Integer deviceStatus;
+    //告警状态;1：告警，2：故障
+    private Integer alarmStatus;
     //设备属性集合
     private List<DeviceAttributeVO> dp;
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/TaskController.java

@@ -73,7 +73,7 @@ public class TaskController {
         demReportDataService.regularReportData();
     }
 
-    @Scheduled(cron = "0 50 16 * * ? ")////每天23点
+    @Scheduled(cron = "0 0 23 * * ? ")////每天23点
     public void task5(){
         System.out.println(Thread.currentThread().getName() + "巡检计划分批次创建执行中");
         patrolInspectionPlanService.addPatrolInspectionPlanSon();

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/TaskController.java

@@ -42,7 +42,7 @@ public class TaskController implements ApplicationContextAware {
         System.out.println(Thread.currentThread().getName() + "定时任务执行中");
         dmpDataOverviewJob.execute();
     }
-//    @Scheduled(cron = "0 0/1 * * * ? ") //每天凌晨1点执行
+//    @Scheduled(cron = "0 0 22 * * ? ") //每天22点执行
 //    public void task1() {
 //        System.out.println(Thread.currentThread().getName() + "定时任务执行中");
 //        baseAlarmService.status();