去掉mqtt

pom.xml

@@ -50,21 +50,11 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <!--<scope>provided</scope>-->
-        </dependency>
-        <!--mqtt相关依赖-->
-        <dependency>
-            <groupId>org.springframework.integration</groupId>
-            <artifactId>spring-integration-stream</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-integration</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.integration</groupId>
-            <artifactId>spring-integration-mqtt</artifactId>
-        </dependency>
         <!-- 引入本地依赖 start -->
         <dependency>
             <groupId>com.sun.jna</groupId>
@@ -104,18 +94,5 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
         </plugins>
-        <!-- 如果不添加此节点mybatis的mapper.xml文件都会被漏掉。 -->
-        <!--<resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                    <include>**/*.xml</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>-->
     </build>
 </project>

src/main/java/com/unissoft/config/MqttBaseConfig.java

@@ -1,68 +0,0 @@
-package com.unissoft.config;
-
-import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory;
-import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
-
-/**
- * @author qingsong.han
- * @description: 配置Mqtt公用部分, 主要是提供Mqtt客户端Bean, mqtt消息处理配置
- * @create 2022-06-14 11:10
- */
-@Configuration
-@SuppressWarnings("all")
-@ConditionalOnProperty(value = "mqtt.enabled", havingValue = "true")
-public class MqttBaseConfig {
-    /**
-     * 出站-生产者
-     */
-    public static final String CHANNEL_NAME_OUT = "mqttOutputChannel";
-
-    @Value("${mqtt.serverURIs}")
-    private String mqttServerURIs;
-    @Value("${mqtt.username}")
-    private String mqttUserName;
-    @Value("${mqtt.password}")
-    private String mqttPwd;
-    @Value("${mqtt.keepAliveInterval}")
-    private Integer keepAliveInterval;
-    @Value("${mqtt.cleanSession}")
-    private Boolean cleanSession;
-
-    // 客户端与服务器之间的连接意外中断，服务器将发布客户端的“遗嘱”消息
-    /*private static final byte[] WILL_DATA;
-
-    static {
-        WILL_DATA = "offline".getBytes();
-    }*/
-
-
-    /**
-     * 创建设置MQTT Broker连接属性,如果使用SSL验证,也在这里设置(构造一个默认的mqtt客户端操作bean)
-     *
-     * @return MqttPahoClientFactory
-     */
-    @Bean
-    public MqttPahoClientFactory factory() {
-        DefaultMqttPahoClientFactory factory = new DefaultMqttPahoClientFactory();
-        MqttConnectOptions options = new MqttConnectOptions();
-        //如果配置了用户密码这里需要对应设置
-        options.setUserName(mqttUserName);
-        options.setPassword(mqttPwd.toCharArray());
-        String[] array = mqttServerURIs.split(",");
-        options.setServerURIs(array);
-        // 设为false，客户端掉线后 服务器端不会清除session，当重连后可以接收之前订阅主题的消息。当客户端上线后会接受到它离线的这段时间的消息
-        options.setCleanSession(cleanSession);
-        // 设置会话心跳时间 单位为秒
-        options.setKeepAliveInterval(keepAliveInterval);
-        // 设置"遗嘱"消息的话题,若客户端与服务器之间的连接意外中断,服务器将发布客户端的"遗嘱"消息
-//        options.setWill("willTopic", WILL_DATA, 2, false);
-        factory.setConnectionOptions(options);
-        return factory;
-    }
-
-}

src/main/java/com/unissoft/config/MqttOutConfig.java

@@ -1,53 +0,0 @@
-package com.unissoft.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.integration.annotation.ServiceActivator;
-import org.springframework.integration.channel.DirectChannel;
-import org.springframework.integration.config.EnableIntegration;
-import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
-import org.springframework.integration.mqtt.outbound.MqttPahoMessageHandler;
-import org.springframework.messaging.MessageChannel;
-import org.springframework.messaging.MessageHandler;
-
-/**
- * @author qingsong.han
- * @description: 配置出站消息通道及相关处理Bean(生产发布消息)
- * @create 2022-03-01 11:10
- */
-@EnableIntegration
-@Configuration
-@ConditionalOnProperty(value = "mqtt.enabled", havingValue = "true")
-public class MqttOutConfig {
-    @Value("${mqtt.clientId}")
-    private String clientId;
-    @Value("${mqtt.qos}")
-    private int qos;
-    /**
-     * mqtt消息出站通道，用于发送出站消息
-     *
-     * @return
-     */
-    @Bean
-    public MessageChannel mqttOutputChannel() {
-        return new DirectChannel();
-    }
-
-    /**
-     * mqtt消息出站通道默认配置，用于向外发出mqtt消息，当前案例中发到了同一个mqtt服务器
-     *
-     * @return
-     */
-    @Bean
-    @ServiceActivator(inputChannel = MqttBaseConfig.CHANNEL_NAME_OUT)
-    public MessageHandler mqttOutbound(MqttPahoClientFactory factory) {
-        MqttPahoMessageHandler messageHandler = new MqttPahoMessageHandler(clientId, factory);
-        messageHandler.setAsync(true);
-        messageHandler.setDefaultQos(qos);
-        messageHandler.setDefaultTopic("mqtt_default_topic"); // 默认主题不能为空
-        return messageHandler;
-    }
-
-}

src/main/java/com/unissoft/mqtt/MqttMessageSender.java

