From 4b1cb74450d178af66b3f87073edb441f6fbc103 Mon Sep 17 00:00:00 2001 From: zepengdev <lzpsmith@outlook.com> Date: Thu, 26 Jun 2025 22:37:43 +0800 Subject: [PATCH] fix: 分页查询的商品信息包含图片和标签信息 --- oying-system/src/main/java/com/oying/modules/security/rest/OnlineController.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/oying-system/src/main/java/com/oying/modules/security/rest/OnlineController.java b/oying-system/src/main/java/com/oying/modules/security/rest/OnlineController.java index c3b988c..174ffdf 100644 --- a/oying-system/src/main/java/com/oying/modules/security/rest/OnlineController.java +++ b/oying-system/src/main/java/com/oying/modules/security/rest/OnlineController.java @@ -2,6 +2,7 @@ import com.oying.modules.security.service.OnlineUserService; import com.oying.modules.security.service.dto.OnlineUserDto; +import com.oying.utils.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -12,6 +13,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; + import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Set; @@ -30,8 +32,8 @@ @ApiOperation("查询在线用户") @GetMapping @PreAuthorize("@el.check()") - public ResponseEntity<PageResult<OnlineUserDto>> queryOnlineUser(String username, Pageable pageable){ - return new ResponseEntity<>(onlineUserService.getAll(username, pageable),HttpStatus.OK); + public ResponseEntity<Object> queryOnlineUser(String username, Pageable pageable) { + return new ResponseEntity<>(R.success(onlineUserService.getAll(username, pageable)), HttpStatus.OK); } @ApiOperation("导出数据") @@ -50,6 +52,6 @@ token = EncryptUtils.desDecrypt(token); onlineUserService.logout(token); } - return new ResponseEntity<>(HttpStatus.OK); + return new ResponseEntity<>(R.success(), HttpStatus.OK); } } -- Gitblit v1.9.3