From 484cfdf02da7b58da5933553c6ccdf265c57b86d Mon Sep 17 00:00:00 2001
From: haotian <2421912570@qq.com>
Date: Wed, 15 Jan 2025 17:12:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E5=A4=9A--=E4=BF=AE=E6=94=B9--?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=82=B9=E8=B5=9E=E4=BF=AE=E6=94=B9=E7=82=B9?=
 =?UTF-8?q?=E8=B5=9E=E9=80=BB=E8=BE=91=E4=BB=A5=E9=85=8D=E5=90=88=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E7=82=B9=E8=B5=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/app/AppSystemController.java   | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

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 84843fed..1d7712d7 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
@@ -1243,11 +1243,12 @@ public class AppSystemController extends BaseController {
         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);
+            //--------------------------------------测试时直接注释掉-------------------------------------------------
+//            LocalDate now = LocalDate.now();
+//            long daysBetween = ChronoUnit.DAYS.between(now, userPublishWorkSourceListDto.getEndTime());
+//            userPublishWorkSourceListDto.setrDays(daysBetween);
+            //--------------------------------------测试时直接注释掉end-----------------------------------------------
+            userPublishWorkSourceListDto.setrDays(0L);
         }
         //-----------------------------------查看该作品所属资源位end---------------------------------------------
 
@@ -1592,7 +1593,6 @@ public class AppSystemController extends BaseController {
         Long userId = getUserId();
         // 不支持重复点赞
 
-
         // 新增点赞记录
         SysUserLike sysUserLike = new SysUserLike();
         sysUserLike.setUserId(userId);
@@ -1600,15 +1600,24 @@ public class AppSystemController extends BaseController {
         // 点赞发布作品
         sysUserLike.setTargetType("1");
 
+
         List<SysUserLike> sysUserLikeList = sysUserLikeService.selectSysUserLikeList(sysUserLike);
-        if(sysUserLikeList != null && sysUserLikeList.size() > 0){
+        if(sysUserLikeList != null && sysUserLikeList.size() > 0 && sysUserLikeList.get(0).getStatus().equals("0")){
             return error("请不要重复点赞");
         }
 
+        // 已有点赞数据,但取消点赞了
+        if(sysUserLikeList != null && sysUserLikeList.size() > 0){
+            System.out.println("sysUserLikeList : "+sysUserLikeList.size());
+            sysUserLike = sysUserLikeList.get(0);
+            sysUserLike.setStatus("0");
+            sysUserLikeService.updateSysUserLike(sysUserLike);
+        }
+        else{
+            sysUserLikeService.insertSysUserLike(sysUserLike);
+        }
 
 
-        sysUserLikeService.insertSysUserLike(sysUserLike);
-
 
 
         // 作品点赞数加1
@@ -1643,6 +1652,8 @@ public class AppSystemController extends BaseController {
         return getDataTable(userWorkList);
     }
 
+    // 取消点赞
+
     // 更多--查看发布作品详情
     @GetMapping("/getMoreUserPublishWorkDetail/{workId}")
     public AjaxResult getMoreUserPublishWorkDetail(@PathVariable("workId") Long workId)