From 8db1cff3767c15003a32e8be2e98af0ac0deed66 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 27 Sep 2022 18:54:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/decorate/DataController.java | 4 +-- .../controller/decorate/PagesController.java | 5 +-- .../controller/decorate/TabbarController.java | 7 ++-- .../decorate/IDecorateDataService.java | 7 ++-- .../decorate/IDecoratePageService.java | 5 +-- .../decorate/IDecorateTabbarService.java | 6 ++-- .../impl/DecorateDataServiceImpl.java | 28 +++++++-------- .../impl/DecoratePageServiceImpl.java | 15 ++++---- .../impl/DecorateTabbarServiceImpl.java | 34 +++++++++++-------- .../vo/decorate/DecorateDataArticleVo.java | 17 ++++++++++ .../mdd/admin/vo/decorate/DecoratePageVo.java | 12 +++++++ .../admin/vo/decorate/DecorateTabObjVo.java | 20 +++++++++++ .../admin/vo/decorate/DecorateTabbarVo.java | 14 ++++++++ .../front/controller/UploadController.java | 2 -- 14 files changed, 121 insertions(+), 55 deletions(-) create mode 100644 server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateDataArticleVo.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecoratePageVo.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabObjVo.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabbarVo.java diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DataController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DataController.java index 070f61b1..4c56384b 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DataController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/DataController.java @@ -1,6 +1,7 @@ package com.mdd.admin.controller.decorate; import com.mdd.admin.service.decorate.IDecorateDataService; +import com.mdd.admin.vo.decorate.DecorateDataArticleVo; import com.mdd.common.core.AjaxResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -9,7 +10,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; -import java.util.Map; /** * 装修数据管理 @@ -30,7 +30,7 @@ public class DataController { */ @GetMapping("/article") public AjaxResult article(@RequestParam(defaultValue = "10") Integer limit) { - List> list = iDecorateDataService.article(limit); + List list = iDecorateDataService.article(limit); return AjaxResult.success(list); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/PagesController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/PagesController.java index 0fd309d5..fd31d2b6 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/PagesController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/decorate/PagesController.java @@ -3,6 +3,7 @@ package com.mdd.admin.controller.decorate; import com.mdd.admin.config.aop.Log; import com.mdd.admin.service.decorate.IDecoratePageService; import com.mdd.admin.validate.decorate.DecoratePageParam; +import com.mdd.admin.vo.decorate.DecoratePageVo; import com.mdd.common.core.AjaxResult; import com.mdd.common.validator.annotation.IDMust; import org.springframework.validation.annotation.Validated; @@ -30,8 +31,8 @@ public class PagesController { */ @GetMapping("/detail") public AjaxResult detail(@Validated @IDMust() @RequestParam("id") Integer id) { - Map map = iDecoratePageService.detail(id); - return AjaxResult.success(map); + DecoratePageVo vo = iDecoratePageService.detail(id); + return AjaxResult.success(vo); } /** 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 cbb443e5..4897965e 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 @@ -1,12 +1,11 @@ package com.mdd.admin.controller.decorate; import com.mdd.admin.service.decorate.IDecorateTabbarService; +import com.mdd.admin.vo.decorate.DecorateTabbarVo; import com.mdd.common.core.AjaxResult; -import com.mdd.common.utils.ArrayUtil; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.List; import java.util.Map; /** @@ -27,8 +26,8 @@ public class TabbarController { */ @GetMapping("/detail") public AjaxResult detail() { - Map detail = iDecorateTabbarService.detail(); - return AjaxResult.success(detail); + DecorateTabbarVo vo = iDecorateTabbarService.detail(); + return AjaxResult.success(vo); } /** diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecorateDataService.java b/server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecorateDataService.java index b64dc460..0b793bba 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecorateDataService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecorateDataService.java @@ -1,7 +1,8 @@ package com.mdd.admin.service.decorate; +import com.mdd.admin.vo.decorate.DecorateDataArticleVo; + import java.util.List; -import java.util.Map; /** * 装修数据服务接口类 @@ -13,8 +14,8 @@ public interface IDecorateDataService { * * @author fzr * @param limit 条数 - * @return List> + * @return List */ - List> article(Integer limit); + List article(Integer limit); } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecoratePageService.java b/server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecoratePageService.java index 25af7998..2b13e734 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecoratePageService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/decorate/IDecoratePageService.java @@ -1,6 +1,7 @@ package com.mdd.admin.service.decorate; import com.mdd.admin.validate.decorate.DecoratePageParam; +import com.mdd.admin.vo.decorate.DecoratePageVo; import java.util.Map; @@ -11,9 +12,9 @@ public interface IDecoratePageService { * * @author fzr * @param id 主键 - * @return Map + * @return DecoratePageVo */ - Map detail(Integer id); + DecoratePageVo detail(Integer id); /** * 页面装修保存 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 1a00e26c..ab72468d 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 @@ -1,5 +1,7 @@ package com.mdd.admin.service.decorate; +import com.mdd.admin.vo.decorate.DecorateTabbarVo; + import java.util.List; import java.util.Map; @@ -12,9 +14,9 @@ public interface IDecorateTabbarService { * 底部导航详情 * * @author fzr - * @return Map + * @return DecorateTabbarVo */ - Map detail(); + DecorateTabbarVo detail(); /** * 底部导航保存 diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecorateDataServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecorateDataServiceImpl.java index a3c0e9d3..867930a8 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecorateDataServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecorateDataServiceImpl.java @@ -2,17 +2,17 @@ package com.mdd.admin.service.decorate.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mdd.admin.service.decorate.IDecorateDataService; +import com.mdd.admin.vo.decorate.DecorateDataArticleVo; import com.mdd.common.entity.article.Article; import com.mdd.common.mapper.article.ArticleMapper; import com.mdd.common.utils.TimeUtil; import com.mdd.common.utils.UrlUtil; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; -import java.util.Map; /** * 装修数据服务实现类 @@ -28,30 +28,26 @@ public class DecorateDataServiceImpl implements IDecorateDataService { * * @author fzr * @param limit 条数 - * @return List> + * @return List */ @Override - public List> article(Integer limit) { - List> articleList = new LinkedList<>(); + public List article(Integer limit) { + List
articles = articleMapper.selectList(new QueryWrapper
() .eq("is_show", 1) .eq("is_delete", 0) .orderByDesc("id") .last("limit " + limit)); + List list = new LinkedList<>(); for (Article article : articles) { - Map map = new LinkedHashMap<>(); - map.put("id", article.getId()); - map.put("title", article.getTitle()); - map.put("intro", article.getIntro()); - map.put("summary", article.getSummary()); - map.put("image", UrlUtil.toAbsoluteUrl(article.getImage())); - map.put("author", article.getAuthor()); - map.put("visit", article.getVisit()); - map.put("createTime", TimeUtil.timestampToDate(article.getCreateTime())); - articleList.add(map); + DecorateDataArticleVo vo = new DecorateDataArticleVo(); + BeanUtils.copyProperties(article, vo); + vo.setImage(UrlUtil.toAbsoluteUrl(article.getImage())); + vo.setCreateTime(TimeUtil.timestampToDate(article.getCreateTime())); + list.add(vo); } - return articleList; + return list; } } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecoratePageServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecoratePageServiceImpl.java index 527569b1..720818cb 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecoratePageServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/decorate/impl/DecoratePageServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.mdd.admin.service.decorate.IDecoratePageService; import com.mdd.admin.validate.decorate.DecoratePageParam; +import com.mdd.admin.vo.decorate.DecoratePageVo; import com.mdd.common.entity.decorate.DecoratePage; import com.mdd.common.mapper.decorate.DecoratePageMapper; import com.mdd.common.utils.ToolsUtil; @@ -24,18 +25,18 @@ public class DecoratePageServiceImpl implements IDecoratePageService { * * @author fzr * @param id 主键 - * @return Map + * @return DecoratePageVo */ @Override - public Map detail(Integer id) { + public DecoratePageVo detail(Integer id) { DecoratePage decoratePage = decoratePageMapper.selectById(id); Assert.notNull(decoratePage, "数据不存在!"); - Map map = new LinkedHashMap<>(); - map.put("id", decoratePage.getId()); - map.put("pageType", decoratePage.getPageType()); - map.put("pageData", decoratePage.getPageData()); - return map; + DecoratePageVo vo = new DecoratePageVo(); + vo.setId(decoratePage.getId()); + vo.setPageType(vo.getPageType()); + vo.setPageData(decoratePage.getPageData()); + return vo; } /** 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 93430ddc..063dfa20 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 @@ -3,6 +3,8 @@ 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.admin.vo.decorate.DecorateTabObjVo; +import com.mdd.admin.vo.decorate.DecorateTabbarVo; import com.mdd.common.entity.decorate.DecorateTabbar; import com.mdd.common.mapper.decorate.DecorateTabbarMapper; import com.mdd.common.utils.*; @@ -28,31 +30,33 @@ public class DecorateTabbarServiceImpl implements IDecorateTabbarService { * 底部导航详情 * * @author fzr - * @return Map + * @return DecorateTabbarVo */ @Override - public Map detail() { - Map response = new LinkedHashMap<>(); + public DecorateTabbarVo detail() { + List list = decorateTabbarMapper.selectList( new QueryWrapper() .orderByAsc("id")); - List> tabList = new LinkedList<>(); + List tabList = new LinkedList<>(); for (DecorateTabbar tab: list) { - Map map = new LinkedHashMap<>(); - map.put("id", tab.getId()); - map.put("name", tab.getName()); - map.put("selected", UrlUtil.toAbsoluteUrl(tab.getSelected())); - map.put("unselected", UrlUtil.toAbsoluteUrl(tab.getUnselected())); - map.put("link", tab.getLink()); - map.put("createTime", TimeUtil.timestampToDate(tab.getCreateTime())); - map.put("updateTime", TimeUtil.timestampToDate(tab.getUpdateTime())); - tabList.add(map); + DecorateTabObjVo vo = new DecorateTabObjVo(); + vo.setId(tab.getId()); + vo.setName(tab.getName()); + vo.setSelected(UrlUtil.toAbsoluteUrl(tab.getSelected())); + vo.setUnselected(UrlUtil.toAbsoluteUrl(tab.getUnselected())); + vo.setLink(tab.getLink()); + vo.setCreateTime(TimeUtil.timestampToDate(tab.getCreateTime())); + vo.setUnselected(TimeUtil.timestampToDate(tab.getUpdateTime())); + tabList.add(vo); } String tabbar = ConfigUtil.get("tabbar", "style", "{}"); - response.put("style", ToolsUtil.jsonToMap(tabbar)); - response.put("list", tabList); + + DecorateTabbarVo response = new DecorateTabbarVo(); + response.setStyle(ToolsUtil.jsonToMap(tabbar)); + response.setList(tabList); return response; } diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateDataArticleVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateDataArticleVo.java new file mode 100644 index 00000000..f2fde3cf --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateDataArticleVo.java @@ -0,0 +1,17 @@ +package com.mdd.admin.vo.decorate; + +import lombok.Data; + +@Data +public class DecorateDataArticleVo { + + private Integer id; + private String title; + private String intro; + private String summary; + private String image; + private String author; + private Integer visit; + private String createTime; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecoratePageVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecoratePageVo.java new file mode 100644 index 00000000..e64028ed --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecoratePageVo.java @@ -0,0 +1,12 @@ +package com.mdd.admin.vo.decorate; + +import lombok.Data; + +@Data +public class DecoratePageVo { + + private Integer id; + private Integer pageType; + private String pageData; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabObjVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabObjVo.java new file mode 100644 index 00000000..31bf6c1b --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabObjVo.java @@ -0,0 +1,20 @@ +package com.mdd.admin.vo.decorate; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +@Data +public class DecorateTabObjVo { + + + private Integer id; + private String name; + private String selected; + private String unselected; + private String link; + private String createTime; + private String updateTime; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabbarVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabbarVo.java new file mode 100644 index 00000000..e1fa046a --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/decorate/DecorateTabbarVo.java @@ -0,0 +1,14 @@ +package com.mdd.admin.vo.decorate; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +@Data +public class DecorateTabbarVo { + + private Map style; + private List list; + +} diff --git a/server/like-front/src/main/java/com/mdd/front/controller/UploadController.java b/server/like-front/src/main/java/com/mdd/front/controller/UploadController.java index 9784f1ae..7040011b 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/UploadController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/UploadController.java @@ -29,8 +29,6 @@ public class UploadController { */ @PostMapping("/image") public Object image(HttpServletRequest request) { - - System.out.println(request.getParameter("dir")); MultipartFile multipartFile; try { multipartFile = ((MultipartRequest) request).getFile("file");