diff --git a/src/main/java/com/bsd/cases/controller/CaseContentController.java b/src/main/java/com/bsd/cases/controller/CaseContentController.java index de3d702..e64a72c 100644 --- a/src/main/java/com/bsd/cases/controller/CaseContentController.java +++ b/src/main/java/com/bsd/cases/controller/CaseContentController.java @@ -138,4 +138,35 @@ public class CaseContentController { } return ajaxResult; } + + /** + * 后台搜索文章 + * @param jsonObject + * @return + */ + @RequestMapping("/search-bak-content") + public AjaxResult searchBakContent(@RequestBody JSONObject jsonObject) { + AjaxResult ajaxResult = new AjaxResult(); + try { + String name = jsonObject.getString("name"); + Long level1Id = jsonObject.getLong("level1Id"); + Long level2Id = jsonObject.getLong("level2Id"); + Long level3Id = jsonObject.getLong("level3Id"); + Integer pageNum = jsonObject.getInteger("pageNum"); + if (null == pageNum){ + ajaxResult.setRetmsg("分页参数不可为空"); + ajaxResult.setRetcode(AjaxResult.FAILED); + }else { + ajaxResult.setData(caseContentService.searchBakContentByParam(name,level1Id,level2Id,level3Id,pageNum)); + ajaxResult.setRetmsg("操作成功"); + ajaxResult.setRetcode(AjaxResult.SUCCESS); + } + } catch (Exception e) { + + e.printStackTrace(); + ajaxResult.setRetmsg("操作失败:" + e.getMessage()); + ajaxResult.setRetcode(AjaxResult.FAILED); + } + return ajaxResult; + } } diff --git a/src/main/java/com/bsd/cases/mapper/CaseCategoryMapper.java b/src/main/java/com/bsd/cases/mapper/CaseCategoryMapper.java index a6cf030..05e2e44 100644 --- a/src/main/java/com/bsd/cases/mapper/CaseCategoryMapper.java +++ b/src/main/java/com/bsd/cases/mapper/CaseCategoryMapper.java @@ -2,6 +2,7 @@ package com.bsd.cases.mapper; import com.bsd.cases.model.CaseCategory; import com.bsd.cases.util.CommonMapper; +import com.bsd.cases.vo.CaseContentBakVo; import com.bsd.cases.vo.CaseSearchVo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/bsd/cases/mapper/CaseContentMapper.java b/src/main/java/com/bsd/cases/mapper/CaseContentMapper.java index a86bee7..fa71462 100644 --- a/src/main/java/com/bsd/cases/mapper/CaseContentMapper.java +++ b/src/main/java/com/bsd/cases/mapper/CaseContentMapper.java @@ -2,8 +2,16 @@ package com.bsd.cases.mapper; import com.bsd.cases.model.CaseContent; import com.bsd.cases.util.CommonMapper; +import com.bsd.cases.vo.CaseContentBakVo; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public interface CaseContentMapper extends CommonMapper { + List searchBak(@Param("name") String name + , @Param("level1Id") Long level1Id + , @Param("level2Id") Long level2Id + , @Param("level3Id") Long level3Id); } diff --git a/src/main/java/com/bsd/cases/service/CaseCategoryService.java b/src/main/java/com/bsd/cases/service/CaseCategoryService.java index 520a6c3..cd826c7 100644 --- a/src/main/java/com/bsd/cases/service/CaseCategoryService.java +++ b/src/main/java/com/bsd/cases/service/CaseCategoryService.java @@ -1,11 +1,9 @@ package com.bsd.cases.service; import com.alibaba.fastjson.JSONObject; -import com.bsd.cases.model.CaseCategory; -import com.bsd.cases.util.AjaxRequest; import com.bsd.cases.util.AjaxResult; import com.bsd.cases.util.PageAjax; -import com.bsd.cases.vo.CaseSearchVo; +import com.bsd.cases.vo.CaseContentBakVo; import java.util.List; diff --git a/src/main/java/com/bsd/cases/service/CaseContentService.java b/src/main/java/com/bsd/cases/service/CaseContentService.java index 1f883b2..14dedb5 100644 --- a/src/main/java/com/bsd/cases/service/CaseContentService.java +++ b/src/main/java/com/bsd/cases/service/CaseContentService.java @@ -3,6 +3,8 @@ package com.bsd.cases.service; import com.alibaba.fastjson.JSONObject; import com.bsd.cases.util.AjaxRequest; import com.bsd.cases.util.AjaxResult; +import com.bsd.cases.util.PageAjax; +import com.bsd.cases.vo.CaseContentBakVo; import com.bsd.cases.vo.CaseContentDetailVo; import com.bsd.cases.vo.CaseContentVo; @@ -16,4 +18,14 @@ public interface CaseContentService extends BaseService searchBakContentByParam(String name, Long level1, Long level2, Long level3, Integer pageNum); } diff --git a/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java b/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java index 7519e2b..b276977 100644 --- a/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java +++ b/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java @@ -9,9 +9,12 @@ import com.bsd.cases.service.CaseContentService; import com.bsd.cases.service.CaseUsersService; import com.bsd.cases.util.AjaxRequest; import com.bsd.cases.util.AjaxResult; +import com.bsd.cases.util.PageAjax; import com.bsd.cases.util.PageUtils; +import com.bsd.cases.vo.CaseContentBakVo; import com.bsd.cases.vo.CaseContentDetailVo; import com.bsd.cases.vo.CaseContentVo; +import com.github.pagehelper.PageHelper; import com.sun.org.apache.bcel.internal.generic.NEW; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -261,4 +264,12 @@ public class CaseContentServiceImpl extends BaseServiceImpl searchBakContentByParam(String name, Long level1, Long level2, Long level3,Integer pageNum) { + PageHelper.startPage(pageNum, Constants.PAGE_SIZE); + List caseContentBakVoList = caseContentMapper.searchBak(name,level1,level2,level3); + PageAjax pageAjax = new PageAjax<>(caseContentBakVoList); + return pageAjax; + } } diff --git a/src/main/java/com/bsd/cases/vo/CaseContentBakVo.java b/src/main/java/com/bsd/cases/vo/CaseContentBakVo.java new file mode 100644 index 0000000..89d38cd --- /dev/null +++ b/src/main/java/com/bsd/cases/vo/CaseContentBakVo.java @@ -0,0 +1,13 @@ +package com.bsd.cases.vo; + +import com.bsd.cases.model.CaseCategory; +import com.bsd.cases.model.CaseContent; +import lombok.Data; + +@Data +public class CaseContentBakVo extends CaseContent { + + private Long level2Id; + + private Long level1Id; +} diff --git a/src/main/resources/mapper/CaseContentMapper.xml b/src/main/resources/mapper/CaseContentMapper.xml index 8ba3c89..e1cdd9d 100644 --- a/src/main/resources/mapper/CaseContentMapper.xml +++ b/src/main/resources/mapper/CaseContentMapper.xml @@ -1,5 +1,29 @@ - +