diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ComponentConvert.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ComponentConvert.java index f3eb90c76..77bc56425 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ComponentConvert.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ComponentConvert.java @@ -1,9 +1,11 @@ package com.luban.api.convert; +import cn.hutool.json.JSONUtil; import com.luban.api.dto.H5ComponentDTO; import com.luban.api.entity.H5Component; import com.luban.api.vo.H5ComponentVO; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; /** * H5 组件转换类 @@ -30,5 +32,20 @@ public interface H5ComponentConvert { * @param dto 数据传输对象 * @return 实体 */ + @Mapping(target = "content", source = "content", qualifiedByName = "mapToJson") H5Component toEntity(H5ComponentDTO dto); + + /** + * 将 Map 转换为 JSON 字符串 + * + * @param map Map 对象 + * @return JSON 字符串 + */ + @org.mapstruct.Named("mapToJson") + static String mapToJson(java.util.Map map) { + if (map == null) { + return null; + } + return JSONUtil.toJsonStr(map); + } } diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Component.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Component.java index dc8855526..ad985ca83 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Component.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Component.java @@ -52,7 +52,7 @@ public class H5Component { /** * 组件完整配置数据 (JSON 格式) */ - private Map content; + private String content; /** * 使用次数统计