diff --git a/src/main/java/com/youlai/boot/module/websocket/controller/WebsocketController.java b/src/main/java/com/youlai/boot/module/websocket/controller/WebsocketController.java index b8525d28..4470332c 100644 --- a/src/main/java/com/youlai/boot/module/websocket/controller/WebsocketController.java +++ b/src/main/java/com/youlai/boot/module/websocket/controller/WebsocketController.java @@ -49,9 +49,10 @@ public class WebsocketController { */ @MessageMapping("/sendToUser/{username}") public void sendToUser(Principal principal, @DestinationVariable String username, String message) { - - String sender = principal.getName(); // 发送人 - String receiver = username; // 接收人 + // 发送人 + String sender = principal.getName(); + // 接收人 + String receiver = username; log.info("发送人:{}; 接收人:{}", sender, receiver); // 发送消息给指定用户,拼接后路径 /user/{receiver}/queue/greeting diff --git a/src/main/java/com/youlai/boot/module/websocket/service/impl/WebsocketServiceImpl.java b/src/main/java/com/youlai/boot/module/websocket/service/OnlineUserService.java similarity index 76% rename from src/main/java/com/youlai/boot/module/websocket/service/impl/WebsocketServiceImpl.java rename to src/main/java/com/youlai/boot/module/websocket/service/OnlineUserService.java index 48fcdfb5..3d05c20d 100644 --- a/src/main/java/com/youlai/boot/module/websocket/service/impl/WebsocketServiceImpl.java +++ b/src/main/java/com/youlai/boot/module/websocket/service/OnlineUserService.java @@ -1,7 +1,6 @@ -package com.youlai.boot.module.websocket.service.impl; +package com.youlai.boot.module.websocket.service; import com.youlai.boot.system.event.UserConnectionEvent; -import com.youlai.boot.module.websocket.service.WebsocketService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; @@ -12,25 +11,21 @@ import org.springframework.stereotype.Service; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +/** + * 在线用户服务 + * + * @author Ray + * @since 2.3.0 + */ @Service -@Slf4j @RequiredArgsConstructor -public class WebsocketServiceImpl implements WebsocketService { +@Slf4j +public class OnlineUserService { private final SimpMessagingTemplate messagingTemplate; private final Set onlineUsers = ConcurrentHashMap.newKeySet(); - @Override - public void addUser(String username) { - onlineUsers.add(username); - } - - @Override - public void removeUser(String username) { - onlineUsers.remove(username); - } - @EventListener public void handleUserConnectionEvent(UserConnectionEvent event) { String username = event.getUsername(); diff --git a/src/main/java/com/youlai/boot/module/websocket/service/WebsocketService.java b/src/main/java/com/youlai/boot/module/websocket/service/WebsocketService.java deleted file mode 100644 index 4cfe70d1..00000000 --- a/src/main/java/com/youlai/boot/module/websocket/service/WebsocketService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.youlai.boot.module.websocket.service; - -public interface WebsocketService { - - void addUser(String username); - - void removeUser(String username) ; - -} diff --git a/src/main/java/com/youlai/boot/system/controller/LogController.java b/src/main/java/com/youlai/boot/system/controller/LogController.java index f829a981..3170e6e8 100644 --- a/src/main/java/com/youlai/boot/system/controller/LogController.java +++ b/src/main/java/com/youlai/boot/system/controller/LogController.java @@ -34,10 +34,10 @@ public class LogController { @Operation(summary = "日志分页列表") @GetMapping("/page") - public PageResult listPagedLogs( + public PageResult getLogPage( LogPageQuery queryParams ) { - Page result = logService.listPagedLogs(queryParams); + Page result = logService.getLogPage(queryParams); return PageResult.success(result); } diff --git a/src/main/java/com/youlai/boot/system/event/UserConnectionEvent.java b/src/main/java/com/youlai/boot/system/event/UserConnectionEvent.java index 8033a2c8..dadea814 100644 --- a/src/main/java/com/youlai/boot/system/event/UserConnectionEvent.java +++ b/src/main/java/com/youlai/boot/system/event/UserConnectionEvent.java @@ -3,11 +3,33 @@ package com.youlai.boot.system.event; import lombok.Getter; import org.springframework.context.ApplicationEvent; + +/** + * 用户连接事件 + * + * @author Ray + * @since 2.3.0 + */ @Getter public class UserConnectionEvent extends ApplicationEvent { + + /** + * 用户名 + */ private final String username; + + /** + * 是否连接 + */ private final boolean connected; + /** + * 用户连接事件 + * + * @param source 事件源 + * @param username 用户名 + * @param connected 是否连接 + */ public UserConnectionEvent(Object source, String username, boolean connected) { super(source); this.username = username; diff --git a/src/main/java/com/youlai/boot/system/mapper/LogMapper.java b/src/main/java/com/youlai/boot/system/mapper/LogMapper.java index a29bc6a8..68bcefe7 100644 --- a/src/main/java/com/youlai/boot/system/mapper/LogMapper.java +++ b/src/main/java/com/youlai/boot/system/mapper/LogMapper.java @@ -28,7 +28,7 @@ public interface LogMapper extends BaseMapper { * @param queryParams * @return */ - Page listPagedLogs(Page page, LogPageQuery queryParams); + Page getLogPage(Page page, LogPageQuery queryParams); /** * 统计浏览数(PV) diff --git a/src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java b/src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java index 07cb686f..0a47b0a1 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java @@ -7,6 +7,12 @@ import lombok.Setter; import java.util.List; +/** + * 访问趋势VO + * + * @author Ray + * @since 2.3.0 + */ @Schema(description = "访问趋势VO") @Getter @Setter diff --git a/src/main/java/com/youlai/boot/system/service/LogService.java b/src/main/java/com/youlai/boot/system/service/LogService.java index ccfece2c..5d80fc3d 100644 --- a/src/main/java/com/youlai/boot/system/service/LogService.java +++ b/src/main/java/com/youlai/boot/system/service/LogService.java @@ -25,7 +25,7 @@ public interface LogService extends IService { * @param queryParams 查询参数 * @return */ - Page listPagedLogs(LogPageQuery queryParams); + Page getLogPage(LogPageQuery queryParams); /** diff --git a/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java index c8887e14..b6befa4d 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java @@ -36,8 +36,8 @@ public class LogServiceImpl extends ServiceImpl * @return */ @Override - public Page listPagedLogs(LogPageQuery queryParams) { - return this.baseMapper.listPagedLogs(new Page<>(queryParams.getPageNum(), queryParams.getPageSize()), + public Page getLogPage(LogPageQuery queryParams) { + return this.baseMapper.getLogPage(new Page<>(queryParams.getPageNum(), queryParams.getPageSize()), queryParams); } diff --git a/src/main/resources/mapper/LogMapper.xml b/src/main/resources/mapper/LogMapper.xml index ca84f4b2..6d7de53b 100644 --- a/src/main/resources/mapper/LogMapper.xml +++ b/src/main/resources/mapper/LogMapper.xml @@ -5,7 +5,7 @@ - SELECT t1.id, t1.module,