From 7508ebf5e02feb7353cf3c1e7e214b047692e374 Mon Sep 17 00:00:00 2001 From: xiao-fajia <1665375861@qq.com> Date: Fri, 26 Jul 2024 10:29:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0CRUD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/cms/api/BaseInfoApi.java | 29 ++++ .../com/ruoyi/cms/api/CMSCategoryAPI.java | 22 ++- .../cms/controller/BaseInfoController.java | 104 +++++++++++++ .../cms/controller/CmsCategoryController.java | 7 +- .../java/com/ruoyi/cms/domain/BaseInfo.java | 50 ++++++ .../com/ruoyi/cms/mapper/BaseInfoMapper.java | 63 ++++++++ .../com/ruoyi/cms/query/CmsCategoryQuery.java | 11 ++ .../com/ruoyi/cms/query/CmsContentQuery.java | 11 ++ .../ruoyi/cms/service/IBaseInfoService.java | 63 ++++++++ .../cms/service/ICmsCategoryService.java | 8 +- .../cms/service/impl/BaseInfoServiceImpl.java | 97 ++++++++++++ .../service/impl/CmsCategoryServiceImpl.java | 20 ++- .../resources/mapper/cms/BaseInfoMapper.xml | 88 +++++++++++ ruoyi-ui/src/api/cms/baseInfo.js | 44 ++++++ ruoyi-ui/src/api/gw/home.js | 7 +- ruoyi-ui/src/views/cms/baseInfo/index.vue | 99 ++++++++++++ ruoyi-ui/src/views/home.vue | 143 +++++++++--------- 17 files changed, 765 insertions(+), 101 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/cms/api/BaseInfoApi.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/cms/controller/BaseInfoController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/cms/domain/BaseInfo.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/BaseInfoMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/cms/query/CmsCategoryQuery.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/cms/query/CmsContentQuery.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/cms/service/IBaseInfoService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/BaseInfoServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/cms/BaseInfoMapper.xml create mode 100644 ruoyi-ui/src/api/cms/baseInfo.js create mode 100644 ruoyi-ui/src/views/cms/baseInfo/index.vue diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/api/BaseInfoApi.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/api/BaseInfoApi.java new file mode 100644 index 0000000..491330f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/api/BaseInfoApi.java @@ -0,0 +1,29 @@ +package com.ruoyi.cms.api; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ruoyi.cms.domain.BaseInfo; +import com.ruoyi.cms.service.IBaseInfoService; +import com.ruoyi.common.annotation.Anonymous; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Anonymous +@RestController +@RequestMapping("/api/baseInfo") +public class BaseInfoApi extends BaseController { + + @Autowired + private IBaseInfoService baseInfoService; + + /** + * 查询信息 + */ + @GetMapping() + public AjaxResult getBaseInfo(){ + return success(baseInfoService.list(new QueryWrapper().last("limit 1"))); + } +} 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 173acd5..393bffd 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 @@ -1,15 +1,14 @@ package com.ruoyi.cms.api; import com.ruoyi.cms.domain.CmsCategory; +import com.ruoyi.cms.query.CmsCategoryQuery; +import com.ruoyi.cms.query.CmsContentQuery; import com.ruoyi.cms.service.ICmsCategoryService; import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @Anonymous @RequestMapping("/api/category") @@ -20,7 +19,7 @@ public class CMSCategoryAPI extends BaseController { private ICmsCategoryService categoryService; /** - * 获取栏目了栏目 + * 获取栏目子栏目 */ @GetMapping("/list") public AjaxResult getCategory(CmsCategory category){ @@ -29,18 +28,17 @@ public class CMSCategoryAPI extends BaseController { /** * 获取栏目下的子栏目及内容 - * @param id 顶层栏目ID */ - @GetMapping("/{id}") - public AjaxResult getContents(@PathVariable Long id){ - return success(categoryService.selectCmsCategoryAndContentTreeList(id)); + @PostMapping() + public AjaxResult getContents(@RequestBody CmsCategoryQuery categoryQuery){ + return success(categoryService.selectCmsCategoryAndContentTreeList(categoryQuery)); } /** * 获取某个子栏目的内容 */ - @GetMapping("/content/{id}") - public AjaxResult getContentById(@PathVariable Long id){ - return success(categoryService.getContentById(id)); + @PostMapping("/content") + public AjaxResult getContentById(@RequestBody CmsContentQuery contentQuery){ + return success(categoryService.getContentById(contentQuery)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/BaseInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/BaseInfoController.java new file mode 100644 index 0000000..4e0b817 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/BaseInfoController.java @@ -0,0 +1,104 @@ +package com.ruoyi.cms.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.cms.domain.BaseInfo; +import com.ruoyi.cms.service.IBaseInfoService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 基础信息Controller + * + * @author 点亮信息 + * @date 2024-07-26 + */ +@RestController +@RequestMapping("/cms/baseInfo") +public class BaseInfoController extends BaseController +{ + @Autowired + private IBaseInfoService baseInfoService; + + /** + * 查询基础信息列表 + */ + @PreAuthorize("@ss.hasPermi('cms:baseInfo:list')") + @GetMapping("/list") + public TableDataInfo list(BaseInfo baseInfo) + { + startPage(); + List list = baseInfoService.selectBaseInfoList(baseInfo); + return getDataTable(list); + } + + /** + * 导出基础信息列表 + */ + @PreAuthorize("@ss.hasPermi('cms:baseInfo:export')") + @Log(title = "基础信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BaseInfo baseInfo) + { + List list = baseInfoService.selectBaseInfoList(baseInfo); + ExcelUtil util = new ExcelUtil(BaseInfo.class); + util.exportExcel(response, list, "基础信息数据"); + } + + /** + * 获取基础信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('cms:baseInfo:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(baseInfoService.selectBaseInfoById(id)); + } + + /** + * 新增基础信息 + */ + @PreAuthorize("@ss.hasPermi('cms:baseInfo:add')") + @Log(title = "基础信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BaseInfo baseInfo) + { + return toAjax(baseInfoService.insertBaseInfo(baseInfo)); + } + + /** + * 修改基础信息 + */ + @PreAuthorize("@ss.hasPermi('cms:baseInfo:edit')") + @Log(title = "基础信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BaseInfo baseInfo) + { + return toAjax(baseInfoService.updateBaseInfo(baseInfo)); + } + + /** + * 删除基础信息 + */ + @PreAuthorize("@ss.hasPermi('cms:baseInfo:remove')") + @Log(title = "基础信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(baseInfoService.deleteBaseInfoByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/CmsCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/CmsCategoryController.java index 5699208..9df3e43 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/CmsCategoryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/CmsCategoryController.java @@ -3,6 +3,7 @@ package com.ruoyi.cms.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.cms.query.CmsContentQuery; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.utils.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; @@ -131,8 +132,8 @@ public class CmsCategoryController extends BaseController /** * 根据栏目ID查其所有的文章 */ - @GetMapping("/content/{id}") - public AjaxResult getContentByCategoryId(@PathVariable Long id){ - return success(cmsCategoryService.getContentById(id)); + @GetMapping("/content") + public AjaxResult getContentByCategoryId(CmsContentQuery contentQuery){ + return success(cmsCategoryService.getContentById(contentQuery)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/BaseInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/BaseInfo.java new file mode 100644 index 0000000..9e26b71 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/BaseInfo.java @@ -0,0 +1,50 @@ +package com.ruoyi.cms.domain; + +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 基础信息对象 base_info + * + * @author 点亮信息 + * @date 2024-07-26 + */ +@Data +public class BaseInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 记录ID */ + private Long id; + + /** 名称 */ + @Excel(name = "名称") + private String webName; + + /** 联系电话 */ + @Excel(name = "联系电话") + private String contactNumber; + + /** 联系邮箱 */ + @Excel(name = "联系邮箱") + private String contactEmail; + + /** 地址 */ + @Excel(name = "地址") + private String address; + + /** logo */ + @Excel(name = "logo") + private String webImg; + + /** 备案信息 */ + @Excel(name = "备案信息") + private String recordInfo; + + /** 版权信息 */ + @Excel(name = "版权信息") + private String copyrightInfo; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/BaseInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/BaseInfoMapper.java new file mode 100644 index 0000000..84108c1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/BaseInfoMapper.java @@ -0,0 +1,63 @@ +package com.ruoyi.cms.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.cms.domain.BaseInfo; + +/** + * 基础信息Mapper接口 + * + * @author 点亮信息 + * @date 2024-07-26 + */ +public interface BaseInfoMapper extends BaseMapper +{ + /** + * 查询基础信息 + * + * @param id 基础信息主键 + * @return 基础信息 + */ + public BaseInfo selectBaseInfoById(Long id); + + /** + * 查询基础信息列表 + * + * @param baseInfo 基础信息 + * @return 基础信息集合 + */ + public List selectBaseInfoList(BaseInfo baseInfo); + + /** + * 新增基础信息 + * + * @param baseInfo 基础信息 + * @return 结果 + */ + public int insertBaseInfo(BaseInfo baseInfo); + + /** + * 修改基础信息 + * + * @param baseInfo 基础信息 + * @return 结果 + */ + public int updateBaseInfo(BaseInfo baseInfo); + + /** + * 删除基础信息 + * + * @param id 基础信息主键 + * @return 结果 + */ + public int deleteBaseInfoById(Long id); + + /** + * 批量删除基础信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseInfoByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/query/CmsCategoryQuery.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/query/CmsCategoryQuery.java new file mode 100644 index 0000000..1ab2d68 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/query/CmsCategoryQuery.java @@ -0,0 +1,11 @@ +package com.ruoyi.cms.query; + +import lombok.Data; + +@Data +public class CmsCategoryQuery { + + private Long categoryId; + private Integer pageNum; + private Integer pageSize; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/query/CmsContentQuery.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/query/CmsContentQuery.java new file mode 100644 index 0000000..2898058 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/query/CmsContentQuery.java @@ -0,0 +1,11 @@ +package com.ruoyi.cms.query; + +import lombok.Data; + +@Data +public class CmsContentQuery { + + private Long categoryId; + private Integer pageNum; + private Integer pageSize; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IBaseInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IBaseInfoService.java new file mode 100644 index 0000000..61be366 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IBaseInfoService.java @@ -0,0 +1,63 @@ +package com.ruoyi.cms.service; + +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.cms.domain.BaseInfo; + +/** + * 基础信息Service接口 + * + * @author 点亮信息 + * @date 2024-07-26 + */ +public interface IBaseInfoService extends IService +{ + /** + * 查询基础信息 + * + * @param id 基础信息主键 + * @return 基础信息 + */ + public BaseInfo selectBaseInfoById(Long id); + + /** + * 查询基础信息列表 + * + * @param baseInfo 基础信息 + * @return 基础信息集合 + */ + public List selectBaseInfoList(BaseInfo baseInfo); + + /** + * 新增基础信息 + * + * @param baseInfo 基础信息 + * @return 结果 + */ + public int insertBaseInfo(BaseInfo baseInfo); + + /** + * 修改基础信息 + * + * @param baseInfo 基础信息 + * @return 结果 + */ + public int updateBaseInfo(BaseInfo baseInfo); + + /** + * 批量删除基础信息 + * + * @param ids 需要删除的基础信息主键集合 + * @return 结果 + */ + public int deleteBaseInfoByIds(Long[] ids); + + /** + * 删除基础信息信息 + * + * @param id 基础信息主键 + * @return 结果 + */ + public int deleteBaseInfoById(Long id); +} 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 8bd0cd7..d75964c 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 @@ -7,6 +7,8 @@ import com.github.pagehelper.PageInfo; import com.ruoyi.cms.domain.CmsCategory; import com.ruoyi.cms.domain.CmsContent; import com.ruoyi.cms.domain.vo.CMSCategoryVo; +import com.ruoyi.cms.query.CmsCategoryQuery; +import com.ruoyi.cms.query.CmsContentQuery; import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysMenu; @@ -101,16 +103,14 @@ public interface ICmsCategoryService extends IService /** * 获取栏目下的子栏目及文章 - * @param id 顶层栏目ID */ - List selectCmsCategoryAndContentTreeList(Long id); + List selectCmsCategoryAndContentTreeList(CmsCategoryQuery categoryQuery); /** * 按ID查文章 - * @param id * @return */ - public PageInfo getContentById(Long id); + public PageInfo getContentById(CmsContentQuery contentQuery); /** * 获取所有的叶子节点 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/BaseInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/BaseInfoServiceImpl.java new file mode 100644 index 0000000..5818db9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/BaseInfoServiceImpl.java @@ -0,0 +1,97 @@ +package com.ruoyi.cms.service.impl; + +import java.util.List; + +import cn.hutool.core.lang.Snowflake; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.cms.mapper.BaseInfoMapper; +import com.ruoyi.cms.domain.BaseInfo; +import com.ruoyi.cms.service.IBaseInfoService; + +/** + * 基础信息Service业务层处理 + * + * @author 点亮信息 + * @date 2024-07-26 + */ +@Service +public class BaseInfoServiceImpl extends ServiceImpl implements IBaseInfoService +{ + @Autowired + private Snowflake snowflake; + + /** + * 查询基础信息 + * + * @param id 基础信息主键 + * @return 基础信息 + */ + @Override + public BaseInfo selectBaseInfoById(Long id) + { + return baseMapper.selectBaseInfoById(id); + } + + /** + * 查询基础信息列表 + * + * @param baseInfo 基础信息 + * @return 基础信息 + */ + @Override + public List selectBaseInfoList(BaseInfo baseInfo) + { + return baseMapper.selectBaseInfoList(baseInfo); + } + + /** + * 新增基础信息 + * + * @param baseInfo 基础信息 + * @return 结果 + */ + @Override + public int insertBaseInfo(BaseInfo baseInfo) + { + baseInfo.setId(snowflake.nextId()); + return baseMapper.insertBaseInfo(baseInfo); + } + + /** + * 修改基础信息 + * + * @param baseInfo 基础信息 + * @return 结果 + */ + @Override + public int updateBaseInfo(BaseInfo baseInfo) + { + return baseMapper.updateBaseInfo(baseInfo); + } + + /** + * 批量删除基础信息 + * + * @param ids 需要删除的基础信息主键 + * @return 结果 + */ + @Override + public int deleteBaseInfoByIds(Long[] ids) + { + return baseMapper.deleteBaseInfoByIds(ids); + } + + /** + * 删除基础信息信息 + * + * @param id 基础信息主键 + * @return 结果 + */ + @Override + public int deleteBaseInfoById(Long id) + { + return baseMapper.deleteBaseInfoById(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 3136ef3..c9df404 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 @@ -15,6 +15,8 @@ import com.ruoyi.cms.core.NewTreeSelect; import com.ruoyi.cms.domain.CmsContent; import com.ruoyi.cms.domain.vo.CMSCategoryVo; import com.ruoyi.cms.mapper.CmsContentMapper; +import com.ruoyi.cms.query.CmsCategoryQuery; +import com.ruoyi.cms.query.CmsContentQuery; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.utils.DateUtils; @@ -212,15 +214,18 @@ public class CmsCategoryServiceImpl extends ServiceImpl selectCmsCategoryAndContentTreeList(Long id) { - List categories = baseMapper.selectList(new QueryWrapper().eq("parent_id", id)); + public List selectCmsCategoryAndContentTreeList(CmsCategoryQuery categoryQuery) { + List categories = baseMapper.selectList(new QueryWrapper().eq("parent_id", categoryQuery.getCategoryId())); List categoryVoList = categories.stream().map(category -> { CMSCategoryVo categoryVo = new CMSCategoryVo(); BeanUtil.copyProperties(category, categoryVo); - categoryVo.setChildren(getContentById(category.getId())); + CmsContentQuery contentQuery = new CmsContentQuery(); + contentQuery.setCategoryId(category.getId()); + contentQuery.setPageNum(categoryQuery.getPageNum()); + contentQuery.setPageSize(categoryQuery.getPageSize()); + categoryVo.setChildren(getContentById(contentQuery)); return categoryVo; }).collect(Collectors.toList()); return categoryVoList; @@ -229,14 +234,13 @@ public class CmsCategoryServiceImpl extends ServiceImpl getContentById(Long id) { - PageHelper.startPage(1, 10); + public PageInfo getContentById(CmsContentQuery contentQuery) { + PageHelper.startPage(contentQuery.getPageNum(), contentQuery.getPageSize()); CmsContent content = new CmsContent(); - content.setCategoryId(id); + content.setCategoryId(contentQuery.getCategoryId()); content.setStatus("1"); content.setDelFlag(0); List contents = contentMapper.selectCmsContentList(content); diff --git a/ruoyi-admin/src/main/resources/mapper/cms/BaseInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/BaseInfoMapper.xml new file mode 100644 index 0000000..283c976 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/cms/BaseInfoMapper.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + select id, web_name, contact_number, contact_email, address, web_img, record_info, copyright_info from base_info + + + + + + + + insert into base_info + + id, + web_name, + contact_number, + contact_email, + address, + web_img, + record_info, + copyright_info, + + + #{id}, + #{webName}, + #{contactNumber}, + #{contactEmail}, + #{address}, + #{webImg}, + #{recordInfo}, + #{copyrightInfo}, + + + + + update base_info + + web_name = #{webName}, + contact_number = #{contactNumber}, + contact_email = #{contactEmail}, + address = #{address}, + web_img = #{webImg}, + record_info = #{recordInfo}, + copyright_info = #{copyrightInfo}, + + where id = #{id} + + + + delete from base_info where id = #{id} + + + + delete from base_info where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/cms/baseInfo.js b/ruoyi-ui/src/api/cms/baseInfo.js new file mode 100644 index 0000000..d000af7 --- /dev/null +++ b/ruoyi-ui/src/api/cms/baseInfo.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询基础信息列表 +export function listBaseInfo(query) { + return request({ + url: '/cms/baseInfo/list', + method: 'get', + params: query + }) +} + +// 查询基础信息详细 +export function getBaseInfo(id) { + return request({ + url: '/cms/baseInfo/' + id, + method: 'get' + }) +} + +// 新增基础信息 +export function addBaseInfo(data) { + return request({ + url: '/cms/baseInfo', + method: 'post', + data: data + }) +} + +// 修改基础信息 +export function updateBaseInfo(data) { + return request({ + url: '/cms/baseInfo', + method: 'put', + data: data + }) +} + +// 删除基础信息 +export function delBaseInfo(id) { + return request({ + url: '/cms/baseInfo/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/gw/home.js b/ruoyi-ui/src/api/gw/home.js index cbd4652..5a4bf66 100644 --- a/ruoyi-ui/src/api/gw/home.js +++ b/ruoyi-ui/src/api/gw/home.js @@ -9,9 +9,10 @@ export function getTab(query) { }) } -export function getbanner(id) { +export function getbanner(data) { return request({ - url: '/api/category/'+id, - method: 'get', + url: '/api/category', + method: 'post', + data }) } diff --git a/ruoyi-ui/src/views/cms/baseInfo/index.vue b/ruoyi-ui/src/views/cms/baseInfo/index.vue new file mode 100644 index 0000000..d4f0505 --- /dev/null +++ b/ruoyi-ui/src/views/cms/baseInfo/index.vue @@ -0,0 +1,99 @@ + + + + + diff --git a/ruoyi-ui/src/views/home.vue b/ruoyi-ui/src/views/home.vue index bdc44e1..6357f04 100644 --- a/ruoyi-ui/src/views/home.vue +++ b/ruoyi-ui/src/views/home.vue @@ -24,7 +24,7 @@
- + @@ -45,7 +45,7 @@
- {{indexList[0].categoryName}} + {{ indexList[0].categoryName }}
@@ -53,7 +53,7 @@
-
{{item.contentTitle}}
+
{{ item.contentTitle }}
{{ indexList[0].categoryName }}
@@ -67,9 +67,9 @@
- +
@@ -86,7 +86,7 @@
-
{{item.contentTitle}}
+
{{ item.contentTitle }}
{{ indexList[0].categoryName }}
@@ -98,24 +98,24 @@
- {{indexList[1].categoryName}} + {{ indexList[1].categoryName }}
-
{{item.contentTitle}}
+
{{ item.contentTitle }}
- {{indexList[1].categoryName}} + {{ indexList[1].categoryName }}
{{ parseTime(item.createTime, "{y}-{m}-{d}") }}
- {{item.summary}} + {{ item.summary }}
@@ -130,7 +130,7 @@
- {{indexList[2].categoryName}} + {{ indexList[2].categoryName }}
@@ -139,11 +139,11 @@
- {{item.contentTitle}} + {{ item.contentTitle }}
-
{{indexList[2].categoryName}}
-
+
{{ indexList[2].categoryName }}
+
3750
@@ -209,9 +209,10 @@