From ec0c8aa32a7dcf7cce83408ca026e7232bac48cb Mon Sep 17 00:00:00 2001
From: yang <2119157836@qq.com>
Date: Tue, 11 Mar 2025 17:27:20 +0800
Subject: [PATCH] =?UTF-8?q?refactor(mcwl):=20=E8=B0=83=E6=95=B4=E4=BD=9C?=
 =?UTF-8?q?=E5=93=81=E7=82=B9=E8=B5=9E=E5=8A=9F=E8=83=BD=E5=92=8C=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mcwl/common/constant/HttpStatus.java |  5 +++++
 .../web/exception/GlobalExceptionHandler.java          |  3 +++
 .../main/java/com/mcwl/resource/domain/WorkFlow.java   |  2 +-
 .../resource/service/impl/WorkFlowLikeServiceImpl.java | 10 +++++-----
 .../resource/service/impl/WorkFlowServiceImpl.java     |  1 -
 .../main/resources/mapper/resource/WorkFlowMapper.xml  |  2 +-
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/mcwl-common/src/main/java/com/mcwl/common/constant/HttpStatus.java b/mcwl-common/src/main/java/com/mcwl/common/constant/HttpStatus.java
index bc0bfd9..879ba99 100644
--- a/mcwl-common/src/main/java/com/mcwl/common/constant/HttpStatus.java
+++ b/mcwl-common/src/main/java/com/mcwl/common/constant/HttpStatus.java
@@ -91,4 +91,9 @@ public class HttpStatus
      * 系统警告消息
      */
     public static final int WARN = 601;
+
+    /**
+     * 统一展示错误信息
+     */
+    public static final int SHOW_ERROR_MSG = 12202;
 }
diff --git a/mcwl-framework/src/main/java/com/mcwl/framework/web/exception/GlobalExceptionHandler.java b/mcwl-framework/src/main/java/com/mcwl/framework/web/exception/GlobalExceptionHandler.java
index 4d0e74e..8d14f8e 100644
--- a/mcwl-framework/src/main/java/com/mcwl/framework/web/exception/GlobalExceptionHandler.java
+++ b/mcwl-framework/src/main/java/com/mcwl/framework/web/exception/GlobalExceptionHandler.java
@@ -85,6 +85,9 @@ public class GlobalExceptionHandler {
     public AjaxResult handleServiceException(ServiceException e, HttpServletRequest request) {
         log.error(e.getMessage(), e);
         Integer code = e.getCode();
+        if (e.getCause() instanceof RedisCommandTimeoutException) {
+            return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG, "网络超时，请稍后重试");
+        }
         return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage());
     }
 
diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlow.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlow.java
index 807d785..801cf32 100644
--- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlow.java
+++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlow.java
@@ -159,7 +159,7 @@ public class WorkFlow {
      * 作品点赞数量
      */
     @ApiModelProperty(value = "作品点赞数量")
-    private Integer likeCount = 0;
+    private Integer likeNum = 0;
 
 
     /**
diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowLikeServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowLikeServiceImpl.java
index c1f2c01..fc484b7 100644
--- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowLikeServiceImpl.java
+++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowLikeServiceImpl.java
@@ -60,12 +60,12 @@ public class WorkFlowLikeServiceImpl extends ServiceImpl<WorkFlowLikeMapper, Wor
         if (Objects.nonNull(workFlowLike)) {
             if (Objects.equals(workFlowLike.getDelFlag(), "0")) {
                 workFlowLike.setDelFlag("2");
-                int likeCount = workFlow.getLikeCount() - 1;
+                int likeCount = workFlow.getLikeNum() - 1;
                 likeCount = Math.max(likeCount, 0);
-                workFlow.setLikeCount(likeCount);
+                workFlow.setLikeNum(likeCount);
             } else {
                 workFlowLike.setDelFlag("0");
-                workFlow.setLikeCount(workFlow.getLikeCount() + 1);
+                workFlow.setLikeNum(workFlow.getLikeNum() + 1);
                 this.addLikeAdvice(workFlow);
             }
             // 更新点赞记录
@@ -82,7 +82,7 @@ public class WorkFlowLikeServiceImpl extends ServiceImpl<WorkFlowLikeMapper, Wor
         baseMapper.insert(workFlowLike);
 
         // 更新图片点赞数
-        workFlow.setLikeCount(workFlow.getLikeCount() + 1);
+        workFlow.setLikeNum(workFlow.getLikeNum() + 1);
         workFlowMapper.updateById(workFlow);
 
         this.addLikeAdvice(workFlow);
@@ -119,7 +119,7 @@ public class WorkFlowLikeServiceImpl extends ServiceImpl<WorkFlowLikeMapper, Wor
                 continue;
             }
             workFlowLikeVo.setCoverPath(workFlow.getCoverPath());
-            workFlowLikeVo.setLikeNum(workFlow.getLikeCount());
+            workFlowLikeVo.setLikeNum(workFlow.getLikeNum());
 
             modelLikeVoList.add(workFlowLikeVo);
         }
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 79a76c1..7fe5bde 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
@@ -395,7 +395,6 @@ public class WorkFlowServiceImpl extends ServiceImpl<WorkFlowMapper, WorkFlow> i
             imagePageRes.setOrderByColumn("create_time");
         }
         // 设置排序
-        // 设置排序
         List<OrderItem> orderItemList = new ArrayList<>();
         orderItemList.add(OrderItem.desc("is_top"));
         orderItemList.add(OrderItem.desc(imagePageRes.getOrderByColumn()));
diff --git a/mcwl-resource/src/main/resources/mapper/resource/WorkFlowMapper.xml b/mcwl-resource/src/main/resources/mapper/resource/WorkFlowMapper.xml
index 2d96f8e..65afa65 100644
--- a/mcwl-resource/src/main/resources/mapper/resource/WorkFlowMapper.xml
+++ b/mcwl-resource/src/main/resources/mapper/resource/WorkFlowMapper.xml
@@ -44,7 +44,7 @@
     </select>
 
     <select id="workFlowList" resultType="com.mcwl.resource.domain.response.ResponseWorkFlow">
-        SELECT id,w.user_id,workflow_name,type,use_number,download_number,cover_path,like_count,nick_name,avatar
+        SELECT id,w.user_id,workflow_name,type,use_number,download_number,cover_path,like_num,nick_name,avatar
         FROM work_flow as w
         LEFT JOIN sys_user u
         on w.user_id = u.user_id