From dc467d9327cee1376fd3965aa974aaad84fe9b54 Mon Sep 17 00:00:00 2001 From: xiao-fajia <1665375861@qq.com> Date: Mon, 5 Aug 2024 17:02:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E5=90=8E=E7=AB=AF=E8=A1=A5=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/cms/api/CMSCategoryAPI.java | 18 ++ .../java/com/ruoyi/cms/api/CMSContentAPI.java | 4 +- .../ruoyi/cms/mapper/CmsContentMapper.java | 8 + .../cms/service/ICmsCategoryService.java | 11 + .../ruoyi/cms/service/ICmsContentService.java | 5 + .../service/impl/CmsCategoryServiceImpl.java | 25 +- .../service/impl/CmsContentServiceImpl.java | 12 + .../resources/mapper/cms/CmsContentMapper.xml | 55 ++++ ruoyi-ui/src/api/gw/home.js | 9 + .../src/api/officialWebsite/getPageData.js | 7 + ruoyi-ui/src/views/home.vue | 285 ++++++++---------- .../officialWebsite/Components/header.vue | 5 +- .../officialWebsite/Components/page/index.vue | 15 +- ruoyi-ui/src/views/officialWebsite/about.vue | 186 +++--------- ruoyi-ui/src/views/officialWebsite/cases.vue | 23 +- .../src/views/officialWebsite/committee.vue | 85 ++---- .../src/views/officialWebsite/competition.vue | 78 +++-- .../src/views/officialWebsite/contact.vue | 33 +- .../src/views/officialWebsite/details.vue | 12 +- ruoyi-ui/src/views/officialWebsite/list.vue | 6 +- ruoyi-ui/src/views/officialWebsite/news.vue | 41 +-- .../src/views/officialWebsite/platform.vue | 54 ++-- .../src/views/officialWebsite/practice.vue | 88 ++---- .../src/views/officialWebsite/teaching.vue | 102 ++----- ruoyi-ui/src/views/officialWebsite/team.vue | 61 +--- ruoyi-ui/src/views/officialWebsite/xufang.vue | 30 +- 26 files changed, 514 insertions(+), 744 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSCategoryAPI.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSCategoryAPI.java index b0908a1..f740360 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSCategoryAPI.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSCategoryAPI.java @@ -37,6 +37,24 @@ public class CMSCategoryAPI extends BaseController { */ @PostMapping("/content") public AjaxResult getContentById(@RequestBody CmsContentQuery contentQuery){ + if (contentQuery.getCategoryId() == null) return success(); return success(categoryService.getContentById(contentQuery)); } + + /** + * 获取某个子栏目的内容 + */ + @PostMapping("/contentPart") + public AjaxResult getContentByIdPart(@RequestBody CmsContentQuery contentQuery){ + if (contentQuery.getCategoryId() == null) return success(); + return success(categoryService.getContentByIdPart(contentQuery)); + } + + /** + * 获取某个栏目的子栏目 + */ + @GetMapping("/{id}") + public AjaxResult getCategoryIdByParentId(@PathVariable Long id){ + return success(categoryService.getCategoryIdByParentId(id)); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSContentAPI.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSContentAPI.java index 6116d4a..d8ac196 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSContentAPI.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSContentAPI.java @@ -41,9 +41,7 @@ public class CMSContentAPI extends BaseController { */ @GetMapping("/listById/{id}") public AjaxResult getListById(@PathVariable Long id){ - return success(contentService.list(new QueryWrapper().and(item -> { - item.eq("category_id", id).eq("del_flag", 0); - }))); + return success(contentService.selectCmsContentAllById(id)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/CmsContentMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/CmsContentMapper.java index 655c810..817824c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/CmsContentMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/CmsContentMapper.java @@ -30,6 +30,14 @@ public interface CmsContentMapper extends BaseMapper */ public List selectCmsContentList(CmsContent cmsContent); + /** + * 查询内容列表 + * + * @param cmsContent 内容 + * @return 内容集合 + */ + public List selectCmsContentPart(CmsContent cmsContent); + /** * 新增内容 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/ICmsCategoryService.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/ICmsCategoryService.java index 4cd4b6c..2f7aba6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/ICmsCategoryService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/ICmsCategoryService.java @@ -113,6 +113,12 @@ public interface ICmsCategoryService extends IService */ public PageInfo getContentById(CmsContentQuery contentQuery); + /** + * 按ID查文章 + * @return + */ + public PageInfo getContentByIdPart(CmsContentQuery contentQuery); + /** * 获取所有的叶子节点 * @return @@ -123,4 +129,9 @@ public interface ICmsCategoryService extends IService * 按ID查询所有文章 */ List getLeavesContentList(Long id); + + /** + * 获取某个栏目的子栏目 + */ + List getCategoryIdByParentId(Long id); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/ICmsContentService.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/ICmsContentService.java index 2a98d65..a761de3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/ICmsContentService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/ICmsContentService.java @@ -79,4 +79,9 @@ public interface ICmsContentService extends IService * @return */ List searchContent(String query); + + /** + * 二级栏目下的所有 + */ + List selectCmsContentAllById(Long id); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/CmsCategoryServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/CmsCategoryServiceImpl.java index 67ef794..f015ebe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/CmsCategoryServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/CmsCategoryServiceImpl.java @@ -28,6 +28,8 @@ import com.ruoyi.cms.mapper.CmsCategoryMapper; import com.ruoyi.cms.domain.CmsCategory; import com.ruoyi.cms.service.ICmsCategoryService; +import javax.annotation.Resource; + /** * 栏目Service业务层处理 * @@ -36,10 +38,10 @@ import com.ruoyi.cms.service.ICmsCategoryService; */ @Service public class CmsCategoryServiceImpl extends ServiceImpl implements ICmsCategoryService { - @Autowired + @Resource private Snowflake snowflake; - @Autowired + @Resource private CmsContentMapper contentMapper; /** @@ -247,6 +249,17 @@ public class CmsCategoryServiceImpl extends ServiceImpl(contents); } + @Override + public PageInfo getContentByIdPart(CmsContentQuery contentQuery) { + PageHelper.startPage(contentQuery.getPageNum(), contentQuery.getPageSize()); + CmsContent content = new CmsContent(); + content.setCategoryId(contentQuery.getCategoryId()); + content.setStatus("1"); + content.setDelFlag(0); + List contents = contentMapper.selectCmsContentPart(content); + return new PageInfo(contents); + } + /** * 获取所有的叶子节点 * @@ -267,4 +280,12 @@ public class CmsCategoryServiceImpl extends ServiceImpl getCategoryIdByParentId(Long id){ + return baseMapper.selectList(new QueryWrapper().eq("parent_id", id)); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/CmsContentServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/CmsContentServiceImpl.java index e503171..c615742 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/CmsContentServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/CmsContentServiceImpl.java @@ -181,4 +181,16 @@ public class CmsContentServiceImpl extends ServiceImpl selectCmsContentAllById(Long id){ + CmsContent content = new CmsContent(); + content.setCategoryId(id); + content.setDelFlag(0); + content.setStatus("1"); + return baseMapper.selectCmsContentPart(content); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/cms/CmsContentMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/CmsContentMapper.xml index 58d1c7e..928600b 100644 --- a/ruoyi-admin/src/main/resources/mapper/cms/CmsContentMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/cms/CmsContentMapper.xml @@ -101,6 +101,61 @@ where id = #{id} + + select id, + category_id, + content_type, + image_url, + video_url, + content_title, + content_img, + source, + source_url, + original, + author, + editor, + summary, + status, + publish_date, + offline_date, + is_accessory, + accessory_url, + remark, + del_flag, + create_time, + create_by, + update_time, + update_by, + link_type, + link, + count + from cms_content + + + insert into cms_content diff --git a/ruoyi-ui/src/api/gw/home.js b/ruoyi-ui/src/api/gw/home.js index 0d80136..abc82f5 100644 --- a/ruoyi-ui/src/api/gw/home.js +++ b/ruoyi-ui/src/api/gw/home.js @@ -25,6 +25,15 @@ export function getinfo(data) { }) } +// 获取二级内容 +export function getinfoPart(data) { + return request({ + url: '/api/category/contentPart', + method: 'post', + data + }) +} + export function getBaseInfo(){ return request({ url: "/api/baseInfo", diff --git a/ruoyi-ui/src/api/officialWebsite/getPageData.js b/ruoyi-ui/src/api/officialWebsite/getPageData.js index c420adc..811506a 100644 --- a/ruoyi-ui/src/api/officialWebsite/getPageData.js +++ b/ruoyi-ui/src/api/officialWebsite/getPageData.js @@ -35,3 +35,10 @@ export function getListById(id){ method: "get" }) } + +export function getCategoryByParentId(id){ + return request({ + url: "/api/category/" + id, + method: "get" + }) +} diff --git a/ruoyi-ui/src/views/home.vue b/ruoyi-ui/src/views/home.vue index 64fbb72..816ecb8 100644 --- a/ruoyi-ui/src/views/home.vue +++ b/ruoyi-ui/src/views/home.vue @@ -1,7 +1,7 @@ @@ -150,7 +152,7 @@