From c2f0ada4f12d1d3ba9aeb1f6c26f7f2241358ce3 Mon Sep 17 00:00:00 2001
From: yang <2119157836@qq.com>
Date: Tue, 14 Jan 2025 19:06:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(resource):=20=E4=BF=AE=E5=A4=8D=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E5=9B=BE=E7=89=87=E6=A0=87=E7=AD=BE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修正图片标签的字典常量名称
- 实现图片标签的字典值转换
- 初始化图片标签列表
---
 .../java/com/mcwl/common/constant/DictConstants.java   |  2 +-
 .../java/com/mcwl/resource/domain/vo/ModelImageVo.java |  3 ++-
 .../resource/service/impl/ModelImageServiceImpl.java   | 10 +++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/mcwl-common/src/main/java/com/mcwl/common/constant/DictConstants.java b/mcwl-common/src/main/java/com/mcwl/common/constant/DictConstants.java
index 8820ade..304c39e 100644
--- a/mcwl-common/src/main/java/com/mcwl/common/constant/DictConstants.java
+++ b/mcwl-common/src/main/java/com/mcwl/common/constant/DictConstants.java
@@ -49,6 +49,6 @@ public class DictConstants {
     /**
      * 图片标签
      */
-    public static final String IMAGE_LABLE = "image_lable";
+    public static final String IMAGE_LABEL = "image_label";
 
 }
diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/ModelImageVo.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/ModelImageVo.java
index a76e53f..a05c70d 100644
--- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/ModelImageVo.java
+++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/ModelImageVo.java
@@ -2,6 +2,7 @@ package com.mcwl.resource.domain.vo;
 
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -49,7 +50,7 @@ public class ModelImageVo {
     /**
      * 图片标签（多个，切割）
      */
-    private List<String> tags;
+    private List<String> tags = new ArrayList<>();
     /**
      * 描述信息（最多500）
      */
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 615d671..e937f9a 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
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mcwl.common.constant.DictConstants;
 import com.mcwl.common.constant.HttpStatus;
 import com.mcwl.common.core.domain.entity.SysDictData;
 import com.mcwl.common.core.domain.entity.SysUser;
@@ -22,6 +23,7 @@ import com.mcwl.resource.domain.vo.ModelImageVo;
 import com.mcwl.resource.mapper.ModelImageCommentMapper;
 import com.mcwl.resource.mapper.ModelImageMapper;
 import com.mcwl.resource.service.ModelImageService;
+import com.mcwl.system.init.DictInit;
 import com.mcwl.system.service.ISysDictDataService;
 import com.mcwl.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
@@ -210,13 +212,15 @@ public class ModelImageServiceImpl extends ServiceImpl<ModelImageMapper, ModelIm
         BeanUtil.copyProperties(modelImage, modelImageVo);
 
         // 设置标签
-        List<String> tags = new ArrayList<>();
+        List<String> tagList = new ArrayList<>();
         if (StringUtils.isNotEmpty(modelImage.getTags())) {
             String[] tagValueList = modelImage.getTags().split(",");
-            for (String tagIdStr : tagValueList) {
+            for (String tagValue : tagValueList) {
+                String dictLabel = DictInit.getDictValue(DictConstants.IMAGE_LABEL, tagValue);
+                tagList.add(dictLabel);
             }
         }
-        modelImageVo.setTags(tags);
+        modelImageVo.setTags(tagList);
 
         SysUser sysUser = sysUserService.selectUserById(modelImage.getUserId());
         modelImageVo.setUserId(SecurityUtils.getUserId());