diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java index 1b7cb35..2cc6cdc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java @@ -10,6 +10,10 @@ import java.util.concurrent.ThreadPoolExecutor; +/** + * 定位事件监听器 + * @see com.casic.missiles.modular.robot.opt.handler.msg.PoseMessageMsgHandler + */ @Slf4j @Component public class PoseMessageListener { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java index 1b7cb35..2cc6cdc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java @@ -10,6 +10,10 @@ import java.util.concurrent.ThreadPoolExecutor; +/** + * 定位事件监听器 + * @see com.casic.missiles.modular.robot.opt.handler.msg.PoseMessageMsgHandler + */ @Slf4j @Component public class PoseMessageListener { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java index f0480c6..83f4cb2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java @@ -13,6 +13,7 @@ /** * websocket 推送消息 + * @see com.casic.missiles.mqtt.config.MqttClientConfigListener#createMqtt */ @Slf4j public abstract class AbstractSocketHandler implements IBaseMsgHandler { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java index 1b7cb35..2cc6cdc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java @@ -10,6 +10,10 @@ import java.util.concurrent.ThreadPoolExecutor; +/** + * 定位事件监听器 + * @see com.casic.missiles.modular.robot.opt.handler.msg.PoseMessageMsgHandler + */ @Slf4j @Component public class PoseMessageListener { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java index f0480c6..83f4cb2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java @@ -13,6 +13,7 @@ /** * websocket 推送消息 + * @see com.casic.missiles.mqtt.config.MqttClientConfigListener#createMqtt */ @Slf4j public abstract class AbstractSocketHandler implements IBaseMsgHandler { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java index 4638cd7..9c26129 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java @@ -11,6 +11,7 @@ /** * 实时位置接收器 + * */ @Slf4j @Component("/pose_message") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java index 1b7cb35..2cc6cdc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java @@ -10,6 +10,10 @@ import java.util.concurrent.ThreadPoolExecutor; +/** + * 定位事件监听器 + * @see com.casic.missiles.modular.robot.opt.handler.msg.PoseMessageMsgHandler + */ @Slf4j @Component public class PoseMessageListener { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java index f0480c6..83f4cb2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java @@ -13,6 +13,7 @@ /** * websocket 推送消息 + * @see com.casic.missiles.mqtt.config.MqttClientConfigListener#createMqtt */ @Slf4j public abstract class AbstractSocketHandler implements IBaseMsgHandler { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java index 4638cd7..9c26129 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java @@ -11,6 +11,7 @@ /** * 实时位置接收器 + * */ @Slf4j @Component("/pose_message") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 99c4a6f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.response.ResponseData; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - - - /** - * 获取mockToken - */ - @PostMapping("/test") - @ResponseBody - public Object testMqtt(String topic, String msg) { - - return ResponseData.success(); - } -} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java index 1b7cb35..2cc6cdc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java @@ -10,6 +10,10 @@ import java.util.concurrent.ThreadPoolExecutor; +/** + * 定位事件监听器 + * @see com.casic.missiles.modular.robot.opt.handler.msg.PoseMessageMsgHandler + */ @Slf4j @Component public class PoseMessageListener { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java index f0480c6..83f4cb2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java @@ -13,6 +13,7 @@ /** * websocket 推送消息 + * @see com.casic.missiles.mqtt.config.MqttClientConfigListener#createMqtt */ @Slf4j public abstract class AbstractSocketHandler implements IBaseMsgHandler { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java index 4638cd7..9c26129 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java @@ -11,6 +11,7 @@ /** * 实时位置接收器 + * */ @Slf4j @Component("/pose_message") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 99c4a6f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.response.ResponseData; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - - - /** - * 获取mockToken - */ - @PostMapping("/test") - @ResponseBody - public Object testMqtt(String topic, String msg) { - - return ResponseData.success(); - } -} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/event/UserEvent.java b/casic-server/src/main/java/com/casic/missiles/modular/system/event/UserEvent.java deleted file mode 100644 index c6ed867..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/event/UserEvent.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.missiles.modular.system.event; - -import com.casic.missiles.model.application.event.core.ModelEvent; -import com.casic.missiles.model.application.event.type.AbstractEventTypeEnum; -import com.casic.missiles.modular.system.model.User; - -/** - * 用户事件 - * - * @author lwh - */ -public class UserEvent extends ModelEvent { - /** - * Create a new {@code ApplicationEvent}. - * - * @param type 事件类型 - * @param source the object on which the event initially occurred or with - * which the event is associated (never {@code null}) - */ - public UserEvent(AbstractEventTypeEnum type, User source) { - super(type, source); - } -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java index 1b7cb35..2cc6cdc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java @@ -10,6 +10,10 @@ import java.util.concurrent.ThreadPoolExecutor; +/** + * 定位事件监听器 + * @see com.casic.missiles.modular.robot.opt.handler.msg.PoseMessageMsgHandler + */ @Slf4j @Component public class PoseMessageListener { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java index f0480c6..83f4cb2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java @@ -13,6 +13,7 @@ /** * websocket 推送消息 + * @see com.casic.missiles.mqtt.config.MqttClientConfigListener#createMqtt */ @Slf4j public abstract class AbstractSocketHandler implements IBaseMsgHandler { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java index 4638cd7..9c26129 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java @@ -11,6 +11,7 @@ /** * 实时位置接收器 + * */ @Slf4j @Component("/pose_message") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 99c4a6f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.response.ResponseData; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - - - /** - * 获取mockToken - */ - @PostMapping("/test") - @ResponseBody - public Object testMqtt(String topic, String msg) { - - return ResponseData.success(); - } -} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/event/UserEvent.java b/casic-server/src/main/java/com/casic/missiles/modular/system/event/UserEvent.java deleted file mode 100644 index c6ed867..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/event/UserEvent.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.missiles.modular.system.event; - -import com.casic.missiles.model.application.event.core.ModelEvent; -import com.casic.missiles.model.application.event.type.AbstractEventTypeEnum; -import com.casic.missiles.modular.system.model.User; - -/** - * 用户事件 - * - * @author lwh - */ -public class UserEvent extends ModelEvent { - /** - * Create a new {@code ApplicationEvent}. - * - * @param type 事件类型 - * @param source the object on which the event initially occurred or with - * which the event is associated (never {@code null}) - */ - public UserEvent(AbstractEventTypeEnum type, User source) { - super(type, source); - } -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserOneListener.java b/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserOneListener.java deleted file mode 100644 index 4480ef2..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserOneListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.system.event.listener; - -import com.casic.missiles.core.application.event.UserLoginEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.event.EventListener; -import org.springframework.stereotype.Component; - -/** - * 用户事件订阅 - * - * @author lwh - */ -@Slf4j -@Component -public class UserOneListener { - @EventListener - public void onApplicationEvent(UserLoginEvent event) { - log.debug("用户1订阅:{}", event); - } -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java index 1b7cb35..2cc6cdc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java @@ -10,6 +10,10 @@ import java.util.concurrent.ThreadPoolExecutor; +/** + * 定位事件监听器 + * @see com.casic.missiles.modular.robot.opt.handler.msg.PoseMessageMsgHandler + */ @Slf4j @Component public class PoseMessageListener { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java index f0480c6..83f4cb2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java @@ -13,6 +13,7 @@ /** * websocket 推送消息 + * @see com.casic.missiles.mqtt.config.MqttClientConfigListener#createMqtt */ @Slf4j public abstract class AbstractSocketHandler implements IBaseMsgHandler { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java index 4638cd7..9c26129 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java @@ -11,6 +11,7 @@ /** * 实时位置接收器 + * */ @Slf4j @Component("/pose_message") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 99c4a6f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.response.ResponseData; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - - - /** - * 获取mockToken - */ - @PostMapping("/test") - @ResponseBody - public Object testMqtt(String topic, String msg) { - - return ResponseData.success(); - } -} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/event/UserEvent.java b/casic-server/src/main/java/com/casic/missiles/modular/system/event/UserEvent.java deleted file mode 100644 index c6ed867..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/event/UserEvent.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.missiles.modular.system.event; - -import com.casic.missiles.model.application.event.core.ModelEvent; -import com.casic.missiles.model.application.event.type.AbstractEventTypeEnum; -import com.casic.missiles.modular.system.model.User; - -/** - * 用户事件 - * - * @author lwh - */ -public class UserEvent extends ModelEvent { - /** - * Create a new {@code ApplicationEvent}. - * - * @param type 事件类型 - * @param source the object on which the event initially occurred or with - * which the event is associated (never {@code null}) - */ - public UserEvent(AbstractEventTypeEnum type, User source) { - super(type, source); - } -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserOneListener.java b/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserOneListener.java deleted file mode 100644 index 4480ef2..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserOneListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.system.event.listener; - -import com.casic.missiles.core.application.event.UserLoginEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.event.EventListener; -import org.springframework.stereotype.Component; - -/** - * 用户事件订阅 - * - * @author lwh - */ -@Slf4j -@Component -public class UserOneListener { - @EventListener - public void onApplicationEvent(UserLoginEvent event) { - log.debug("用户1订阅:{}", event); - } -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserTwoListener.java b/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserTwoListener.java deleted file mode 100644 index 8447a22..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserTwoListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.system.event.listener; - -import com.casic.missiles.model.application.event.core.EventSubscriber; -import com.casic.missiles.modular.system.event.UserEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 用户事件订阅 - * - * @author lwh - */ -@Slf4j -@Component -public class UserTwoListener extends EventSubscriber { - @Override - public void onApplicationEvent(UserEvent event) { - log.debug("用户2订阅:{}", event); - } -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java index 1b7cb35..2cc6cdc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java @@ -10,6 +10,10 @@ import java.util.concurrent.ThreadPoolExecutor; +/** + * 定位事件监听器 + * @see com.casic.missiles.modular.robot.opt.handler.msg.PoseMessageMsgHandler + */ @Slf4j @Component public class PoseMessageListener { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java index f0480c6..83f4cb2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java @@ -13,6 +13,7 @@ /** * websocket 推送消息 + * @see com.casic.missiles.mqtt.config.MqttClientConfigListener#createMqtt */ @Slf4j public abstract class AbstractSocketHandler implements IBaseMsgHandler { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java index 4638cd7..9c26129 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java @@ -11,6 +11,7 @@ /** * 实时位置接收器 + * */ @Slf4j @Component("/pose_message") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 99c4a6f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.response.ResponseData; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - - - /** - * 获取mockToken - */ - @PostMapping("/test") - @ResponseBody - public Object testMqtt(String topic, String msg) { - - return ResponseData.success(); - } -} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/event/UserEvent.java b/casic-server/src/main/java/com/casic/missiles/modular/system/event/UserEvent.java deleted file mode 100644 index c6ed867..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/event/UserEvent.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.missiles.modular.system.event; - -import com.casic.missiles.model.application.event.core.ModelEvent; -import com.casic.missiles.model.application.event.type.AbstractEventTypeEnum; -import com.casic.missiles.modular.system.model.User; - -/** - * 用户事件 - * - * @author lwh - */ -public class UserEvent extends ModelEvent { - /** - * Create a new {@code ApplicationEvent}. - * - * @param type 事件类型 - * @param source the object on which the event initially occurred or with - * which the event is associated (never {@code null}) - */ - public UserEvent(AbstractEventTypeEnum type, User source) { - super(type, source); - } -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserOneListener.java b/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserOneListener.java deleted file mode 100644 index 4480ef2..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserOneListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.system.event.listener; - -import com.casic.missiles.core.application.event.UserLoginEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.event.EventListener; -import org.springframework.stereotype.Component; - -/** - * 用户事件订阅 - * - * @author lwh - */ -@Slf4j -@Component -public class UserOneListener { - @EventListener - public void onApplicationEvent(UserLoginEvent event) { - log.debug("用户1订阅:{}", event); - } -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserTwoListener.java b/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserTwoListener.java deleted file mode 100644 index 8447a22..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserTwoListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.system.event.listener; - -import com.casic.missiles.model.application.event.core.EventSubscriber; -import com.casic.missiles.modular.system.event.UserEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 用户事件订阅 - * - * @author lwh - */ -@Slf4j -@Component -public class UserTwoListener extends EventSubscriber { - @Override - public void onApplicationEvent(UserEvent event) { - log.debug("用户2订阅:{}", event); - } -} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 627e36f..01be493 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -57,6 +57,7 @@ + org.springframework.boot spring-boot-starter-jdbc @@ -68,6 +69,11 @@ ${core.version} + io.swagger + swagger-models + 1.6.0 + + com.casic casic-admin-core ${admin.version} @@ -76,6 +82,10 @@ io.springfox springfox-swagger-ui + + io.swagger + swagger-models + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java index 1b7cb35..2cc6cdc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java @@ -10,6 +10,10 @@ import java.util.concurrent.ThreadPoolExecutor; +/** + * 定位事件监听器 + * @see com.casic.missiles.modular.robot.opt.handler.msg.PoseMessageMsgHandler + */ @Slf4j @Component public class PoseMessageListener { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java index f0480c6..83f4cb2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java @@ -13,6 +13,7 @@ /** * websocket 推送消息 + * @see com.casic.missiles.mqtt.config.MqttClientConfigListener#createMqtt */ @Slf4j public abstract class AbstractSocketHandler implements IBaseMsgHandler { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java index 4638cd7..9c26129 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java @@ -11,6 +11,7 @@ /** * 实时位置接收器 + * */ @Slf4j @Component("/pose_message") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 99c4a6f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.response.ResponseData; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - - - /** - * 获取mockToken - */ - @PostMapping("/test") - @ResponseBody - public Object testMqtt(String topic, String msg) { - - return ResponseData.success(); - } -} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/event/UserEvent.java b/casic-server/src/main/java/com/casic/missiles/modular/system/event/UserEvent.java deleted file mode 100644 index c6ed867..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/event/UserEvent.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.missiles.modular.system.event; - -import com.casic.missiles.model.application.event.core.ModelEvent; -import com.casic.missiles.model.application.event.type.AbstractEventTypeEnum; -import com.casic.missiles.modular.system.model.User; - -/** - * 用户事件 - * - * @author lwh - */ -public class UserEvent extends ModelEvent { - /** - * Create a new {@code ApplicationEvent}. - * - * @param type 事件类型 - * @param source the object on which the event initially occurred or with - * which the event is associated (never {@code null}) - */ - public UserEvent(AbstractEventTypeEnum type, User source) { - super(type, source); - } -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserOneListener.java b/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserOneListener.java deleted file mode 100644 index 4480ef2..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserOneListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.system.event.listener; - -import com.casic.missiles.core.application.event.UserLoginEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.event.EventListener; -import org.springframework.stereotype.Component; - -/** - * 用户事件订阅 - * - * @author lwh - */ -@Slf4j -@Component -public class UserOneListener { - @EventListener - public void onApplicationEvent(UserLoginEvent event) { - log.debug("用户1订阅:{}", event); - } -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserTwoListener.java b/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserTwoListener.java deleted file mode 100644 index 8447a22..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserTwoListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.system.event.listener; - -import com.casic.missiles.model.application.event.core.EventSubscriber; -import com.casic.missiles.modular.system.event.UserEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 用户事件订阅 - * - * @author lwh - */ -@Slf4j -@Component -public class UserTwoListener extends EventSubscriber { - @Override - public void onApplicationEvent(UserEvent event) { - log.debug("用户2订阅:{}", event); - } -} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 627e36f..01be493 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -57,6 +57,7 @@ + org.springframework.boot spring-boot-starter-jdbc @@ -68,6 +69,11 @@ ${core.version} + io.swagger + swagger-models + 1.6.0 + + com.casic casic-admin-core ${admin.version} @@ -76,6 +82,10 @@ io.springfox springfox-swagger-ui + + io.swagger + swagger-models + diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index d1675b6..ff1251c 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,7 +6,7 @@ driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root - password: root + password: 123456 jms: pub-sub-domain: true # session: diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java index 1b7cb35..2cc6cdc 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/event/PoseMessageListener.java @@ -10,6 +10,10 @@ import java.util.concurrent.ThreadPoolExecutor; +/** + * 定位事件监听器 + * @see com.casic.missiles.modular.robot.opt.handler.msg.PoseMessageMsgHandler + */ @Slf4j @Component public class PoseMessageListener { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java index f0480c6..83f4cb2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java @@ -13,6 +13,7 @@ /** * websocket 推送消息 + * @see com.casic.missiles.mqtt.config.MqttClientConfigListener#createMqtt */ @Slf4j public abstract class AbstractSocketHandler implements IBaseMsgHandler { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java index 4638cd7..9c26129 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java @@ -11,6 +11,7 @@ /** * 实时位置接收器 + * */ @Slf4j @Component("/pose_message") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java deleted file mode 100644 index 99c4a6f..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.casic.missiles.modular.system.controller; - - -import com.casic.missiles.model.response.ResponseData; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @ClassName DemoController - * @Description TODO - * @Author lenovo - * @Date 2020/6/13 15:38 - * @Version 1.0 - */ -@RestController -@RequestMapping("/demo") -public class DemoController { - - - /** - * 获取mockToken - */ - @PostMapping("/test") - @ResponseBody - public Object testMqtt(String topic, String msg) { - - return ResponseData.success(); - } -} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/event/UserEvent.java b/casic-server/src/main/java/com/casic/missiles/modular/system/event/UserEvent.java deleted file mode 100644 index c6ed867..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/event/UserEvent.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.casic.missiles.modular.system.event; - -import com.casic.missiles.model.application.event.core.ModelEvent; -import com.casic.missiles.model.application.event.type.AbstractEventTypeEnum; -import com.casic.missiles.modular.system.model.User; - -/** - * 用户事件 - * - * @author lwh - */ -public class UserEvent extends ModelEvent { - /** - * Create a new {@code ApplicationEvent}. - * - * @param type 事件类型 - * @param source the object on which the event initially occurred or with - * which the event is associated (never {@code null}) - */ - public UserEvent(AbstractEventTypeEnum type, User source) { - super(type, source); - } -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserOneListener.java b/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserOneListener.java deleted file mode 100644 index 4480ef2..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserOneListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.system.event.listener; - -import com.casic.missiles.core.application.event.UserLoginEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.event.EventListener; -import org.springframework.stereotype.Component; - -/** - * 用户事件订阅 - * - * @author lwh - */ -@Slf4j -@Component -public class UserOneListener { - @EventListener - public void onApplicationEvent(UserLoginEvent event) { - log.debug("用户1订阅:{}", event); - } -} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserTwoListener.java b/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserTwoListener.java deleted file mode 100644 index 8447a22..0000000 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/event/listener/UserTwoListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.modular.system.event.listener; - -import com.casic.missiles.model.application.event.core.EventSubscriber; -import com.casic.missiles.modular.system.event.UserEvent; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 用户事件订阅 - * - * @author lwh - */ -@Slf4j -@Component -public class UserTwoListener extends EventSubscriber { - @Override - public void onApplicationEvent(UserEvent event) { - log.debug("用户2订阅:{}", event); - } -} diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 627e36f..01be493 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -57,6 +57,7 @@ + org.springframework.boot spring-boot-starter-jdbc @@ -68,6 +69,11 @@ ${core.version} + io.swagger + swagger-models + 1.6.0 + + com.casic casic-admin-core ${admin.version} @@ -76,6 +82,10 @@ io.springfox springfox-swagger-ui + + io.swagger + swagger-models + diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index d1675b6..ff1251c 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -6,7 +6,7 @@ driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root - password: root + password: 123456 jms: pub-sub-domain: true # session: diff --git a/pom.xml b/pom.xml index 5e1a9ed..26979ba 100644 --- a/pom.xml +++ b/pom.xml @@ -45,11 +45,27 @@ casic-knife4j-boot-starter ${extension.version} + org.springframework.boot spring-boot-starter-web ${boot.version} + + com.casic + casic-admin-core + ${admin.version} + + + io.springfox + springfox-swagger-ui + + + io.swagger + swagger-models + + + com.casic