Merge remote-tracking branch 'origin/master'

src/main/java/com/bsd/cases/controller/CaseContentController.java

@@ -1,6 +1,7 @@
 package com.bsd.cases.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.bsd.cases.service.CaseContentLikeService;
 import com.bsd.cases.service.CaseContentService;
 import com.bsd.cases.util.AjaxRequest;
 import com.bsd.cases.util.AjaxResult;
@@ -20,6 +21,9 @@ public class CaseContentController {
     @Resource
     private CaseContentService contentService;
 
+    @Resource
+    private CaseContentLikeService caseContentLikeService;
+
     @RequestMapping("/get-content-list-by-category-id")
     public AjaxResult getContentListByCategoryId(@RequestBody AjaxRequest ajaxRequest, HttpServletRequest request) {
         AjaxResult ajaxResult = new AjaxResult();
@@ -66,4 +70,30 @@ public class CaseContentController {
         }
         return ajaxResult;
     }
+
+    /**
+     * 点赞文章
+     * @param ajaxRequest
+     * @param request
+     * @return
+     */
+    @RequestMapping("/add-like")
+    public AjaxResult addLike(@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 contentId = data.getLong("contentId");
+            if (null == contentId){
+                ajaxResult.setRetcode(AjaxResult.FAILED);
+                ajaxResult.setRetmsg("文章id不可为空");
+            }else {
+                ajaxResult.setRetcode(AjaxResult.SUCCESS);
+                ajaxResult.setData(caseContentLikeService.addLike(contentId));
+            }
+        }
+        return ajaxResult;
+    }
 }

src/main/java/com/bsd/cases/controller/CaseContentLikeController.java

@@ -0,0 +1,23 @@
+package com.bsd.cases.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.bsd.cases.service.CaseContentLikeService;
+import com.bsd.cases.util.AjaxRequest;
+import com.bsd.cases.util.AjaxResult;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+@CrossOrigin
+@RestController
+@RequestMapping("/case-content-like")
+public class CaseContentLikeController {
+
+    @Resource
+    private CaseContentLikeService caseContentLikeService;
+
+}

src/main/java/com/bsd/cases/service/CaseContentLikeService.java

@@ -1,4 +1,8 @@
 package com.bsd.cases.service;
 
+import com.bsd.cases.util.AjaxResult;
+
 public interface CaseContentLikeService<CaseContentLike> extends BaseService<CaseContentLike> {
+
+    AjaxResult addLike(Long contentId);
 }

src/main/java/com/bsd/cases/service/impl/CaseContentCommentsServiceImpl.java

@@ -6,7 +6,9 @@ import com.bsd.cases.mapper.CaseContentCommentsMapper;
 import com.bsd.cases.mapper.CaseContentStaticalMapper;
 import com.bsd.cases.model.CaseContentComments;
 import com.bsd.cases.model.CaseContentStatical;
+import com.bsd.cases.model.CaseUsers;
 import com.bsd.cases.service.CaseContentCommentsService;
+import com.bsd.cases.service.CaseUsersService;
 import com.bsd.cases.util.AjaxResult;
 import com.bsd.cases.util.PageUtils;
 import com.bsd.cases.vo.CaseContentCommentsVo;
@@ -27,7 +29,8 @@ public class CaseContentCommentsServiceImpl extends BaseServiceImpl<CaseContentC
     private CaseContentCommentsMapper caseContentCommentsMapper;
     @Resource
     private CaseContentStaticalMapper caseContentStaticalMapper;
