From 81224c4013729d74144268d560bba63eab8397a9 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 6 Sep 2022 19:16:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/decorate/TabbarController.java | 9 ++++--- .../decorate/IDecorateTabbarService.java | 6 ++--- .../impl/DecorateTabbarServiceImpl.java | 26 +++++++++++++------ 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/TabbarController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/TabbarController.java index 2ab84a3b..62f3b93a 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/TabbarController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/TabbarController.java @@ -2,6 +2,7 @@ package com.mdd.admin.controller.decorate; import com.mdd.admin.service.decorate.IDecorateTabbarService; import com.mdd.common.core.AjaxResult; +import com.mdd.common.utils.ArrayUtil; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -26,8 +27,8 @@ public class TabbarController { */ @GetMapping("/detail") public Object detail() { - List> list = iDecorateTabbarService.detail(); - return AjaxResult.success(list); + Map detail = iDecorateTabbarService.detail(); + return AjaxResult.success(detail); } /** @@ -38,7 +39,9 @@ public class TabbarController { * @return Object */ @PostMapping("/save") - public Object save(@RequestBody List> params) { + public Object save(@RequestBody Map params) { + System.out.println( ArrayUtil.objectToListAsStr(params.get("list"))); + iDecorateTabbarService.save(params); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecorateTabbarService.java b/server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecorateTabbarService.java index 11fe1b33..1a00e26c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecorateTabbarService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecorateTabbarService.java @@ -12,9 +12,9 @@ public interface IDecorateTabbarService { * 底部导航详情 * * @author fzr - * @return List> + * @return Map */ - List> detail(); + Map detail(); /** * 底部导航保存 @@ -22,6 +22,6 @@ public interface IDecorateTabbarService { * @author fzr * @param params 参数 */ - void save(List> params); + void save(Map params); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecorateTabbarServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecorateTabbarServiceImpl.java index 3dcabdda..df79505d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecorateTabbarServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecorateTabbarServiceImpl.java @@ -1,11 +1,11 @@ package com.mdd.admin.service.decorate.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mdd.admin.service.decorate.IDecorateTabbarService; import com.mdd.common.entity.decorate.DecorateTabbar; import com.mdd.common.mapper.decorate.DecorateTabbarMapper; -import com.mdd.common.utils.TimeUtil; -import com.mdd.common.utils.UrlUtil; +import com.mdd.common.utils.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,15 +28,16 @@ public class DecorateTabbarServiceImpl implements IDecorateTabbarService { * 底部导航详情 * * @author fzr - * @return List> + * @return Map */ @Override - public List> detail() { - List> response = new LinkedList<>(); + public Map detail() { + Map response = new LinkedHashMap<>(); List list = decorateTabbarMapper.selectList( new QueryWrapper() .orderByAsc("id")); + List> tabList = new LinkedList<>(); for (DecorateTabbar tab: list) { Map map = new LinkedHashMap<>(); map.put("id", tab.getId()); @@ -46,8 +47,12 @@ public class DecorateTabbarServiceImpl implements IDecorateTabbarService { map.put("link", tab.getLink()); map.put("createTime", TimeUtil.timestampToDate(tab.getCreateTime())); map.put("updateTime", TimeUtil.timestampToDate(tab.getUpdateTime())); - response.add(map); + tabList.add(map); } + + String tabbar = ConfigUtil.get("tabbar", "style", "{}"); + response.put("style", ToolsUtil.jsonToMap(tabbar)); + response.put("list", tabList); return response; } @@ -59,10 +64,10 @@ public class DecorateTabbarServiceImpl implements IDecorateTabbarService { */ @Override @Transactional - public void save(List> params) { + public void save(Map params) { decorateTabbarMapper.delete(new QueryWrapper().gt("id", 0)); - for (Map item: params) { + for (Map item: ArrayUtil.stringToListAsMapStr(params.get("list").toString())) { DecorateTabbar model = new DecorateTabbar(); model.setName(item.get("name")); model.setSelected(UrlUtil.toRelativeUrl(item.get("selected"))); @@ -72,6 +77,11 @@ public class DecorateTabbarServiceImpl implements IDecorateTabbarService { model.setUpdateTime(System.currentTimeMillis() / 1000); decorateTabbarMapper.insert(model); } + + if (StringUtil.isNotNull(params.get("style"))) { + ConfigUtil.set("tabbar", "style", JSON.toJSONString(params.get("style"))); + } + } }