From 067546725a07d08e0346ebf3a410d481e97e5730 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Sat, 12 Nov 2022 21:49:19 +0800 Subject: [PATCH] 修改 --- src/main/java/com/xcong/farmer/cms/core/handler/AdDataParserHandler.java | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/xcong/farmer/cms/core/handler/AdDataParserHandler.java b/src/main/java/com/xcong/farmer/cms/core/handler/AdDataParserHandler.java index 402e032..2e4604d 100644 --- a/src/main/java/com/xcong/farmer/cms/core/handler/AdDataParserHandler.java +++ b/src/main/java/com/xcong/farmer/cms/core/handler/AdDataParserHandler.java @@ -1,5 +1,6 @@ package com.xcong.farmer.cms.core.handler; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.xcong.farmer.cms.core.node.AttrNode; import com.xcong.farmer.cms.core.tag.data.AdData; @@ -9,6 +10,7 @@ import com.xcong.farmer.cms.modules.system.mapper.CmsAdInfoMapper; import com.xcong.farmer.cms.utils.SpringContextHolder; +import java.util.ArrayList; import java.util.List; /** @@ -26,9 +28,34 @@ Ad param = (Ad) attrNode.getParam(); if (StrUtil.isNotBlank(param.getGroupId())) { List<CmsAdInfoEntity> ads = adInfoMapper.selectByGroupIdAndCompanyId(Long.parseLong(param.getGroupId()), companyId); - } else { + if (CollUtil.isEmpty(ads)) { + attrNode.setData(new AdData()); + } else { + int i = 1; + List<AdData> adDataList = new ArrayList<>(); + for (CmsAdInfoEntity ad : ads) { + adDataList.add(entityToData(ad, i)); + } + + attrNode.setData(adDataList); + } + } else { + CmsAdInfoEntity ad = adInfoMapper.selectById(param.getId()); + attrNode.setData(entityToData(ad, 1)); + } + } + + private AdData entityToData(CmsAdInfoEntity entity, int index) { + AdData adData = new AdData(); + adData.setIndex(index); + + if (entity.getType() == 1) { + adData.setChildren(StrUtil.split(entity.getValue(), ',')); + } else { + adData.setData(entity.getValue()); } + return adData; } } -- Gitblit v1.9.1