-
+    @Resource
+    private CaseUsersService caseUsersService;
 
     /**
      * 通过文章id查询文章评论
@@ -53,6 +56,7 @@ public class CaseContentCommentsServiceImpl extends BaseServiceImpl<CaseContentC
      */
     @Override
     public AjaxResult addComments(Long contentId,String comments) {
+        CaseUsers caseUsers = caseUsersService.currentUser();
         CaseContentComments caseContentComments = new CaseContentComments();
         caseContentComments.setContentId(contentId);
         caseContentComments.setState(Constants.STATE_VALID);
@@ -60,6 +64,9 @@ public class CaseContentCommentsServiceImpl extends BaseServiceImpl<CaseContentC
         caseContentComments.setCreateDateTime(new Date());
         caseContentComments.setUpdateDateTime(new Date());
         //插人的信息
+        caseContentComments.setUserName(caseUsers.getUserName());
+        caseContentComments.setCreateBy(caseUsers.getId());
+        caseContentComments.setUpdateBy(caseUsers.getId());
         caseContentCommentsMapper.insert(caseContentComments);
         //更新统计
         CaseContentStatical findCaseContentStatical = new CaseContentStatical();

src/main/java/com/bsd/cases/service/impl/CaseContentLikeServiceImpl.java

@@ -1,12 +1,74 @@
 package com.bsd.cases.service.impl;
 
+import com.bsd.cases.constants.Constants;
 import com.bsd.cases.mapper.CaseContentLikeMapper;
+import com.bsd.cases.mapper.CaseContentMapper;
+import com.bsd.cases.mapper.CaseContentStaticalMapper;
+import com.bsd.cases.model.CaseContent;
 import com.bsd.cases.model.CaseContentLike;
+import com.bsd.cases.model.CaseContentStatical;
+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.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+import java.util.Date;
+
 @Service("caseContentLikeService")
 @Transactional
-public class CaseContentLikeServiceImpl extends BaseServiceImpl<CaseContentLikeMapper, CaseContentLike> implements CaseContentLikeService<CaseContentLike> {
+public class CaseContentLikeServiceImpl extends BaseServiceImpl<CaseContentLikeMapper, CaseContentLike>
+        implements CaseContentLikeService<CaseContentLike> {
+
+    @Resource
+    private CaseContentLikeMapper caseContentLikeMapper;
+    @Resource
+    private CaseUsersService caseUsersService;
+    @Resource
+    private CaseContentMapper caseContentMapper;
+    @Resource
+    private CaseContentStaticalMapper caseContentStaticalMapper;
+    /**
+     * 新增点赞
+     * @param contentId
+     * @return
+     */
+    @Override
+    public AjaxResult addLike(Long contentId) {
+        AjaxResult ajaxResult = new AjaxResult();
+        CaseUsers caseUsers = caseUsersService.currentUser();
+        CaseContent findCaseContent = new CaseContent();
+        findCaseContent.setState(Constants.STATE_VALID);
+        findCaseContent.setId(contentId);
+        CaseContent caseContent = caseContentMapper.selectOne(findCaseContent);
+        if (null == caseContent) {
+            ajaxResult.setRetcode(AjaxResult.FAILED);
+            ajaxResult.setRetmsg("未找到该文章");
+        }else {
+            CaseContentLike caseContentLike = new CaseContentLike();
+            caseContentLike.setContentId(contentId);
+            caseContentLike.setCreateDateTime(new Date());
+            caseContentLike.setUpdateDateTime(new Date());
+            caseContentLike.setCreateBy(caseUsers.getId());
+            caseContentLike.setUpdateBy(caseUsers.getId());
+            caseContentLike.setState(Constants.STATE_VALID);
+            caseContentLikeMapper.insert(caseContentLike);
+            CaseContentLike findCaseContentLike = new CaseContentLike();
+            findCaseContentLike.setContentId(contentId);
+            findCaseContentLike.setState(Constants.STATE_VALID);
+            Integer likeNum = caseContentLikeMapper.selectCount(findCaseContentLike);
+            CaseContentStatical findCaseContentStatical = new CaseContentStatical();
+            findCaseContentStatical.setState(Constants.STATE_VALID);
+            findCaseContentStatical.setContentId(contentId);
+            CaseContentStatical caseContentStatical = caseContentStaticalMapper.selectOne(findCaseContentStatical);
+            caseContentStatical.setLikeNum(likeNum);
+            caseContentStatical.setUpdateDateTime(new Date());
+            caseContentStaticalMapper.updateByPrimaryKeySelective(caseContentStatical);
+            ajaxResult.setRetmsg("已成功点赞");
+            ajaxResult.setRetcode(AjaxResult.SUCCESS);
+        }
+        return ajaxResult;
+    }
 }

src/main/java/com/bsd/cases/service/impl/CaseContentScoreServiceImpl.java

@@ -7,7 +7,9 @@ import com.bsd.cases.mapper.CaseContentStaticalMapper;
 import com.bsd.cases.model.CaseContent;
 import com.bsd.cases.model.CaseContentScore;
 import com.bsd.cases.model.CaseContentStatical;
+import com.bsd.cases.model.CaseUsers;
 import com.bsd.cases.service.CaseContentScoreService;
+import com.bsd.cases.service.CaseUsersService;
 import com.bsd.cases.util.AjaxResult;
 import org.apache.ibatis.annotations.Case;
 import org.springframework.stereotype.Service;
@@ -27,6 +29,8 @@ public class CaseContentScoreServiceImpl extends BaseServiceImpl<CaseContentScor
     private CaseContentMapper caseContentMapper;
     @Resource
     private CaseContentStaticalMapper caseContentStaticalMapper;
+    @Resource
+    private CaseUsersService caseUsersService;
 
     /**
      * 评分
@@ -40,6 +44,7 @@ public class CaseContentScoreServiceImpl extends BaseServiceImpl<CaseContentScor
         findCaseContent.setState(Constants.STATE_VALID);
         findCaseContent.setId(contentId);
         CaseContent caseContent = caseContentMapper.selectOne(findCaseContent);
+        CaseUsers caseUsers = caseUsersService.currentUser();
         if (null == caseContent){
             ajaxResult.setRetcode(AjaxResult.FAILED);
             ajaxResult.setRetmsg("未找到该文章");
@@ -53,7 +58,8 @@ public class CaseContentScoreServiceImpl extends BaseServiceImpl<CaseContentScor
                 caseContentScore.setContentId(contentId);
                 caseContentScore.setCreateDateTime(new Date());
                 caseContentScore.setUpdateDateTime(new Date());
-                //set 人
+                caseContentScore.setCreateBy(caseUsers.getId());
+                caseContentScore.setUpdateBy(caseUsers.getId());
                 caseContentScore.setState(Constants.STATE_VALID);
                 caseContentScoreMapper.insert(caseContentScore);
                 Double averageScore = caseContentScoreMapper.getAverageScore(contentId);

src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java

@@ -6,14 +6,17 @@ import com.bsd.cases.constants.Constants;
 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.PageUtils;
 import com.bsd.cases.vo.CaseContentDetailVo;
 import com.bsd.cases.vo.CaseContentVo;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Service("caseContentService")
@@ -29,6 +32,16 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
     private CaseContentMaterialMapper caseContentMaterialMapper;
     @Resource
     private CaseContentAttachmentMapper caseContentAttachmentMapper;
+    @Resource
+    private CaseContentViewMapper caseContentViewMapper;
+    @Resource
+    private CaseUsersService caseUsersService;
+    @Resource
+    private CaseContentLikeMapper caseContentLikeMapper;
+    @Resource
+    private CaseContentCommentsMapper caseContentCommentsMapper;
+    @Resource
+    private CaseContentScoreMapper caseContentScoreMapper;
 
     /**
      * 获取文章列表
@@ -80,7 +93,31 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
      */
     @Override
     public CaseContentDetailVo getContentDetailByContentId(Long contentId) {
-        //先判断有没有这人有没有看过
+
+        CaseUsers caseUsers = caseUsersService.currentUser();
+        CaseContentView newCaseContentView = new CaseContentView();
+        newCaseContentView.setCreateBy(caseUsers.getId());
+        newCaseContentView.setState(Constants.STATE_VALID);
+        newCaseContentView.setCreateDateTime(new Date());
+        newCaseContentView.setContentId(contentId);
+        newCaseContentView.setUpdateBy(caseUsers.getId());
+        newCaseContentView.setUpdateDateTime(new Date());
+        caseContentViewMapper.insert(newCaseContentView);
+
+        CaseContentView findNewCaseContentView = new CaseContentView();
+        findNewCaseContentView.setContentId(contentId);
+        findNewCaseContentView.setState(Constants.STATE_VALID);
+        Integer viewNum = caseContentViewMapper.selectCount(findNewCaseContentView);
+
+        CaseContentStatical findCaseContentStatic = new CaseContentStatical();
+        findCaseContentStatic.setContentId(contentId);
+        findCaseContentStatic.setState(Constants.STATE_VALID);
+        CaseContentStatical caseContentStatical = caseContentStaticalMapper.selectOne(findCaseContentStatic);
+        caseContentStatical.setViewNum(viewNum);
+        caseContentStatical.setUpdateDateTime(new Date());
+        //更新访问量
+        caseContentStaticalMapper.updateByPrimaryKeySelective(caseContentStatical);
+
         CaseContent caseContent = caseContentMapper.selectByPrimaryKey(contentId);
         CaseContentDetailVo caseContentDetailVo = new CaseContentDetailVo();
         caseContentDetailVo.setId(contentId);
@@ -96,14 +133,28 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
         findCaseContentMaterial.setState(Constants.STATE_VALID);
         List<CaseContentMaterial> caseContentMaterialList = caseContentMaterialMapper.select(findCaseContentMaterial);
         caseContentDetailVo.setCaseContentMaterialList(caseContentMaterialList);
-        CaseContentStatical findCaseContentStatical = new CaseContentStatical();
-        findCaseContentStatical.setContentId(contentId);
-        findCaseContentStatical.setState(Constants.STATE_VALID);
-        CaseContentStatical caseContentStatical = caseContentStaticalMapper.selectOne(findCaseContentStatical);
+
         caseContentDetailVo.setScore(caseContentStatical.getScore());
         caseContentDetailVo.setCommentsNum(caseContentStatical.getCommentsNum());
         caseContentDetailVo.setLikeNum(caseContentStatical.getLikeNum());
-
+        //判断是否已点赞过
+        CaseContentLike findCaseContentLike = new CaseContentLike();
+        findCaseContentLike.setContentId(contentId);
+        findCaseContentLike.setState(Constants.STATE_VALID);
+        findCaseContentLike.setCreateBy(caseUsers.getId());
+        CaseContentLike caseContentLike = caseContentLikeMapper.selectOne(findCaseContentLike);
+        if (null!=caseContentLike){
+            caseContentDetailVo.setIsLike(true);
+        }
+        //判断是否已评分过
+        CaseContentScore findCaseContentScore = new CaseContentScore();
+        findCaseContentScore.setContentId(contentId);
+        findCaseContentScore.setState(Constants.STATE_VALID);
+        findCaseContentScore.setCreateBy(caseUsers.getId());
+        CaseContentScore caseContentScore = caseContentScoreMapper.selectOne(findCaseContentScore);
+        if (null!=caseContentScore){
+            caseContentDetailVo.setIsScore(true);
+        }
         return caseContentDetailVo;
     }
 }