diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MqttController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MqttController.java index 242bb1d..866e7c7 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MqttController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MqttController.java @@ -4,7 +4,7 @@ import com.shxy.xymanager_common.annotation.Log; import com.shxy.xymanager_common.base.BaseController; import com.shxy.xymanager_common.base.ResponseReult; import com.shxy.xymanager_common.model.mqtt.MessageSend; -import com.shxy.xymanager_framework.mqtt.MqttPublisherService; +import com.shxy.xymanager_service.mqtt.MqttPublisherService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/xymanager_framework/pom.xml b/xymanager_framework/pom.xml index d73eea5..df2a11c 100644 --- a/xymanager_framework/pom.xml +++ b/xymanager_framework/pom.xml @@ -62,13 +62,6 @@ true - - - org.eclipse.paho - org.eclipse.paho.client.mqttv3 - 1.2.5 - - org.springframework.boot diff --git a/xymanager_service/pom.xml b/xymanager_service/pom.xml index 856c944..8ef29d1 100644 --- a/xymanager_service/pom.xml +++ b/xymanager_service/pom.xml @@ -26,6 +26,12 @@ com.shxy xymanager_dao + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.2.5 + \ No newline at end of file diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/DataMessageListener.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/DataMessageListener.java similarity index 98% rename from xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/DataMessageListener.java rename to xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/DataMessageListener.java index 009cdd1..36f63e0 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/DataMessageListener.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/DataMessageListener.java @@ -1,4 +1,4 @@ -package com.shxy.xymanager_framework.mqtt; +package com.shxy.xymanager_service.mqtt; import com.shxy.xymanager_common.exception.ApiException; import com.shxy.xymanager_common.model.mqtt.*; diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/GPSHandler.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/GPSHandler.java similarity index 96% rename from xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/GPSHandler.java rename to xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/GPSHandler.java index 7278cc9..b848ac0 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/GPSHandler.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/GPSHandler.java @@ -1,4 +1,4 @@ -package com.shxy.xymanager_framework.mqtt; +package com.shxy.xymanager_service.mqtt; import com.shxy.xymanager_common.entity.TerminalPositions; import com.shxy.xymanager_common.entity.Terminals; diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/HeartbeatHandler.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/HeartbeatHandler.java similarity index 97% rename from xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/HeartbeatHandler.java rename to xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/HeartbeatHandler.java index fbf7695..ea7d760 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/HeartbeatHandler.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/HeartbeatHandler.java @@ -1,4 +1,4 @@ -package com.shxy.xymanager_framework.mqtt; +package com.shxy.xymanager_service.mqtt; import com.shxy.xymanager_common.entity.TerminalStatus; import com.shxy.xymanager_common.entity.Terminals; diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/MqttPublisherService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/MqttPublisherService.java similarity index 96% rename from xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/MqttPublisherService.java rename to xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/MqttPublisherService.java index 2cfa7df..e29e4b2 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/MqttPublisherService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/MqttPublisherService.java @@ -1,4 +1,4 @@ -package com.shxy.xymanager_framework.mqtt; +package com.shxy.xymanager_service.mqtt; import com.shxy.xymanager_common.model.mqtt.MessageSend; import com.shxy.xymanager_common.util.JSONUtil; diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/MqttSubscriberService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/MqttSubscriberService.java similarity index 95% rename from xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/MqttSubscriberService.java rename to xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/MqttSubscriberService.java index 7d6f43c..ac9fcee 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/MqttSubscriberService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/MqttSubscriberService.java @@ -1,4 +1,4 @@ -package com.shxy.xymanager_framework.mqtt; +package com.shxy.xymanager_service.mqtt; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.MqttClient; diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/PhotoHandler.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/PhotoHandler.java similarity index 98% rename from xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/PhotoHandler.java rename to xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/PhotoHandler.java index 39e794d..8b65ba5 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/PhotoHandler.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/PhotoHandler.java @@ -1,4 +1,4 @@ -package com.shxy.xymanager_framework.mqtt; +package com.shxy.xymanager_service.mqtt; import com.shxy.xymanager_common.entity.TerminalPhoto; import com.shxy.xymanager_common.entity.Terminals; diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/PullHandler.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/PullHandler.java similarity index 98% rename from xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/PullHandler.java rename to xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/PullHandler.java index fe410dd..90bd8f5 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/PullHandler.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/PullHandler.java @@ -1,4 +1,4 @@ -package com.shxy.xymanager_framework.mqtt; +package com.shxy.xymanager_service.mqtt; import com.shxy.xymanager_common.entity.LeadPulls; import com.shxy.xymanager_common.entity.LeadPullsExample; diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/RespMessageListener.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/RespMessageListener.java similarity index 95% rename from xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/RespMessageListener.java rename to xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/RespMessageListener.java index 7451bb8..7705222 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/RespMessageListener.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/RespMessageListener.java @@ -1,4 +1,4 @@ -package com.shxy.xymanager_framework.mqtt; +package com.shxy.xymanager_service.mqtt; import com.shxy.xymanager_common.exception.ApiException; import lombok.extern.slf4j.Slf4j; diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/StatusHandler.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/StatusHandler.java similarity index 96% rename from xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/StatusHandler.java rename to xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/StatusHandler.java index 0fd942e..c50c159 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/StatusHandler.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/StatusHandler.java @@ -1,4 +1,4 @@ -package com.shxy.xymanager_framework.mqtt; +package com.shxy.xymanager_service.mqtt; import com.shxy.xymanager_common.entity.TerminalStatus; import com.shxy.xymanager_common.entity.Terminals; diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/WeatherHandler.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/WeatherHandler.java similarity index 98% rename from xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/WeatherHandler.java rename to xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/WeatherHandler.java index 67d03ec..9c45d31 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/mqtt/WeatherHandler.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/mqtt/WeatherHandler.java @@ -1,4 +1,4 @@ -package com.shxy.xymanager_framework.mqtt; +package com.shxy.xymanager_service.mqtt; import com.shxy.xymanager_common.entity.Terminals; import com.shxy.xymanager_common.entity.Weathers;