mqtt改版

device-api-service/src/main/java/com/xy/service/DeviceMqttConsumerImpl.java

@@ -58,7 +58,7 @@ public class DeviceMqttConsumerImpl implements DeviceMqttConsumer {
     @Override
     @ApiOperation("设备在线")
     @Async(DeviceThreadPoolConfig.DEVICE_NETWORK_POLL)
-    public void connected(DeviceMqttDto.RequestParams requestParams) {
+    public void connected(ConsumerDto requestParams) {
         Integer netState = SysDictUtils.getValue(EnumDeviceOnlineStatus.Code.CODE.getCode(), EnumDeviceOnlineStatus.CONNECTED.getCode(), Integer.class);
         netWork(requestParams, netState);
     }
@@ -66,14 +66,14 @@ public class DeviceMqttConsumerImpl implements DeviceMqttConsumer {
     @Override
     @ApiOperation("设备离线")
     @Async(DeviceThreadPoolConfig.DEVICE_NETWORK_POLL)
-    public void disconnect(DeviceMqttDto.RequestParams requestParams) {
+    public void disconnect(ConsumerDto requestParams) {
         Integer netState = SysDictUtils.getValue(EnumDeviceOnlineStatus.Code.CODE.getCode(), EnumDeviceOnlineStatus.DISCONNECT.getCode(), Integer.class);
         netWork(requestParams, netState);
     }
 
     @Override
     @ApiOperation("设备消息推送")
-    public void devicePushMsg(DeviceMqttDto.RequestParams requestParams) {
+    public void devicePushMsg(ConsumerDto requestParams) {
         DeviceEventMsg deviceEventMsg = JSONUtil.toBean(requestParams.getData(), DeviceEventMsg.class);
         if (deviceEventMsg != null) {
             Long deviceId = deviceEventMsg.getDeviceId();
@@ -201,7 +201,7 @@ public class DeviceMqttConsumerImpl implements DeviceMqttConsumer {
      * @param requestParams
      * @param netState
      */
-    private void netWork(DeviceMqttDto.RequestParams requestParams, int netState) {
+    private void netWork(ConsumerDto requestParams, int netState) {
         JSONObject jsonObject = JSONUtil.parseObj(requestParams.getData());
         String clientid = jsonObject.getStr("clientid");
         Long deviceId;

device-api/src/main/java/com/xy/service/DeviceMqttConsumer.java

@@ -1,7 +1,7 @@
 package com.xy.service;
 
 import com.xy.annotate.RestMappingController;
-import com.xy.dto.DeviceMqttDto;
+import com.xy.dto.ConsumerDto;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,7 +18,7 @@ public interface DeviceMqttConsumer {
      * @param requestParams
      */
     @PostMapping("connected")
-    void connected(@RequestBody @Validated DeviceMqttDto.RequestParams requestParams);
+    void connected(@RequestBody @Validated ConsumerDto requestParams);
 
     /**
      * 设备离线
@@ -26,7 +26,7 @@ public interface DeviceMqttConsumer {
      * @param requestParams
      */
     @PostMapping("disconnect")
-    void disconnect(@RequestBody @Validated DeviceMqttDto.RequestParams requestParams);
+    void disconnect(@RequestBody @Validated ConsumerDto requestParams);
 
     /**
      * 设备消息推送
@@ -34,5 +34,5 @@ public interface DeviceMqttConsumer {
      * @param requestParams
      */
     @PostMapping("devicePushMsg")
-    void devicePushMsg(@RequestBody @Validated DeviceMqttDto.RequestParams requestParams);
+    void devicePushMsg(@RequestBody @Validated ConsumerDto requestParams);
 }