From b8997b80622940473d05829112f20b0a89c313c0 Mon Sep 17 00:00:00 2001 From: damonyuan <404054358@qq.com> Date: Mon, 14 Oct 2024 00:35:03 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E5=A2=9E=E5=8A=A0front=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdd/front/controller/IndexController.java | 2 +- .../mdd/front/controller/PcController.java | 36 +++++----- .../front/service/impl/IndexServiceImpl.java | 57 ++++++---------- .../mdd/front/service/impl/PcServiceImpI.java | 65 +++++++++---------- 4 files changed, 68 insertions(+), 92 deletions(-) diff --git a/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java b/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java index ba2a2950..7ef2ac57 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; @RestController -@RequestMapping("/api/pc") +@RequestMapping("/api/index") @Api(tags = "主页管理") public class IndexController { diff --git a/server/like-front/src/main/java/com/mdd/front/controller/PcController.java b/server/like-front/src/main/java/com/mdd/front/controller/PcController.java index 8cb89af5..6f05d54b 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/PcController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/PcController.java @@ -24,24 +24,24 @@ import java.util.Map; @Api(tags = "电脑管理") public class PcController { -// @Resource -// IPcService iPcService; -// -// @NotLogin -// @GetMapping("/index") -// @ApiOperation(value="主页数据") -// public AjaxResult> index() { -// Map index = iPcService.index(); -// return AjaxResult.success(index); -// } -// -// @NotLogin -// @GetMapping("/getConfig") -// @ApiOperation(value="公共配置") -// public AjaxResult> getConfig() { -// Map config = iPcService.getConfig(); -// return AjaxResult.success(config); -// } + @Resource + IPcService iPcService; + + @NotLogin + @GetMapping("/index") + @ApiOperation(value="主页数据") + public AjaxResult> index() { + Map index = iPcService.index(); + return AjaxResult.success(index); + } + + @NotLogin + @GetMapping("/config") + @ApiOperation(value="公共配置") + public AjaxResult> getConfig() { + Map config = iPcService.getConfig(); + return AjaxResult.success(config); + } // // @NotLogin // @GetMapping("/articleCenter") diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java index 4bcc2245..0bfcb1fe 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java @@ -109,52 +109,33 @@ public class IndexServiceImpl implements IIndexService { public Map config() { Map response = new LinkedHashMap<>(); - // 底部导航 - List> tabs = new LinkedList<>(); - List decorateTabbars = decorateTabbarMapper.selectList(new QueryWrapper().orderByAsc("id")); - for (DecorateTabbar tab: decorateTabbars) { - Map map = new LinkedHashMap<>(); - map.put("name", tab.getName()); - map.put("selected", UrlUtils.toAbsoluteUrl(tab.getSelected())); - map.put("unselected", UrlUtils.toAbsoluteUrl(tab.getUnselected())); - map.put("link", tab.getLink()); - tabs.add(map); - } - - // 导航颜色 - String tabbarStyle = ConfigUtils.get("tabbar", "style", "{}"); - // 登录配置 Map loginMap = new LinkedHashMap<>(); Map loginConfig = ConfigUtils.get("login"); - loginMap.put("loginWay", ListUtils.stringToListAsInt(loginConfig.getOrDefault("loginWay", ""), ",")); - loginMap.put("forceBindMobile", Integer.parseInt(loginConfig.getOrDefault("forceBindMobile", "0"))); - loginMap.put("openAgreement", Integer.parseInt(loginConfig.getOrDefault("openAgreement", "0"))); - loginMap.put("openOtherAuth", Integer.parseInt(loginConfig.getOrDefault("openOtherAuth", "0"))); - loginMap.put("autoLoginAuth", ListUtils.stringToListAsInt(loginConfig.getOrDefault("autoLoginAuth", ""), ",")); + // 登录方式 + loginMap.put("login_way", ListUtils.stringToListAsInt(loginConfig.getOrDefault("login_way", ""), ",")); + // 注册强制绑定手机 + loginMap.put("coerce_mobile", Integer.parseInt(loginConfig.getOrDefault("coerce_mobile", "0"))); + // 政策协议 + loginMap.put("login_agreement", Integer.parseInt(loginConfig.getOrDefault("login_agreement", "0"))); + // 第三方登录 开关 + loginMap.put("third_auth", Integer.parseInt(loginConfig.getOrDefault("third_auth", "0"))); + // 微信授权登录 + loginMap.put("wechat_auth", Integer.parseInt(loginConfig.getOrDefault("wechat_auth", "0"))); + // qq授权登录 + loginMap.put("qq_auth", Integer.parseInt(loginConfig.getOrDefault("qq_auth", "0"))); + + + Map websiteConfig = ConfigUtils.get("copyright"); + String copyright = websiteConfig.getOrDefault("config", "[]"); + List> copyrightMap = ListUtils.stringToListAsMapStr(copyright); // 网址信息 - Map websiteMap = new LinkedHashMap<>(); - Map websiteConfig = ConfigUtils.get("website"); - websiteMap.put("name", websiteConfig.getOrDefault("shopName", "LikeAdmin")); - websiteMap.put("logo", UrlUtils.toAbsoluteUrl(websiteConfig.getOrDefault("shopLogo", ""))); - // H5配置 - Map h5Map = new LinkedHashMap<>(); - Map h5Config = ConfigUtils.get("h5_channel"); - h5Map.put("status", Integer.parseInt(h5Config.getOrDefault("status", "0"))); - h5Map.put("close", Integer.parseInt(h5Config.getOrDefault("close", "0"))); - h5Map.put("url", h5Config.getOrDefault("url", "0")); - h5Map.put("accessLink", RequestUtils.uri()); - - // 响应数据 - response.put("version", GlobalConfig.version); + response.put("admin_url", ""); + response.put("copyright", copyrightMap); response.put("domain", UrlUtils.domain()); - response.put("style", MapUtils.jsonToMap(tabbarStyle)); - response.put("tabbar", tabs); response.put("login", loginMap); - response.put("website", websiteMap); - response.put("h5", h5Map); return response; } diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/PcServiceImpI.java b/server/like-front/src/main/java/com/mdd/front/service/impl/PcServiceImpI.java index ed04dc41..47398d66 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/PcServiceImpI.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/PcServiceImpI.java @@ -1,5 +1,6 @@ package com.mdd.front.service.impl; +import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.mdd.common.config.GlobalConfig; import com.mdd.common.entity.article.ArticleCate; @@ -52,7 +53,7 @@ public class PcServiceImpI implements IPcService { //全部资讯 List
articlesAll = articleMapper.selectList(new QueryWrapper
() .eq("is_show", 1) - .eq("is_delete", 0) + .isNull("delete_time") .orderByDesc("sort") .orderByDesc("id") .last("limit 5")); @@ -74,7 +75,7 @@ public class PcServiceImpI implements IPcService { //最新资讯 List
articlesNew = articleMapper.selectList(new QueryWrapper
() .eq("is_show", 1) - .eq("is_delete", 0) + .isNull("delete_time") .orderByDesc("id") .last("limit 7")); List> articlesNewList = new LinkedList<>(); @@ -95,8 +96,8 @@ public class PcServiceImpI implements IPcService { //热门资讯 List
articlesHot = articleMapper.selectList(new QueryWrapper
() .eq("is_show", 1) - .eq("is_delete", 0) - .orderByDesc("visit") + .isNull("delete_time") + .orderByDesc("click_actual") .last("limit 7")); List> articlesHostList = new LinkedList<>(); for (Article article : articlesHot) { @@ -107,7 +108,7 @@ public class PcServiceImpI implements IPcService { map.put("summary", article.getAbstractField()); map.put("image", UrlUtils.toAbsoluteUrl(article.getImage())); map.put("author", article.getAuthor()); - map.put("visit", article.getClickActual()); + map.put("click_actual", article.getClickActual()); map.put("sort", article.getSort()); map.put("createTime", TimeUtils.timestampToDate(article.getCreateTime())); articlesHostList.add(map); @@ -128,44 +129,38 @@ public class PcServiceImpI implements IPcService { */ @Override public Map getConfig() { - Map config = new LinkedHashMap<>(); + Map response = new LinkedHashMap<>(); // 登录配置 Map loginMap = new LinkedHashMap<>(); Map loginConfig = ConfigUtils.get("login"); - loginMap.put("loginWay", ListUtils.stringToListAsInt(loginConfig.getOrDefault("loginWay", ""), ",")); - loginMap.put("forceBindMobile", Integer.parseInt(loginConfig.getOrDefault("forceBindMobile", "0"))); - loginMap.put("openOtherAuth", Integer.parseInt(loginConfig.getOrDefault("openOtherAuth", "0"))); - loginMap.put("openAgreement", Integer.parseInt(loginConfig.getOrDefault("openAgreement", "0"))); - loginMap.put("autoLoginAuth", ListUtils.stringToListAsInt(loginConfig.getOrDefault("autoLoginAuth", ""), ",")); + // 登录方式 + loginMap.put("login_way", JSONArray.parseArray(loginConfig.getOrDefault("login_way", "[]"))); + // 注册强制绑定手机 + loginMap.put("coerce_mobile", Integer.parseInt(loginConfig.getOrDefault("coerce_mobile", "0"))); + // 政策协议 + loginMap.put("login_agreement", Integer.parseInt(loginConfig.getOrDefault("login_agreement", "0"))); + // 第三方登录 开关 + loginMap.put("third_auth", Integer.parseInt(loginConfig.getOrDefault("third_auth", "0"))); + // 微信授权登录 + loginMap.put("wechat_auth", Integer.parseInt(loginConfig.getOrDefault("wechat_auth", "0"))); + // qq授权登录 + loginMap.put("qq_auth", Integer.parseInt(loginConfig.getOrDefault("qq_auth", "0"))); - // 网址信息 - Map websiteMap = new LinkedHashMap<>(); - Map websiteConfig = ConfigUtils.get("website"); - String copyright = websiteConfig.getOrDefault("copyright", "[]"); + + Map websiteConfig = ConfigUtils.get("copyright"); + String copyright = websiteConfig.getOrDefault("config", "[]"); List> copyrightMap = ListUtils.stringToListAsMapStr(copyright); - websiteMap.put("shopName", websiteConfig.getOrDefault("shopName", "LikeAdmin")); - websiteMap.put("shopLogo", UrlUtils.toAbsoluteUrl(websiteConfig.getOrDefault("shopLogo", ""))); - websiteMap.put("pcDesc", websiteConfig.getOrDefault("pcDesc", "")); - websiteMap.put("pcIco", UrlUtils.toAbsoluteUrl(websiteConfig.getOrDefault("pcIco", ""))); - websiteMap.put("pcKeywords", websiteConfig.getOrDefault("pcKeywords", "")); - websiteMap.put("pcLogo", UrlUtils.toAbsoluteUrl(websiteConfig.getOrDefault("pcLogo", ""))); - websiteMap.put("pcTitle", websiteConfig.getOrDefault("pcTitle", "")); + // 网址信息 - // 演示公众号和小程序二维码 - Map qrCodeMap = new LinkedHashMap<>(); - qrCodeMap.put("mnp",UrlUtils.toAbsoluteUrl(ConfigUtils.get("mp_channel","qrCode"))); - qrCodeMap.put("oa",UrlUtils.toAbsoluteUrl(ConfigUtils.get("oa_channel","qrCode"))); - - // 返回数据 - config.put("version", GlobalConfig.version); - config.put("domain", UrlUtils.domain()); - config.put("login", loginMap); - config.put("website", websiteMap); - config.put("copyright",copyrightMap); - config.put("qrcode",qrCodeMap); - return config; + response.put("admin_url", ""); + response.put("copyright", copyrightMap); + response.put("domain", UrlUtils.domain()); + response.put("login", loginMap); + response.put("version", GlobalConfig.version); + response.put("website", "xxxxx"); + return response; } /**