@@ -1,55 +0,0 @@
-package com.unissoft.mqtt;
-
-import com.unissoft.config.MqttBaseConfig;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.integration.annotation.MessagingGateway;
-import org.springframework.integration.mqtt.support.MqttHeaders;
-import org.springframework.messaging.handler.annotation.Header;
-import org.springframework.stereotype.Component;
-
-/**
- * @author qingsong.han
- * @description: mqtt消息发送工具,指定通过某个通道发出消息
- * @create 2022-06-14 11:29
- */
-@Component
-@ConditionalOnProperty(value = "mqtt.enabled", havingValue = "true")
-@MessagingGateway(defaultRequestChannel = MqttBaseConfig.CHANNEL_NAME_OUT)
-public interface MqttMessageSender {
-    /**
-     * 发送信息
-     *
-     * @param payload 发送的消息
-     */
-    void sendToMqtt(String payload);
-
-    /**
-     * 指定主题发送消息
-     *
-     * @param topic   主题
-     * @param payload 消息主体
-     */
-    void sendToMqtt(@Header(MqttHeaders.TOPIC) String topic, String payload);
-
-    /**
-     * 指定主题、qos发送消息
-     *
-     * @param topic   主题
-     * @param qos     对消息处理的几种机制。
-     *                0 表示的是订阅者没收到消息不会再次发送，消息会丢失。
-     *                1 表示的是会尝试重试，一直到接收到消息，但这种情况可能导致订阅者收到多次重复消息。
-     *                2 多了一次去重的动作，确保订阅者收到的消息有一次。
-     * @param payload 消息主体
-     */
-    void sendToMqtt(@Header(MqttHeaders.TOPIC) String topic, @Header(MqttHeaders.QOS) int qos, String payload);
-
-    /**
-     * 指定topic进行消息发送
-     *
-     * @param topic   自定义
-     * @param qos     (0,1,2)
-     * @param payload byte[]
-     */
-    void sendToMqtt(@Header(MqttHeaders.TOPIC) String topic, @Header(MqttHeaders.QOS) int qos, byte[] payload);
-
-}

src/main/java/com/unissoft/mqtt/MqttTestSendController.java

@@ -1,11 +1,9 @@
 package com.unissoft.mqtt;
 
-import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
@@ -20,19 +18,16 @@ import java.util.Date;
 @Slf4j
 @RestController
 public class MqttTestSendController {
-
-    /*@Resource
-    private MqttMessageSender mqttMessageSender;*/
-    /*@Resource
-    private RestTemplate restTemplate;*/
+    @Resource
+    private RestTemplate restTemplate;
 
     @GetMapping("/mqttSendMsg")
     public String sendMessage() {
-//        mqttMessageSender.sendToMqtt("异常闯入/入侵");
-        /*MultiValueMap<String, Object> requestEntity = new LinkedMultiValueMap<>();
+        MultiValueMap<String, Object> requestEntity = new LinkedMultiValueMap<>();
+        // DS-2CD7T27DWD-IZS(16384)/DS-7716NX-I4(4354)
         requestEntity.add("sAlarmType", 4354);
         requestEntity.add("alarmNow", new Date());
-        restTemplate.postForObject("http://localhost:8072/pushIntrusion", requestEntity, Object.class);*/
+        restTemplate.postForObject("http://localhost:8072/pushIntrusion", requestEntity, Object.class);
         return "200";
     }
 

src/main/resources/bootstrap.yml

@@ -8,31 +8,16 @@ spring:
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
-# Mqtt配置
-mqtt:
-  #自定义应用开关
-  enabled: true
-#  # mqtt服务器地址,多个用逗号隔开(tcp://172.16.0.8:1883,tcp://172.16.0.9:1883)
-#  serverURIs: tcp://172.16.0.5:1883
-#  username: admin
-#  password: admin@123
-  serverURIs: tcp://192.168.50.169:1883
-  #mqtt服务用户名 当前未配置
-  username: admin
-  #mqtt服务用户密码 当前未配置
-  password: public
-  # 异常闯入/入侵 topic
-  topics: /PUSH/DS-7716NX-I41620220625CCRRK19773208WCVU/DPUT/intrusion
-  qos: 1
-  keepAliveInterval: 120
-  # 默认为true
-  cleanSession: true
-  # TODO 正式上线 不使用随机参数(clientId修改会导致无法收到启动前的消息)
-  clientId: mqtt-input-smart-grp-nof-devices-${random.value}
+  # dev: 开发环境,test: 测试环境,prod: 生产环境（线上）
+  profiles:
+    active: dev
+---
+spring:
+  profiles: dev
 # 异常闯入异常,入侵分析
 # 设备登录
 exceptionAlarm:
-  # 设备ip地址 DS-2CD7T27DWD-IZS(16384)/DS-7716NX-I4(4354)
+  # 设备ip地址 枪机: DS-2CD7T27DWD-IZS(16384)/球机: DS-7716NX-I4(4354)
   deviceIP: 192.168.0.101
   # 设备用户名
   userName: admin
@@ -41,4 +26,20 @@ exceptionAlarm:
 # 只支持post
 address:
   # 推送异常闯入/入侵信息地址
-  pushToIntrusion: http://localhost:8077/pushIntrusion
+  pushToIntrusion: http://localhost:8077/pushIntrusion
+---
+spring:
+  profiles: prop
+# 异常闯入异常,入侵分析
+# 设备登录
+exceptionAlarm:
+  # 设备ip地址 DS-2CD7T27DWD-IZS(16384)/DS-7716NX-I4(4354)
+  deviceIP: 192.168.163.21
+  # 设备用户名
+  userName: admin
+  # 设备密码
+  password: TLJK@123$%^
+# 只支持post
+address:
+  # 推送异常闯入/入侵信息地址
+  pushToIntrusion: http://10.105.101.60:8072/pushIntrusion