From b30a70cbaee3e6d1095554e378f5b61f03311c6b Mon Sep 17 00:00:00 2001 From: yang <2119157836@qq.com> Date: Fri, 21 Feb 2025 17:03:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=E7=B2=89=E4=B8=9D=EF=BC=8C?= =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/SysUserAttentionController.java | 6 ++---- .../mcwl/framework/config/SecurityConfig.java | 3 +++ .../java/com/mcwl/resource/domain/vo/PageVo.java | 2 +- .../service/impl/ModelImageServiceImpl.java | 2 +- .../resource/service/impl/ModelServiceImpl.java | 2 +- .../impl/SysUserAttentionServiceImpl.java | 16 +++++++++++++--- .../service/impl/WorkFlowServiceImpl.java | 2 +- 7 files changed, 22 insertions(+), 11 deletions(-) diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/SysUserAttentionController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/SysUserAttentionController.java index bbeba37..2d2e576 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/SysUserAttentionController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/SysUserAttentionController.java @@ -2,13 +2,11 @@ package com.mcwl.web.controller.resource; import com.github.pagehelper.PageInfo; import com.mcwl.common.annotation.RepeatSubmit; -import com.mcwl.common.core.domain.AjaxResult; import com.mcwl.common.core.domain.R; import com.mcwl.common.core.domain.entity.SysUser; import com.mcwl.resource.domain.SysUserInfo; import com.mcwl.resource.domain.vo.PageVo; import com.mcwl.resource.service.SysUserAttentionService; -import com.mcwl.resource.service.impl.SysUserAttentionServiceImpl; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -76,7 +74,7 @@ public class SysUserAttentionController { */ @ApiOperation(value = "查询关注列表") @PostMapping("/selectAttention") - public R> selectAttention(PageVo pageVo){ + public R> selectAttention(@RequestBody PageVo pageVo){ PageInfo sysUserList = sysUserAttentionService.selectAttentionPage(pageVo); @@ -90,7 +88,7 @@ public class SysUserAttentionController { */ @ApiOperation(value = "查询粉丝列表") @PostMapping("/selectToAttention") - public R> selectToAttention(PageVo pageVo){ + public R> selectToAttention(@RequestBody PageVo pageVo){ PageInfo sysUserList = sysUserAttentionService.selectToAttentionPage(pageVo); diff --git a/mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java b/mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java index f91bd60..08931aa 100644 --- a/mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java +++ b/mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java @@ -135,6 +135,9 @@ public class SecurityConfig { "/file/**", "/model/modelSquare", "/model/selectModelById", + "/model/selectByUserIdModel", + "/model/selectByUserIdWorkFlow", + "/model/selectByUserIdImage", "/model/finbyid", "/ModelVersion/finbyid", "/ModelComment/getComment", diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/PageVo.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/PageVo.java index 1e4aad2..df22804 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/PageVo.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/PageVo.java @@ -31,5 +31,5 @@ public class PageVo { @ApiModelProperty(value = "排序") private Integer order; @ApiModelProperty(value = "条件过滤") - private Integer type; + private Long type; } diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java index a7f28bb..55458b8 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java @@ -176,7 +176,7 @@ public class ModelImageServiceImpl extends ServiceImpl page = new Page<>(imagePageRes.getPageNum(), imagePageRes.getPageSize()); if (StringUtils.isEmpty(imagePageRes.getOrderByColumn())) { diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java index 91eb6da..f062e51 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java @@ -159,7 +159,7 @@ public class ModelServiceImpl extends ServiceImpl impl public TableDataInfo listByPage(ModelImagePageRes imagePageRes) { if (Objects.isNull(imagePageRes.getUserId())) { - imagePageRes.setUserId(SecurityUtils.getUserId()); + imagePageRes.setUserId(SecurityUtils.getUserIdMax()); } Page page = new Page<>(imagePageRes.getPageNum(), imagePageRes.getPageSize()); diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java index 1265a39..c2c6816 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java @@ -7,7 +7,6 @@ import com.mcwl.common.core.domain.R; import com.mcwl.common.core.domain.entity.SysUser; import com.mcwl.common.utils.SecurityUtils; import com.mcwl.common.utils.StringUtils; -import com.mcwl.resource.domain.ModelLike; import com.mcwl.resource.domain.SysAdvice; import com.mcwl.resource.domain.SysUserAttention; import com.mcwl.resource.domain.SysUserInfo; @@ -141,8 +140,13 @@ public class SysUserAttentionServiceImpl extends ServiceImpl sysUserList = sysUserMapper.selectUserPage(SecurityUtils.getUserId()); + List sysUserList = sysUserMapper.selectUserPage(pageVo.getType()); return new PageInfo(sysUserList); @@ -154,8 +158,14 @@ public class SysUserAttentionServiceImpl extends ServiceImpl sysUserList = sysUserMapper.selectToUserPage(SecurityUtils.getUserId()); + List sysUserList = sysUserMapper.selectToUserPage(pageVo.getType()); return new PageInfo(sysUserList); diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java index cde7506..a724205 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java @@ -409,7 +409,7 @@ public class WorkFlowServiceImpl extends ServiceImpl i public TableDataInfo listByPage(ModelImagePageRes imagePageRes) { if (Objects.isNull(imagePageRes.getUserId())) { - imagePageRes.setUserId(SecurityUtils.getUserId()); + imagePageRes.setUserId(SecurityUtils.getUserIdMax()); } Page page = new Page<>(imagePageRes.getPageNum(), imagePageRes.getPageSize());