Merge branch 'han' of uskycloud/usky-modules into master

service-cdi/service-cdi-api/src/main/java/com/usky/cdi/RemotecdiTaskService.java

@@ -7,5 +7,5 @@ import org.springframework.web.bind.annotation.GetMapping;
 @FeignClient(contextId = "RemotecdiTaskService", value = "service-cdi", fallbackFactory = RemotecdiTaskFactory.class)
 public interface RemotecdiTaskService {
     @GetMapping("/synchronizeDeviceData")
-    void synchronizeDeviceData();
+    void synchronizeDeviceData(Integer tenantId, Long engineeringId);
 }

service-cdi/service-cdi-api/src/main/java/com/usky/cdi/factory/RemotecdiTaskFactory.java

@@ -16,7 +16,7 @@ public class RemotecdiTaskFactory implements FallbackFactory<RemotecdiTaskServic
         log.error("用户服务调用失败:{}", throwable.getMessage());
         return new RemotecdiTaskService() {
             @Override
-            public void synchronizeDeviceData() {
+            public void synchronizeDeviceData(Integer tenantId, Long engineeringId) {
                 throw new FeignBadRequestException(500, "人防设备数据定时推送异常" + throwable.getMessage());
             }
 

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/controller/api/RemotecdiTaskApi.java

@@ -19,9 +19,7 @@ public class RemotecdiTaskApi implements RemotecdiTaskService {
     private IotDataTransferService iotDataTransferService;
 
     @Override
-    public void synchronizeDeviceData() {
-        Integer tenantId = 1;
-        Long engineeringId = 1L;
+    public void synchronizeDeviceData(Integer tenantId, Long engineeringId) {
         iotDataTransferService.synchronizeDeviceData(tenantId, engineeringId);
     }
 }

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/service/util/DeviceDataSyncService.java

@@ -26,7 +26,7 @@ public class DeviceDataSyncService {
      * fixedDelay：任务执行完成后固定延迟29分钟执行下一次
      * initialDelay：初始化后立即执行第一次任务
      */
-    @Scheduled(fixedDelay = 29 * 60 * 1000, initialDelay = 0)
+    //@Scheduled(fixedDelay = 29 * 60 * 1000, initialDelay = 0)
     public void scheduledDeviceDataSync() {
         Integer tenantId = 1208;
         Long engineeringId = 3101130019L;

service-job/src/main/java/com/ruoyi/job/task/RyTask.java

@@ -54,40 +54,40 @@ public class RyTask {
         remotePmService.executeTimedSending();
     }
 
-    public void dataOverviewJobData(){
+    public void dataOverviewJobData() {
         System.out.println("dataOverviewJobData start......");
         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();
     }
 
-    private void synchronizeDeviceData() {
+    private void synchronizeDeviceData(Integer tenantId, Long engineeringId) {
         System.out.println("synchronizeDeviceData start......");
-        remoteCdiTaskService.synchronizeDeviceData();
+        remoteCdiTaskService.synchronizeDeviceData(tenantId, engineeringId);
     }
 
 }