diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelImageCommentController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelImageCommentController.java index d341972..760794a 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelImageCommentController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelImageCommentController.java @@ -12,6 +12,7 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import javax.validation.constraints.NotNull; import java.util.List; @@ -36,7 +37,7 @@ public class ModelImageCommentController { */ @ApiOperation(value = "图片评论发布") @PostMapping("/comment") - public AjaxResult comment(@RequestBody ModelImageCommentRes modelImageCommentRes) { + public AjaxResult comment(@Valid @RequestBody ModelImageCommentRes modelImageCommentRes) { modelImageCommentService.comment(modelImageCommentRes); return AjaxResult.success(); } @@ -46,8 +47,8 @@ public class ModelImageCommentController { */ @ApiOperation(value = "图片评论点赞/取消") @RepeatSubmit - @GetMapping("/commentLike/{commentId}") - public AjaxResult commentLike(@PathVariable @NotNull(message = "评论id不能为空") Long commentId) { + @GetMapping("/commentLike") + public AjaxResult commentLike(@Valid @NotNull(message = "评论id不能为空") Long commentId) { modelImageCommentLikeService.like(commentId); return AjaxResult.success(); } @@ -56,8 +57,8 @@ public class ModelImageCommentController { * 删除图片评论 */ @ApiOperation(value = "删除图片评论") - @GetMapping("/commentDelete/{commentId}") - public AjaxResult commentDelete(@PathVariable @NotNull(message = "评论id不能为空") Long commentId) { + @GetMapping("/commentDelete") + public AjaxResult commentDelete(@Valid @NotNull(message = "评论id不能为空") Long commentId) { modelImageCommentService.removeById(commentId); return AjaxResult.success(); } @@ -66,8 +67,8 @@ public class ModelImageCommentController { * 获取图片评论 */ @ApiOperation(value = "获取图片评论") - @GetMapping("/comment/{imageId}") - public AjaxResult getComment(@PathVariable @NotNull(message = "图片id不能为空") Long imageId) { + @GetMapping("/comment") + public AjaxResult getComment(@Valid @NotNull(message = "图片id不能为空") Long imageId) { List modelImageCommentVoList = modelImageCommentService.getComment(imageId); return AjaxResult.success(modelImageCommentVoList); } diff --git a/mcwl-system/src/main/java/com/mcwl/system/mapper/SysUserMapper.java b/mcwl-system/src/main/java/com/mcwl/system/mapper/SysUserMapper.java index 893f970..1a92c5f 100644 --- a/mcwl-system/src/main/java/com/mcwl/system/mapper/SysUserMapper.java +++ b/mcwl-system/src/main/java/com/mcwl/system/mapper/SysUserMapper.java @@ -138,4 +138,5 @@ public interface SysUserMapper List listByIds(List userIdList); + List selectUserByIds(@Param("userIds") List userIds); } diff --git a/mcwl-system/src/main/java/com/mcwl/system/service/ISysUserService.java b/mcwl-system/src/main/java/com/mcwl/system/service/ISysUserService.java index ff375d9..9a86b2d 100644 --- a/mcwl-system/src/main/java/com/mcwl/system/service/ISysUserService.java +++ b/mcwl-system/src/main/java/com/mcwl/system/service/ISysUserService.java @@ -218,4 +218,5 @@ public interface ISysUserService List listByIds(List userIdList); + List selectUserByIds(List userIds); } diff --git a/mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserServiceImpl.java b/mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserServiceImpl.java index 35629da..62ebc58 100644 --- a/mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserServiceImpl.java +++ b/mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserServiceImpl.java @@ -33,6 +33,7 @@ import org.springframework.util.CollectionUtils; import javax.validation.Validator; import java.security.SecureRandom; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -674,4 +675,9 @@ public class SysUserServiceImpl implements ISysUserService return sb.toString(); } + + @Override + public List selectUserByIds(List userIds) { + return userMapper.selectUserByIds(userIds); + } } diff --git a/mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml b/mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml index dbf73a7..ef7cc95 100644 --- a/mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -167,6 +167,14 @@ + + insert into sys_user( user_id,