From 8ef328dc74c88bc4f75c895976e31b366e50ea05 Mon Sep 17 00:00:00 2001 From: haotian <2421912570@qq.com> Date: Tue, 14 Jan 2025 16:32:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E5=A4=9A--=E6=B7=BB=E5=8A=A0--?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=8F=91=E5=B8=83=E4=BD=9C=E5=93=81=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/AppSystemController.java | 77 +++++++++++++++++++ .../domain/dto/UserPublishWorkDetailDto.java | 19 +++++ 2 files changed, 96 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java index 248f0961..84843fed 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java @@ -106,6 +106,9 @@ public class AppSystemController extends BaseController { @Autowired private IOrderInfoService orderInfoService; + @Autowired + private ISysUserLikeService sysUserLikeService; + /** * 账号密码登录 @@ -1587,12 +1590,34 @@ public class AppSystemController extends BaseController { public AjaxResult addLike(@PathVariable("workId") Long workId) { Long userId = getUserId(); + // 不支持重复点赞 + + + // 新增点赞记录 + SysUserLike sysUserLike = new SysUserLike(); + sysUserLike.setUserId(userId); + sysUserLike.setTargetId(workId); + // 点赞发布作品 + sysUserLike.setTargetType("1"); + + List sysUserLikeList = sysUserLikeService.selectSysUserLikeList(sysUserLike); + if(sysUserLikeList != null && sysUserLikeList.size() > 0){ + return error("请不要重复点赞"); + } + + + + sysUserLikeService.insertSysUserLike(sysUserLike); + + // 作品点赞数加1 UserWork userWork = userWorkService.selectUserWorkByWorkId(workId); userWork.setReceiveRockets(userWork.getReceiveRockets() + 1); userWorkService.updateUserWork(userWork); + + // 发送点赞消息 SysUserNotification sysUserNotification = new SysUserNotification(); sysUserNotification.setSenderId(userId); @@ -1618,6 +1643,58 @@ public class AppSystemController extends BaseController { return getDataTable(userWorkList); } + // 更多--查看发布作品详情 + @GetMapping("/getMoreUserPublishWorkDetail/{workId}") + public AjaxResult getMoreUserPublishWorkDetail(@PathVariable("workId") Long workId) + { + UserPublishWorkDetailDto userPublishWorkDetail = userWorkService.getUserPublishWorkDetail(workId); + //----------------------------------查看该作品所属的资源位---------------------------------------------- + List sourceList = sysSourceService.getUserPublishWorkSourceList(workId); + + for(UserPublishWorkSourceListDto userPublishWorkSourceListDto: sourceList){ + userPublishWorkSourceListDto.setSource(userPublishWorkSourceListDto.getCity()+userPublishWorkSourceListDto.getScenic()+userPublishWorkSourceListDto.getPart()+userPublishWorkSourceListDto.getCoordinate()); + + //------------------------- 测试版本先注释掉-------------------------------------- +// LocalDate now = LocalDate.now(); +// long daysBetween = ChronoUnit.DAYS.between(now, userPublishWorkSourceListDto.getEndTime()); +// userPublishWorkSourceListDto.setrDays(daysBetween); + //---------------------------测试版本先注释掉end---------------------------------- + userPublishWorkSourceListDto.setrDays(0L); + } + //-----------------------------------查看该作品所属资源位end--------------------------------------------- + + //----------------------------------查看是否关注该用户----------------------------------------------- + SysUserFollow userFollow = new SysUserFollow(); + userFollow.setUserId(getUserId()); + userFollow.setFollowedUserId(userPublishWorkDetail.getUserId()); + userFollow.setStatus("0"); + List userFollowList = userFollowService.selectSysUserFollowList(userFollow); + if(userFollowList.size() > 0){ + // 以关注 + userPublishWorkDetail.setIsFollow("1"); + }else{ + userPublishWorkDetail.setIsFollow("0"); + } + //----------------------------------查看是否关注该用户end----------------------------------------------- + + //----------------------------------查看是否点赞该作品-------------------------------------------------- + SysUserLike sysUserLike = new SysUserLike(); + sysUserLike.setUserId(getUserId()); + sysUserLike.setTargetId(workId); + sysUserLike.setTargetType("1"); + List sysUserLikeList = sysUserLikeService.selectSysUserLikeList(sysUserLike); + if(sysUserLikeList.size() > 0){ + // 已点赞 + userPublishWorkDetail.setIsAddLike("1"); + }else{ + userPublishWorkDetail.setIsAddLike("0"); + } + //----------------------------------查看是否点赞该作品end----------------------------------------------- + + userPublishWorkDetail.setSourceList(sourceList); + return success(userPublishWorkDetail); + } + @GetMapping("/getMessage") public AjaxResult getMessage() { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserPublishWorkDetailDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserPublishWorkDetailDto.java index 575e3006..9da4fb15 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserPublishWorkDetailDto.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UserPublishWorkDetailDto.java @@ -23,6 +23,9 @@ public class UserPublishWorkDetailDto { private String nickName; private String avatar; + private String isFollow; + private String isAddLike; + private List sourceList; @@ -117,6 +120,22 @@ public class UserPublishWorkDetailDto { this.sourceList = sourceList; } + public String getIsFollow() { + return isFollow; + } + + public void setIsFollow(String isFollow) { + this.isFollow = isFollow; + } + + public String getIsAddLike() { + return isAddLike; + } + + public void setIsAddLike(String isAddLike) { + this.isAddLike = isAddLike; + } +