diff --git a/src/main/java/com/bsd/cases/controller/CaseCategoryController.java b/src/main/java/com/bsd/cases/controller/CaseCategoryController.java index eade2d7..04bfc9e 100644 --- a/src/main/java/com/bsd/cases/controller/CaseCategoryController.java +++ b/src/main/java/com/bsd/cases/controller/CaseCategoryController.java @@ -82,4 +82,92 @@ public class CaseCategoryController { } return ajaxResult; } + + /** + * 新增或者更新类别 + * @param ajaxRequest + * @return + */ + @RequestMapping("/save-category") + public AjaxResult getAllCategory(@RequestBody AjaxRequest ajaxRequest) { + AjaxResult ajaxResult = new AjaxResult(); + JSONObject data = ajaxRequest.getData(); + if (null == data){ + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg("data missing"); + }else { + ajaxResult = caseCategoryService.saveCategory(data); + } + return ajaxResult; + } + + /** + * 后台获取分级分类 + * @param ajaxRequest + * @return + */ + @RequestMapping("/get-bak-category-by-parent-id") + public AjaxResult getCategoryByParentId(@RequestBody AjaxRequest ajaxRequest) { + AjaxResult ajaxResult = new AjaxResult(); + JSONObject data = ajaxRequest.getData(); + if (null == data){ + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg("data missing"); + }else { + Long parentId = data.getLong("parentId"); + ajaxResult.setData(caseCategoryService.getBakCategoryByParentId(parentId)); + } + return ajaxResult; + } + + /** + * 后台模糊搜索分级分类 + * @param ajaxRequest + * @return + */ + @RequestMapping("/search-bak-category") + public AjaxResult searchBakCategory(@RequestBody AjaxRequest ajaxRequest) { + AjaxResult ajaxResult = new AjaxResult(); + JSONObject data = ajaxRequest.getData(); + if (null == data) { + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg("data missing"); + } else { + Integer pageNum = data.getInteger("pageNum"); + if (null==pageNum){ + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg("分页参数不可为空"); + }else { + String name = data.getString("name"); + ajaxResult.setRetcode(AjaxResult.SUCCESS); + ajaxResult.setData(caseCategoryService.searchBakCategory(name,pageNum)); + } + } + return ajaxResult; + } + + /** + * 后台模糊搜索分级分类 + * @param jsonObject + * @return + */ + @RequestMapping("/del-category") + public AjaxResult delCategory(@RequestBody JSONObject jsonObject) { + AjaxResult ajaxResult = new AjaxResult(); + try{ + Long categoryId = jsonObject.getLong("categoryId"); + if (null==categoryId){ + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg("文章Id不可为空"); + }else { + ajaxResult = caseCategoryService.delCategory(categoryId); + } + }catch (Exception e) { + + e.printStackTrace(); + ajaxResult.setRetmsg("操作失败:" + e.getMessage()); + ajaxResult.setRetcode(AjaxResult.FAILED); + } + return ajaxResult; + } } diff --git a/src/main/java/com/bsd/cases/controller/CaseContentAttachmentController.java b/src/main/java/com/bsd/cases/controller/CaseContentAttachmentController.java index e28db2a..bba0ad7 100644 --- a/src/main/java/com/bsd/cases/controller/CaseContentAttachmentController.java +++ b/src/main/java/com/bsd/cases/controller/CaseContentAttachmentController.java @@ -28,20 +28,13 @@ public class CaseContentAttachmentController { ajaxResult.setRetcode(AjaxResult.FAILED); ajaxResult.setRetmsg("data missing"); }else { - Integer pageNum = data.getInteger("pageNum"); - Integer pageSize = data.getInteger("pageSize"); - if (null==pageNum|| null == pageSize){ + Long contentId = data.getLong("contentId"); + if (null == contentId){ ajaxResult.setRetcode(AjaxResult.FAILED); - ajaxResult.setRetmsg("分页参数不可为空"); + ajaxResult.setRetmsg("文章id不可为空"); }else { - Long contentId = data.getLong("contentId"); - if (null == contentId){ - ajaxResult.setRetcode(AjaxResult.FAILED); - ajaxResult.setRetmsg("文章id不可为空"); - }else { - ajaxResult.setRetcode(AjaxResult.SUCCESS); - ajaxResult.setData(caseContentAttachmentService.getCaseContentAttachment(contentId)); - } + ajaxResult.setRetcode(AjaxResult.SUCCESS); + ajaxResult.setData(caseContentAttachmentService.getCaseContentAttachment(contentId)); } } return ajaxResult; diff --git a/src/main/java/com/bsd/cases/controller/CaseContentCommentsController.java b/src/main/java/com/bsd/cases/controller/CaseContentCommentsController.java index 33a2743..5ed4d9b 100644 --- a/src/main/java/com/bsd/cases/controller/CaseContentCommentsController.java +++ b/src/main/java/com/bsd/cases/controller/CaseContentCommentsController.java @@ -72,4 +72,29 @@ public class CaseContentCommentsController { } return ajaxResult; } + + /** + * 删除评论 + * @param ajaxRequest + * @param request + * @return + */ + @RequestMapping("/del-comments") + public AjaxResult delComments(@RequestBody AjaxRequest ajaxRequest, HttpServletRequest request) { + AjaxResult ajaxResult = new AjaxResult(); + JSONObject data = ajaxRequest.getData(); + if (null == data){ + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg("data missing"); + }else { + Long commentsId = data.getLong("contentId"); + if (null == commentsId){ + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg("评论id不可为空"); + }else { + ajaxResult =caseContentCommentsService.delComments(commentsId); + } + } + return ajaxResult; + } } diff --git a/src/main/java/com/bsd/cases/controller/CaseContentController.java b/src/main/java/com/bsd/cases/controller/CaseContentController.java index 3f08cf0..0ec9b31 100644 --- a/src/main/java/com/bsd/cases/controller/CaseContentController.java +++ b/src/main/java/com/bsd/cases/controller/CaseContentController.java @@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletRequest; public class CaseContentController { @Resource - private CaseContentService contentService; + private CaseContentService caseContentService; @Resource private CaseContentLikeService caseContentLikeService; @@ -44,7 +44,7 @@ public class CaseContentController { ajaxResult.setRetmsg("分级id不可为空"); }else { ajaxResult.setRetcode(AjaxResult.SUCCESS); - ajaxResult.setData(contentService.getContentListByCategoryId(categoryId,pageNum,pageSize)); + ajaxResult.setData(caseContentService.getContentListByCategoryId(categoryId,pageNum,pageSize)); } } } @@ -65,20 +65,20 @@ public class CaseContentController { ajaxResult.setRetmsg("文章id不可为空"); }else { ajaxResult.setRetcode(AjaxResult.SUCCESS); - ajaxResult.setData(contentService.getContentDetailByContentId(contentId)); + ajaxResult.setData(caseContentService.getContentDetailByContentId(contentId)); } } return ajaxResult; } /** - * 点赞文章 + * 点赞/取消点赞文章 * @param ajaxRequest * @param request * @return */ - @RequestMapping("/add-like") - public AjaxResult addLike(@RequestBody AjaxRequest ajaxRequest, HttpServletRequest request) { + @RequestMapping("/update-like") + public AjaxResult updateLike(@RequestBody AjaxRequest ajaxRequest, HttpServletRequest request) { AjaxResult ajaxResult = new AjaxResult(); JSONObject data = ajaxRequest.getData(); if (null == data){ @@ -91,9 +91,108 @@ public class CaseContentController { ajaxResult.setRetmsg("文章id不可为空"); }else { ajaxResult.setRetcode(AjaxResult.SUCCESS); - ajaxResult.setData(caseContentLikeService.addLike(contentId)); + ajaxResult.setData(caseContentLikeService.updateLike(contentId)); } } return ajaxResult; } + + /** + * 新增或者更新文章 + * @param ajaxRequest + * @return + */ + @RequestMapping("/save-content") + public AjaxResult saveContent(@RequestBody AjaxRequest ajaxRequest) { + AjaxResult ajaxResult = new AjaxResult(); + JSONObject data = ajaxRequest.getData(); + if (null == data){ + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg("data missing"); + }else { + ajaxResult = caseContentService.saveContent(data); + } + return ajaxResult; + } + + /** + * 删除文章 + * @param ajaxRequest + * @return + */ + @RequestMapping("/del-content") + public AjaxResult delContent(@RequestBody AjaxRequest ajaxRequest) { + AjaxResult ajaxResult = new AjaxResult(); + JSONObject data = ajaxRequest.getData(); + if (null == data){ + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg("data missing"); + }else { + Long contentId = data.getLong("contentId"); + if (null == contentId){ + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg("文章id不可为空"); + }else { + ajaxResult = caseContentService.delContent(contentId); + } + } + 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; + } + + /** + * 后台通过文章id获取文章 + * @param jsonObject + * @return + */ + @RequestMapping("/get-bak-content-by-content-id") + public AjaxResult getCaseContentDetailBakVoByContentID(@RequestBody JSONObject jsonObject) { + AjaxResult ajaxResult = new AjaxResult(); + try { + Long contentId = jsonObject.getLong("contentId"); + if (null == contentId){ + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg("文章id不可为空"); + }else { + ajaxResult.setRetcode(AjaxResult.SUCCESS); + ajaxResult.setData(caseContentService.getCaseContentDetailBakVoByContentID(contentId)); + } + } 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..2e6600c 100644 --- a/src/main/java/com/bsd/cases/mapper/CaseCategoryMapper.java +++ b/src/main/java/com/bsd/cases/mapper/CaseCategoryMapper.java @@ -2,6 +2,8 @@ package com.bsd.cases.mapper; import com.bsd.cases.model.CaseCategory; import com.bsd.cases.util.CommonMapper; +import com.bsd.cases.vo.CaseCategoryVo; +import com.bsd.cases.vo.CaseContentBakVo; import com.bsd.cases.vo.CaseSearchVo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -11,4 +13,6 @@ import java.util.List; @Repository public interface CaseCategoryMapper extends CommonMapper { List search(@Param("name") String name); + + List searchCaseCategoryVo(@Param("name") String name); } 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/mapper/CaseContentMaterialMapper.java b/src/main/java/com/bsd/cases/mapper/CaseContentMaterialMapper.java index 0b6a63e..57e91ff 100644 --- a/src/main/java/com/bsd/cases/mapper/CaseContentMaterialMapper.java +++ b/src/main/java/com/bsd/cases/mapper/CaseContentMaterialMapper.java @@ -2,8 +2,10 @@ package com.bsd.cases.mapper; import com.bsd.cases.model.CaseContentMaterial; import com.bsd.cases.util.CommonMapper; +import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @Repository +@Mapper public interface CaseContentMaterialMapper extends CommonMapper { } diff --git a/src/main/java/com/bsd/cases/model/BaseEntity.java b/src/main/java/com/bsd/cases/model/BaseEntity.java index 30b18ac..1ff70d7 100644 --- a/src/main/java/com/bsd/cases/model/BaseEntity.java +++ b/src/main/java/com/bsd/cases/model/BaseEntity.java @@ -25,6 +25,7 @@ package com.bsd.cases.model; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.GeneratedValue; @@ -42,7 +43,9 @@ public class BaseEntity { @Column(name = "id") @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date createDateTime; + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date updateDateTime; private Long createBy; private Long updateBy; diff --git a/src/main/java/com/bsd/cases/model/CaseContentAttachment.java b/src/main/java/com/bsd/cases/model/CaseContentAttachment.java index 3ba3b0a..58c6eda 100644 --- a/src/main/java/com/bsd/cases/model/CaseContentAttachment.java +++ b/src/main/java/com/bsd/cases/model/CaseContentAttachment.java @@ -11,5 +11,11 @@ public class CaseContentAttachment extends BaseEntity{ private Long contentId; + private String attachmentName; + private String attachmentUrl; + + private String size; + + private String type; } diff --git a/src/main/java/com/bsd/cases/service/CaseCategoryService.java b/src/main/java/com/bsd/cases/service/CaseCategoryService.java index 4c24dd5..a5bc090 100644 --- a/src/main/java/com/bsd/cases/service/CaseCategoryService.java +++ b/src/main/java/com/bsd/cases/service/CaseCategoryService.java @@ -1,9 +1,10 @@ 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.vo.CaseSearchVo; +import com.bsd.cases.util.PageAjax; +import com.bsd.cases.vo.CaseCategoryVo; +import com.bsd.cases.vo.CaseContentBakVo; import java.util.List; @@ -33,6 +34,32 @@ public interface CaseCategoryService extends BaseService getBakCategoryByParentId(Long parentId); + + /** + * 后台模糊搜索类别 + * @param name + * @param pageNum + * @return + */ + PageAjax searchBakCategory(String name, Integer pageNum); } diff --git a/src/main/java/com/bsd/cases/service/CaseContentCommentsService.java b/src/main/java/com/bsd/cases/service/CaseContentCommentsService.java index aca92d6..38fdb5e 100644 --- a/src/main/java/com/bsd/cases/service/CaseContentCommentsService.java +++ b/src/main/java/com/bsd/cases/service/CaseContentCommentsService.java @@ -10,4 +10,6 @@ public interface CaseContentCommentsService extends BaseSer JSONObject getCaseContentCommentsByContentId(Long contentId, Integer pageNum, Integer pageSize); AjaxResult addComments(Long contentId,String comments); + + AjaxResult delComments(Long commentsId); } diff --git a/src/main/java/com/bsd/cases/service/CaseContentLikeService.java b/src/main/java/com/bsd/cases/service/CaseContentLikeService.java index 8592497..58fbc42 100644 --- a/src/main/java/com/bsd/cases/service/CaseContentLikeService.java +++ b/src/main/java/com/bsd/cases/service/CaseContentLikeService.java @@ -4,5 +4,5 @@ import com.bsd.cases.util.AjaxResult; public interface CaseContentLikeService extends BaseService { - AjaxResult addLike(Long contentId); + AjaxResult updateLike(Long contentId); } diff --git a/src/main/java/com/bsd/cases/service/CaseContentService.java b/src/main/java/com/bsd/cases/service/CaseContentService.java index 23db41b..2b9a5bb 100644 --- a/src/main/java/com/bsd/cases/service/CaseContentService.java +++ b/src/main/java/com/bsd/cases/service/CaseContentService.java @@ -1,6 +1,11 @@ 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.CaseContentDetailBakVo; import com.bsd.cases.vo.CaseContentDetailVo; import com.bsd.cases.vo.CaseContentVo; @@ -10,4 +15,20 @@ public interface CaseContentService extends BaseService searchBakContentByParam(String name, Long level1, Long level2, Long level3, Integer pageNum); + + CaseContentDetailBakVo getCaseContentDetailBakVoByContentID(Long contentId); } diff --git a/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java b/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java index 6a8b8a2..9d353e0 100644 --- a/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java +++ b/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java @@ -4,17 +4,22 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.bsd.cases.constants.Constants; import com.bsd.cases.mapper.CaseCategoryMapper; +import com.bsd.cases.mapper.CaseContentMapper; import com.bsd.cases.model.CaseCategory; import com.bsd.cases.model.CaseContent; +import com.bsd.cases.model.CaseUsers; import com.bsd.cases.service.CaseCategoryService; 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.CaseCategoryVo; import com.bsd.cases.vo.CaseSearchVo; +import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import tk.mybatis.mapper.entity.Example; import javax.annotation.Resource; import java.util.ArrayList; @@ -27,6 +32,8 @@ public class CaseCategoryServiceImpl extends BaseServiceImpl0){ + ajaxResult.setRetmsg("下级目录有内容,不可删除"); + ajaxResult.setRetcode(AjaxResult.FAILED); + return ajaxResult; + } + caseCategory.setState(Constants.STATE_INVALID); + caseCategory.setUpdateDateTime(new Date()); + caseCategoryMapper.updateByPrimaryKeySelective(caseCategory); + ajaxResult.setRetcode(AjaxResult.SUCCESS); + ajaxResult.setRetmsg("成功删除类别"); + } + return ajaxResult; + } + + /** + * 通过parentId获取类别 + * @param parentId + * @return + */ + @Override + public List getBakCategoryByParentId(Long parentId) { + CaseCategory findCaseCategory = new CaseCategory(); + findCaseCategory.setState(Constants.STATE_VALID); + if (null == parentId) { + //获取一级分类 + findCaseCategory.setLevel(1); + }else { + //获取其他分类 + findCaseCategory.setParentId(parentId); + } + List caseCategoryList = caseCategoryMapper.select(findCaseCategory); + return caseCategoryList; + } + + @Override + public PageAjax searchBakCategory(String name, Integer pageNum) { +// Example example = new Example(CaseCategory.class); +// Example.Criteria criteria = example.createCriteria(); +// criteria.andEqualTo("state", Constants.STATE_VALID); +// criteria.andLike("name", "%"+name+"%"); + PageHelper.startPage(pageNum, Constants.PAGE_SIZE); + List caseCategoryList = caseCategoryMapper.searchCaseCategoryVo(name); + PageAjax pageAjax = new PageAjax<>(caseCategoryList); + return pageAjax; } diff --git a/src/main/java/com/bsd/cases/service/impl/CaseContentCommentsServiceImpl.java b/src/main/java/com/bsd/cases/service/impl/CaseContentCommentsServiceImpl.java index 47e9d0f..8ce62c4 100644 --- a/src/main/java/com/bsd/cases/service/impl/CaseContentCommentsServiceImpl.java +++ b/src/main/java/com/bsd/cases/service/impl/CaseContentCommentsServiceImpl.java @@ -91,4 +91,41 @@ public class CaseContentCommentsServiceImpl extends BaseServiceImpl1){ + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg("不可重复打分"); + return ajaxResult; + } CaseContentScore caseContentScore = new CaseContentScore(); caseContentScore.setScore(score); caseContentScore.setContentId(contentId); 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 f1e6901..0ee4052 100644 --- a/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java +++ b/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java @@ -7,10 +7,17 @@ import com.bsd.cases.mapper.*; import com.bsd.cases.model.*; 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.CaseContentDetailBakVo; 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; import org.springframework.transaction.annotation.Transactional; @@ -53,6 +60,7 @@ public class CaseContentServiceImpl extends BaseServiceImpl0){ + CaseContentMaterial findCaseContentMaterial = new CaseContentMaterial(); + findCaseContentMaterial.setContentId(contentId); + findCaseContentMaterial.setState(Constants.STATE_VALID); + List caseContentMaterialList = caseContentMaterialMapper.select(findCaseContentMaterial); + for (CaseContentMaterial caseContentMaterial:caseContentMaterialList){ + caseContentMaterial.setState(Constants.STATE_INVALID); + caseContentMaterial.setUpdateDateTime(new Date()); + caseContentMaterialMapper.updateByPrimaryKeySelective(caseContentMaterial); + } + } + if (contentAttachmentJson !=null && contentAttachmentJson.size()>0 ){ + CaseContentAttachment findCaseContentAttachment = new CaseContentAttachment(); + findCaseContentAttachment.setContentId(contentId); + findCaseContentAttachment.setState(Constants.STATE_VALID); + List caseContentAttachmentList = caseContentAttachmentMapper.select(findCaseContentAttachment); + for (CaseContentAttachment caseContentAttachment:caseContentAttachmentList){ + caseContentAttachment.setState(Constants.STATE_INVALID); + caseContentAttachment.setUpdateDateTime(new Date()); + caseContentAttachmentMapper.updateByPrimaryKeySelective(caseContentAttachment); + } + } + ajaxResult.setRetmsg("文章更新成功"); + } + + if (contentMaterialJson !=null && contentAttachmentJson.size()>0){ + List caseContentMaterialList = new ArrayList<>(); + for (int i = 0;i0 ){ + List caseContentAttachmentList = new ArrayList<>(); + for (int i = 0;i 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; + } + + @Override + public CaseContentDetailBakVo getCaseContentDetailBakVoByContentID(Long contentId) { + + CaseContent caseContent = caseContentMapper.selectByPrimaryKey(contentId); + CaseContentDetailBakVo caseContentDetailBakVo = new CaseContentDetailBakVo(); + caseContentDetailBakVo.setId(contentId); + caseContentDetailBakVo.setCategoryId(caseContent.getCategoryId()); + caseContentDetailBakVo.setContent(caseContent.getContent()); + caseContentDetailBakVo.setContentTitle(caseContent.getContentTitle()); + caseContentDetailBakVo.setUrl(caseContent.getUrl()); + caseContentDetailBakVo.setState(caseContent.getState()); + caseContentDetailBakVo.setCreateDateTime(caseContent.getCreateDateTime()); + caseContentDetailBakVo.setUpdateDateTime(caseContent.getUpdateDateTime()); + caseContentDetailBakVo.setCreateBy(caseContent.getCreateBy()); + caseContentDetailBakVo.setUpdateBy(caseContent.getCreateBy()); + CaseContentMaterial findCaseContentMaterial = new CaseContentMaterial(); + findCaseContentMaterial.setContentId(contentId); + findCaseContentMaterial.setState(Constants.STATE_VALID); + List caseContentMaterialList = caseContentMaterialMapper.select(findCaseContentMaterial); + caseContentDetailBakVo.setCaseContentMaterialList(caseContentMaterialList); + CaseContentAttachment findCaseContentAttachment = new CaseContentAttachment(); + findCaseContentAttachment.setState(Constants.STATE_VALID); + findCaseContentAttachment.setContentId(contentId); + List caseContentAttachmentList = caseContentAttachmentMapper.select(findCaseContentAttachment); + caseContentDetailBakVo.setCaseContentAttachmentList(caseContentAttachmentList); + return caseContentDetailBakVo; + } } diff --git a/src/main/java/com/bsd/cases/vo/CaseCategoryVo.java b/src/main/java/com/bsd/cases/vo/CaseCategoryVo.java index 9b58306..503c7eb 100644 --- a/src/main/java/com/bsd/cases/vo/CaseCategoryVo.java +++ b/src/main/java/com/bsd/cases/vo/CaseCategoryVo.java @@ -1,16 +1,10 @@ package com.bsd.cases.vo; +import com.bsd.cases.model.CaseCategory; import lombok.Data; @Data -public class CaseCategoryVo { - private String name; - - private Integer level; - - private Long parentId; - - private String url; +public class CaseCategoryVo extends CaseCategory { private String parentName; 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..39f868e --- /dev/null +++ b/src/main/java/com/bsd/cases/vo/CaseContentBakVo.java @@ -0,0 +1,24 @@ +package com.bsd.cases.vo; + +import com.bsd.cases.model.BaseEntity; +import com.bsd.cases.model.CaseCategory; +import com.bsd.cases.model.CaseContent; +import lombok.Data; + +@Data +public class CaseContentBakVo extends BaseEntity { + + private String contentTitle; + + private String url; + + private String content; + + private Long categoryId; + + private String categoryName; + + private Long levelId2; + + private Long levelId1; +} diff --git a/src/main/java/com/bsd/cases/vo/CaseContentDetailBakVo.java b/src/main/java/com/bsd/cases/vo/CaseContentDetailBakVo.java new file mode 100644 index 0000000..057f7b8 --- /dev/null +++ b/src/main/java/com/bsd/cases/vo/CaseContentDetailBakVo.java @@ -0,0 +1,16 @@ +package com.bsd.cases.vo; + +import com.bsd.cases.model.CaseContent; +import com.bsd.cases.model.CaseContentAttachment; +import com.bsd.cases.model.CaseContentMaterial; +import lombok.Data; + +import java.util.List; + +@Data +public class CaseContentDetailBakVo extends CaseContent { + + private List caseContentMaterialList; + + private List caseContentAttachmentList; +} diff --git a/src/main/resources/application-production.yml b/src/main/resources/application-production.yml index 95d8f81..4b06236 100644 --- a/src/main/resources/application-production.yml +++ b/src/main/resources/application-production.yml @@ -38,6 +38,8 @@ logging: mybatis: type-aliases-package: com.bsd.cases.model mapper-locations: classpath:mapper/*.xml + configuration: + map-underscore-to-camel-case: true mapper: mappers: com.bsd.cases.util.CommonMapper not-empty: false diff --git a/src/main/resources/mapper/CaseCategoryMapper.xml b/src/main/resources/mapper/CaseCategoryMapper.xml index 9ac7ddb..34197a0 100644 --- a/src/main/resources/mapper/CaseCategoryMapper.xml +++ b/src/main/resources/mapper/CaseCategoryMapper.xml @@ -7,4 +7,17 @@ SELECT id ,1 as type,content_title as `name`,url from case_content ) a WHERE a.`name` LIKE CONCAT('%',#{name},'%') + + diff --git a/src/main/resources/mapper/CaseContentMapper.xml b/src/main/resources/mapper/CaseContentMapper.xml index 8ba3c89..7317dc0 100644 --- a/src/main/resources/mapper/CaseContentMapper.xml +++ b/src/main/resources/mapper/CaseContentMapper.xml @@ -1,5 +1,29 @@ - +