From f7079a9a0956db98b27c767f32b371dd17d1d91f Mon Sep 17 00:00:00 2001 From: ck <851316342@qq.com> Date: Sun, 18 Oct 2020 10:28:56 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=82=B9=E8=B5=9E=20ba?= =?UTF-8?q?seEntity=20=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CaseContentController.java | 2 +- .../java/com/bsd/cases/model/BaseEntity.java | 3 ++ .../impl/CaseContentLikeServiceImpl.java | 33 ++++++++++++++----- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/bsd/cases/controller/CaseContentController.java b/src/main/java/com/bsd/cases/controller/CaseContentController.java index 3f08cf0..2ad4772 100644 --- a/src/main/java/com/bsd/cases/controller/CaseContentController.java +++ b/src/main/java/com/bsd/cases/controller/CaseContentController.java @@ -72,7 +72,7 @@ public class CaseContentController { } /** - * 点赞文章 + * 点赞/取消点赞文章 * @param ajaxRequest * @param request * @return 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/service/impl/CaseContentLikeServiceImpl.java b/src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java index 3f60c4f..a6d333c 100644 --- a/src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java +++ b/src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java @@ -11,6 +11,7 @@ import com.bsd.cases.model.CaseUsers; import com.bsd.cases.service.CaseContentLikeService; import com.bsd.cases.service.CaseUsersService; import com.bsd.cases.util.AjaxResult; +import org.apache.ibatis.annotations.Case; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,14 +48,29 @@ public class CaseContentLikeServiceImpl extends BaseServiceImpl Date: Sun, 18 Oct 2020 10:40:45 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CaseContentCommentsController.java | 25 +++++++++++++ .../service/CaseContentCommentsService.java | 2 + .../impl/CaseContentCommentsServiceImpl.java | 37 +++++++++++++++++++ 3 files changed, 64 insertions(+) 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/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/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 BaseServiceImpl Date: Sun, 18 Oct 2020 16:52:49 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bsd/cases/service/impl/CaseContentLikeServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java b/src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java index a6d333c..56cc64c 100644 --- a/src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java +++ b/src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java @@ -63,12 +63,14 @@ public class CaseContentLikeServiceImpl extends BaseServiceImpl Date: Sun, 18 Oct 2020 16:54:33 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bsd/cases/controller/CaseContentController.java | 6 +++--- .../java/com/bsd/cases/service/CaseContentLikeService.java | 2 +- .../bsd/cases/service/impl/CaseContentLikeServiceImpl.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/bsd/cases/controller/CaseContentController.java b/src/main/java/com/bsd/cases/controller/CaseContentController.java index 2ad4772..80bf7f9 100644 --- a/src/main/java/com/bsd/cases/controller/CaseContentController.java +++ b/src/main/java/com/bsd/cases/controller/CaseContentController.java @@ -77,8 +77,8 @@ public class CaseContentController { * @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,7 +91,7 @@ public class CaseContentController { ajaxResult.setRetmsg("文章id不可为空"); }else { ajaxResult.setRetcode(AjaxResult.SUCCESS); - ajaxResult.setData(caseContentLikeService.addLike(contentId)); + ajaxResult.setData(caseContentLikeService.updateLike(contentId)); } } return ajaxResult; 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/impl/CaseContentLikeServiceImpl.java b/src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java index 56cc64c..27d7462 100644 --- a/src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java +++ b/src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java @@ -37,7 +37,7 @@ public class CaseContentLikeServiceImpl extends BaseServiceImpl Date: Sun, 18 Oct 2020 17:02:58 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CaseContentLikeServiceImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java b/src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java index 27d7462..cb53bc6 100644 --- a/src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java +++ b/src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java @@ -67,10 +67,14 @@ public class CaseContentLikeServiceImpl extends BaseServiceImpl Date: Sun, 18 Oct 2020 17:15:41 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CaseContentAttachmentController.java | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) 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; From e661908df6aef0bc80b228ebd3d330546c0512ba Mon Sep 17 00:00:00 2001 From: ck <851316342@qq.com> Date: Sun, 18 Oct 2020 20:50:29 +0800 Subject: [PATCH 07/17] =?UTF-8?q?model=20=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bsd/cases/model/CaseContentAttachment.java | 6 ++++++ 1 file changed, 6 insertions(+) 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; } From 1a89a8e8b844a4182f246f0f53172261572aa3e3 Mon Sep 17 00:00:00 2001 From: ck <851316342@qq.com> Date: Sun, 18 Oct 2020 22:34:56 +0800 Subject: [PATCH 08/17] up --- .../controller/CaseCategoryController.java | 15 +++ .../controller/CaseContentController.java | 43 +++++++- .../cases/service/CaseCategoryService.java | 8 +- .../bsd/cases/service/CaseContentService.java | 6 + .../service/impl/CaseCategoryServiceImpl.java | 49 ++++++++- .../impl/CaseContentScoreServiceImpl.java | 11 ++ .../service/impl/CaseContentServiceImpl.java | 104 ++++++++++++++++++ 7 files changed, 229 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/bsd/cases/controller/CaseCategoryController.java b/src/main/java/com/bsd/cases/controller/CaseCategoryController.java index eade2d7..14dfacb 100644 --- a/src/main/java/com/bsd/cases/controller/CaseCategoryController.java +++ b/src/main/java/com/bsd/cases/controller/CaseCategoryController.java @@ -82,4 +82,19 @@ public class CaseCategoryController { } return ajaxResult; } + + @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; + } + + } diff --git a/src/main/java/com/bsd/cases/controller/CaseContentController.java b/src/main/java/com/bsd/cases/controller/CaseContentController.java index 80bf7f9..2162f1a 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,7 +65,7 @@ public class CaseContentController { ajaxResult.setRetmsg("文章id不可为空"); }else { ajaxResult.setRetcode(AjaxResult.SUCCESS); - ajaxResult.setData(contentService.getContentDetailByContentId(contentId)); + ajaxResult.setData(caseContentService.getContentDetailByContentId(contentId)); } } return ajaxResult; @@ -96,4 +96,41 @@ public class CaseContentController { } 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; + } + + @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; + } } diff --git a/src/main/java/com/bsd/cases/service/CaseCategoryService.java b/src/main/java/com/bsd/cases/service/CaseCategoryService.java index 4c24dd5..c1eedda 100644 --- a/src/main/java/com/bsd/cases/service/CaseCategoryService.java +++ b/src/main/java/com/bsd/cases/service/CaseCategoryService.java @@ -33,6 +33,12 @@ public interface CaseCategoryService extends BaseService extends BaseService1){ + 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..7519e2b 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,13 @@ 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.PageUtils; import com.bsd.cases.vo.CaseContentDetailVo; import com.bsd.cases.vo.CaseContentVo; 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 +56,7 @@ public class CaseContentServiceImpl extends BaseServiceImpl Date: Mon, 19 Oct 2020 00:37:48 +0800 Subject: [PATCH 09/17] up --- .../controller/CaseCategoryController.java | 48 +++++++++++++++++++ .../controller/CaseContentController.java | 5 ++ .../cases/service/CaseCategoryService.java | 22 +++++++++ .../service/impl/CaseCategoryServiceImpl.java | 39 +++++++++++++-- 4 files changed, 111 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bsd/cases/controller/CaseCategoryController.java b/src/main/java/com/bsd/cases/controller/CaseCategoryController.java index 14dfacb..adaffd9 100644 --- a/src/main/java/com/bsd/cases/controller/CaseCategoryController.java +++ b/src/main/java/com/bsd/cases/controller/CaseCategoryController.java @@ -83,6 +83,11 @@ public class CaseCategoryController { return ajaxResult; } + /** + * 新增或者更新类别 + * @param ajaxRequest + * @return + */ @RequestMapping("/save-category") public AjaxResult getAllCategory(@RequestBody AjaxRequest ajaxRequest) { AjaxResult ajaxResult = new AjaxResult(); @@ -96,5 +101,48 @@ public class CaseCategoryController { 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; + } } diff --git a/src/main/java/com/bsd/cases/controller/CaseContentController.java b/src/main/java/com/bsd/cases/controller/CaseContentController.java index 2162f1a..de3d702 100644 --- a/src/main/java/com/bsd/cases/controller/CaseContentController.java +++ b/src/main/java/com/bsd/cases/controller/CaseContentController.java @@ -115,6 +115,11 @@ public class CaseContentController { return ajaxResult; } + /** + * 删除文章 + * @param ajaxRequest + * @return + */ @RequestMapping("/del-content") public AjaxResult delContent(@RequestBody AjaxRequest ajaxRequest) { AjaxResult ajaxResult = new AjaxResult(); diff --git a/src/main/java/com/bsd/cases/service/CaseCategoryService.java b/src/main/java/com/bsd/cases/service/CaseCategoryService.java index c1eedda..520a6c3 100644 --- a/src/main/java/com/bsd/cases/service/CaseCategoryService.java +++ b/src/main/java/com/bsd/cases/service/CaseCategoryService.java @@ -1,8 +1,10 @@ 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 java.util.List; @@ -40,5 +42,25 @@ 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/impl/CaseCategoryServiceImpl.java b/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java index 901cd18..7c1368b 100644 --- a/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java +++ b/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java @@ -6,15 +6,19 @@ import com.bsd.cases.constants.Constants; import com.bsd.cases.mapper.CaseCategoryMapper; 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; @@ -201,11 +205,40 @@ public class CaseCategoryServiceImpl extends BaseServiceImpl 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; + } - - - return ajaxResult; + @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.selectByExample(example); + PageAjax pageAjax = new PageAjax<>(caseCategoryList); + return pageAjax; } From 090da963a02db7951b08fd11c6901d7a9c0d6153 Mon Sep 17 00:00:00 2001 From: ck <851316342@qq.com> Date: Mon, 19 Oct 2020 10:29:30 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=96=87=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CaseContentController.java | 31 +++++++++++++++++++ .../bsd/cases/mapper/CaseCategoryMapper.java | 1 + .../bsd/cases/mapper/CaseContentMapper.java | 8 +++++ .../cases/service/CaseCategoryService.java | 4 +-- .../bsd/cases/service/CaseContentService.java | 12 +++++++ .../service/impl/CaseContentServiceImpl.java | 11 +++++++ .../com/bsd/cases/vo/CaseContentBakVo.java | 13 ++++++++ .../resources/mapper/CaseContentMapper.xml | 26 +++++++++++++++- 8 files changed, 102 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/bsd/cases/vo/CaseContentBakVo.java 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 @@ - + From a3869480b7af531787d9f655a8ee55218d2ec4b8 Mon Sep 17 00:00:00 2001 From: ck <851316342@qq.com> Date: Mon, 19 Oct 2020 11:02:40 +0800 Subject: [PATCH 11/17] up --- .../java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 7c1368b..853679b 100644 --- a/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java +++ b/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java @@ -160,6 +160,7 @@ public class CaseCategoryServiceImpl extends BaseServiceImpl Date: Mon, 19 Oct 2020 11:42:21 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CaseCategoryServiceImpl.java | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) 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 853679b..ff9a1a8 100644 --- a/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java +++ b/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java @@ -4,6 +4,7 @@ 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; @@ -31,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; } From 8c917291d0f55880a50ef70bf316d909a1ffb715 Mon Sep 17 00:00:00 2001 From: ck <851316342@qq.com> Date: Mon, 19 Oct 2020 11:45:43 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CaseCategoryController.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/main/java/com/bsd/cases/controller/CaseCategoryController.java b/src/main/java/com/bsd/cases/controller/CaseCategoryController.java index adaffd9..04bfc9e 100644 --- a/src/main/java/com/bsd/cases/controller/CaseCategoryController.java +++ b/src/main/java/com/bsd/cases/controller/CaseCategoryController.java @@ -145,4 +145,29 @@ public class CaseCategoryController { } 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; + } } From 5e15ae3e939a7c1163b4de98994ad3272da10cd2 Mon Sep 17 00:00:00 2001 From: ck <851316342@qq.com> Date: Mon, 19 Oct 2020 22:13:03 +0800 Subject: [PATCH 14/17] up --- .../java/com/bsd/cases/vo/CaseContentBakVo.java | 17 ++++++++++++++--- src/main/resources/application-production.yml | 2 ++ src/main/resources/mapper/CaseContentMapper.xml | 10 +++++----- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/bsd/cases/vo/CaseContentBakVo.java b/src/main/java/com/bsd/cases/vo/CaseContentBakVo.java index 89d38cd..39f868e 100644 --- a/src/main/java/com/bsd/cases/vo/CaseContentBakVo.java +++ b/src/main/java/com/bsd/cases/vo/CaseContentBakVo.java @@ -1,13 +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 CaseContent { +public class CaseContentBakVo extends BaseEntity { - private Long level2Id; + private String contentTitle; - private Long level1Id; + private String url; + + private String content; + + private Long categoryId; + + private String categoryName; + + private Long levelId2; + + private Long levelId1; } diff --git a/src/main/resources/application-production.yml b/src/main/resources/application-production.yml index 86821ff..79da156 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.oceanspot.template.util.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/CaseContentMapper.xml b/src/main/resources/mapper/CaseContentMapper.xml index e1cdd9d..1398d36 100644 --- a/src/main/resources/mapper/CaseContentMapper.xml +++ b/src/main/resources/mapper/CaseContentMapper.xml @@ -2,17 +2,17 @@ + + diff --git a/src/main/resources/mapper/CaseContentMapper.xml b/src/main/resources/mapper/CaseContentMapper.xml index 1398d36..7317dc0 100644 --- a/src/main/resources/mapper/CaseContentMapper.xml +++ b/src/main/resources/mapper/CaseContentMapper.xml @@ -23,7 +23,7 @@ and a.category_id = #{level3Id} - a.`content_title` LIKE CONCAT('%',#{name},'%') + and a.`content_title` LIKE CONCAT('%',#{name},'%') From 62906eec3b51af8ee68d00537768a98d9d4adf41 Mon Sep 17 00:00:00 2001 From: ck <851316342@qq.com> Date: Mon, 19 Oct 2020 23:02:02 +0800 Subject: [PATCH 16/17] up --- src/main/java/com/bsd/cases/vo/CaseCategoryVo.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) 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; From 90aaa5a8e87ca5fd945efe8dd6009a8e248853a3 Mon Sep 17 00:00:00 2001 From: ck <851316342@qq.com> Date: Tue, 20 Oct 2020 01:33:10 +0800 Subject: [PATCH 17/17] up --- .../controller/CaseContentController.java | 26 +++++ .../mapper/CaseContentMaterialMapper.java | 2 + .../bsd/cases/service/CaseContentService.java | 3 + .../service/impl/CaseContentServiceImpl.java | 99 +++++++++++++++++++ .../bsd/cases/vo/CaseContentDetailBakVo.java | 16 +++ 5 files changed, 146 insertions(+) create mode 100644 src/main/java/com/bsd/cases/vo/CaseContentDetailBakVo.java diff --git a/src/main/java/com/bsd/cases/controller/CaseContentController.java b/src/main/java/com/bsd/cases/controller/CaseContentController.java index e64a72c..0ec9b31 100644 --- a/src/main/java/com/bsd/cases/controller/CaseContentController.java +++ b/src/main/java/com/bsd/cases/controller/CaseContentController.java @@ -169,4 +169,30 @@ public class CaseContentController { } 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/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/service/CaseContentService.java b/src/main/java/com/bsd/cases/service/CaseContentService.java index 14dedb5..2b9a5bb 100644 --- a/src/main/java/com/bsd/cases/service/CaseContentService.java +++ b/src/main/java/com/bsd/cases/service/CaseContentService.java @@ -5,6 +5,7 @@ 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; @@ -28,4 +29,6 @@ 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/CaseContentServiceImpl.java b/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java index b276977..0ee4052 100644 --- a/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java +++ b/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java @@ -12,6 +12,7 @@ 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; @@ -179,6 +180,9 @@ 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 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/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; +}