gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.4.0】主题业务使用fastjson2进行map转换

pull/54/head
ye_star 2023-04-11 13:40:55 +08:00
parent 110dd2e233
commit b9eab27a1c
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/factory/DefaultThemeFactory.java
View File

@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.system.modular.theme.factory;
import cn.hutool.core.util.StrUtil;
import cn.stylefeng.roses.kernel.system.modular.theme.pojo.DefaultTheme;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import lombok.Data;
import java.beans.IntrospectionException;

15
kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java
View File

@ -33,8 +33,9 @@ import cn.stylefeng.roses.kernel.system.modular.theme.service.SysThemeService;
import cn.stylefeng.roses.kernel.system.modular.theme.service.SysThemeTemplateFieldService;
import cn.stylefeng.roses.kernel.system.modular.theme.service.SysThemeTemplateRelService;
import cn.stylefeng.roses.kernel.system.modular.theme.service.SysThemeTemplateService;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -110,7 +111,8 @@ public class SysThemeServiceImpl extends ServiceImpl<SysThemeMapper, SysTheme> i
// 删除保存的图片
String themeValue = sysTheme.getThemeValue();
Map<String, String> themeMap = JSON.parseObject(themeValue, Map.class);
Map<String, String> themeMap = JSON.parseObject(themeValue, new TypeReference<Map<String, String>>() {
});
// 获取map的key
List<String> themeKeys = new ArrayList<>(themeMap.keySet());
@ -185,14 +187,15 @@ public class SysThemeServiceImpl extends ServiceImpl<SysThemeMapper, SysTheme> i
// 设置动态属性表单
String themeValueJson = sysTheme.getThemeValue();
JSONObject jsonObject = JSON.parseObject(themeValueJson);
sysTheme.setDynamicForm(jsonObject.getInnerMap());
Map<String, Object> jsonObject = JSON.parseObject(themeValueJson, new TypeReference<Map<String, Object>>() {
});
sysTheme.setDynamicForm(jsonObject);
// 遍历表单属性，找到所有文件类型的，组装文件的图片和名称等信息
HashMap<String, AntdvFileInfo[]> tempFileList = new HashMap<>();
for (Map.Entry<String, Object> keyValues : jsonObject.entrySet()) {
String key = keyValues.getKey();
String value = jsonObject.getString(key);
String value = (String) jsonObject.get(key);
// 判断是否是文件类型
boolean keyFileFlag = sysThemeTemplateFieldService.getKeyFileFlag(key);
if (keyFileFlag) {