告警代码修复

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

@@ -2,6 +2,8 @@ package com.usky.cdi;
 
 import com.usky.cdi.factory.AlarmDataSyncTaskFactory;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  *
@@ -11,5 +13,19 @@ import org.springframework.cloud.openfeign.FeignClient;
  */
 @FeignClient(contextId = "AlarmDataSyncTaskService", value = "service-cdi", fallbackFactory = AlarmDataSyncTaskFactory.class)
 public interface AlarmDataSyncTaskService {
-    void synchronizeAlarmData(Integer tenantId, Long engineeringId, String username, String password, String status);
+    /**
+     * 同步告警数据
+     *
+     * @param tenantId      租户ID
+     * @param engineeringId 工程ID
+     * @param username      mqtt用户名
+     * @param password      mqtt密码
+     * @param status        peacetime:平时 wartime:战时
+     */
+    @GetMapping("/synchronizeAlarmData")
+    void synchronizeAlarmData(@RequestParam Integer tenantId,
+                              @RequestParam Long engineeringId,
+                              @RequestParam String username,
+                              @RequestParam String password,
+                              @RequestParam String status);
 }

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

@@ -25,7 +25,7 @@ public class AlarmDataSyncTaskApi implements AlarmDataSyncTaskService {
      * engineeringId: 工程ID
      * username: mqtt用户名
      * password: mqtt密码
-     * status: 状态 0:平时 1:战时
+     * status: peacetime:平时 wartime:战时
      */
     @Override
     public void synchronizeAlarmData(Integer tenantId, Long engineeringId, String username, String password, String status) {

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/service/impl/IotDataTransferService.java

@@ -15,18 +15,10 @@ import com.usky.cdi.service.util.SnowflakeIdGenerator;
 import com.usky.cdi.service.vo.IotDataTransferVO;
 import com.usky.cdi.service.vo.base.*;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.integration.dsl.IntegrationFlow;
-import org.springframework.integration.dsl.IntegrationFlows;
 import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory;
-import org.springframework.integration.mqtt.outbound.MqttPahoMessageHandler;
-import org.springframework.messaging.MessageChannel;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;