cms多系统回复独立

zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/BlogController.java

@@ -1,19 +1,20 @@
 package com.zheng.cms.web.controller;
 
+import com.zheng.cms.common.constant.CmsResult;
+import com.zheng.cms.common.constant.CmsResultConstant;
 import com.zheng.cms.dao.model.*;
 import com.zheng.cms.rpc.api.*;
 import com.zheng.common.base.BaseController;
 import com.zheng.common.util.Paginator;
+import com.zheng.common.util.RequestUtil;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -28,6 +29,7 @@ public class BlogController extends BaseController {
 
     private static Logger _log = LoggerFactory.getLogger(BlogController.class);
     private static String CODE = "blog";
+    private static Integer USERID = 1;
 
     @Autowired
     private CmsArticleService cmsArticleService;
@@ -44,6 +46,15 @@ public class BlogController extends BaseController {
     @Autowired
     private CmsCommentService cmsCommentService;
 
+    /**
+     * 首页
+     * @param page
+     * @param sort
+     * @param order
+     * @param request
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "", method = RequestMethod.GET)
     public String index(@RequestParam(required = false, defaultValue = "1", value = "page") int page,
                         @RequestParam(required = false, defaultValue = "orders", value = "sort") String sort,
@@ -91,6 +102,14 @@ public class BlogController extends BaseController {
         return thymeleaf("/blog/index");
     }
 
+    /**
+     * 类目页
+     * @param alias
+     * @param page
+     * @param request
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "/category/{alias}", method = RequestMethod.GET)
     public String category(@PathVariable("alias") String alias,
                            @RequestParam(required = false, defaultValue = "1", value = "page") int page,
@@ -121,6 +140,14 @@ public class BlogController extends BaseController {
         return thymeleaf("/blog/category/index");
     }
 
+    /**
+     * 标签页
+     * @param alias
+     * @param page
+     * @param request
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "/tag/{alias}", method = RequestMethod.GET)
     public String tag(@PathVariable("alias") String alias,
                       @RequestParam(required = false, defaultValue = "1", value = "page") int page,
@@ -151,6 +178,12 @@ public class BlogController extends BaseController {
         return thymeleaf("/blog/tag/index");
     }
 
+    /**
+     * 详情页
+     * @param articleId
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "/details/{articleId}", method = RequestMethod.GET)
     public String details(@PathVariable("articleId") int articleId, Model model) {
         CmsArticle article = cmsArticleService.selectByPrimaryKey(articleId);
@@ -173,4 +206,31 @@ public class BlogController extends BaseController {
         return thymeleaf("/blog/details/index");
     }
 
+    /**
+     * 新增回复
+     * @param articleId
+     * @param cmsComment
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/comment/{articleId}", method = RequestMethod.POST)
+    @ResponseBody
+    public Object comment(@PathVariable("articleId") int articleId, CmsComment cmsComment, HttpServletRequest request) {
+        // 系统id
+        CmsSystemExample cmsSystemExample = new CmsSystemExample();
+        cmsSystemExample.createCriteria()
+                .andCodeEqualTo(CODE);
+        CmsSystem system = cmsSystemService.selectFirstByExample(cmsSystemExample);
+        long time = System.currentTimeMillis();
+        cmsComment.setCtime(time);
+        cmsComment.setArticleId(articleId);
+        cmsComment.setUserId(USERID);
+        cmsComment.setStatus((byte) 1);
+        cmsComment.setIp(RequestUtil.getIpAddr(request));
+        cmsComment.setAgent(request.getHeader("User-Agent"));
+        cmsComment.setSystemId(system.getSystemId());
+        int count = cmsCommentService.insertSelective(cmsComment);
+        return new CmsResult(CmsResultConstant.SUCCESS, count);
+    }
+
 }

zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/CommentController.java

@@ -1,49 +0,0 @@
-package com.zheng.cms.web.controller;
-
-import com.zheng.cms.common.constant.CmsResult;
-import com.zheng.cms.common.constant.CmsResultConstant;
-import com.zheng.cms.dao.model.CmsComment;
-import com.zheng.cms.rpc.api.CmsCommentService;
-import com.zheng.common.base.BaseController;
-import com.zheng.common.util.RequestUtil;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * 评论控制器
- * Created by shuzheng on 2017/3/26.
- */
-@Controller
-@RequestMapping(value = "/comment")
-public class CommentController extends BaseController {
-
-    private static Logger _log = LoggerFactory.getLogger(CommentController.class);
-
-    @Autowired
-    private CmsCommentService cmsCommentService;
-
-    @RequiresPermissions("cms:comment:create")
-    @RequestMapping(value = "/create/{articleId}", method = RequestMethod.POST)
-    @ResponseBody
-    public Object create(@PathVariable("articleId") int articleId, CmsComment cmsComment, HttpServletRequest request) {
-        long time = System.currentTimeMillis();
-        cmsComment.setCtime(time);
-        cmsComment.setArticleId(articleId);
-        cmsComment.setUserId(1);
-        cmsComment.setStatus((byte) 1);
-        cmsComment.setIp(RequestUtil.getIpAddr(request));
-        cmsComment.setAgent(request.getHeader("User-Agent"));
-        int count = cmsCommentService.insertSelective(cmsComment);
-        return new CmsResult(CmsResultConstant.SUCCESS, count);
-    }
-
-}

zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/NewsController.java

@@ -1,19 +1,20 @@
 package com.zheng.cms.web.controller;
 
+import com.zheng.cms.common.constant.CmsResult;
+import com.zheng.cms.common.constant.CmsResultConstant;
 import com.zheng.cms.dao.model.*;
 import com.zheng.cms.rpc.api.*;
 import com.zheng.common.base.BaseController;
 import com.zheng.common.util.Paginator;
+import com.zheng.common.util.RequestUtil;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -28,6 +29,7 @@ public class NewsController extends BaseController {
 
     private static Logger _log = LoggerFactory.getLogger(NewsController.class);
     private static String CODE = "news";
+    private static Integer USERID = 1;
 
     @Autowired
     private CmsArticleService cmsArticleService;
@@ -44,6 +46,15 @@ public class NewsController extends BaseController {
     @Autowired
     private CmsCommentService cmsCommentService;
 
+    /**
+     * 首页
+     * @param page
+     * @param sort
+     * @param order
+     * @param request
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "", method = RequestMethod.GET)
     public String index(@RequestParam(required = false, defaultValue = "1", value = "page") int page,
                         @RequestParam(required = false, defaultValue = "orders", value = "sort") String sort,
@@ -91,6 +102,14 @@ public class NewsController extends BaseController {
         return thymeleaf("/news/index");
     }
 
+    /**
+     * 类目页
+     * @param alias
+     * @param page
+     * @param request
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "/category/{alias}", method = RequestMethod.GET)
     public String category(@PathVariable("alias") String alias,
                         @RequestParam(required = false, defaultValue = "1", value = "page") int page,
@@ -121,6 +140,14 @@ public class NewsController extends BaseController {
         return thymeleaf("/news/category/index");
     }
 
+    /**
+     * 标签页
+     * @param alias
+     * @param page
+     * @param request
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "/tag/{alias}", method = RequestMethod.GET)
     public String tag(@PathVariable("alias") String alias,
                         @RequestParam(required = false, defaultValue = "1", value = "page") int page,
@@ -151,6 +178,12 @@ public class NewsController extends BaseController {
         return thymeleaf("/news/tag/index");
     }
 
+    /**
+     * 详情页
+     * @param articleId
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "/article/{articleId}", method = RequestMethod.GET)
     public String article(@PathVariable("articleId") int articleId, Model model) {
         CmsArticle article = cmsArticleService.selectByPrimaryKey(articleId);
@@ -173,4 +206,31 @@ public class NewsController extends BaseController {
         return thymeleaf("/news/article/index");
     }
 
+    /**
+     * 新增回复
+     * @param articleId
+     * @param cmsComment
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/comment/{articleId}", method = RequestMethod.POST)
+    @ResponseBody
+    public Object comment(@PathVariable("articleId") int articleId, CmsComment cmsComment, HttpServletRequest request) {
+        // 系统id
+        CmsSystemExample cmsSystemExample = new CmsSystemExample();
+        cmsSystemExample.createCriteria()
+                .andCodeEqualTo(CODE);
+        CmsSystem system = cmsSystemService.selectFirstByExample(cmsSystemExample);
+        long time = System.currentTimeMillis();
+        cmsComment.setCtime(time);
+        cmsComment.setArticleId(articleId);
+        cmsComment.setUserId(USERID);
+        cmsComment.setStatus((byte) 1);
+        cmsComment.setIp(RequestUtil.getIpAddr(request));
+        cmsComment.setAgent(request.getHeader("User-Agent"));
+        cmsComment.setSystemId(system.getSystemId());
+        int count = cmsCommentService.insertSelective(cmsComment);
+        return new CmsResult(CmsResultConstant.SUCCESS, count);
+    }
+
 }

zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/controller/QaController.java

@@ -1,19 +1,20 @@
 package com.zheng.cms.web.controller;
 
+import com.zheng.cms.common.constant.CmsResult;
+import com.zheng.cms.common.constant.CmsResultConstant;
 import com.zheng.cms.dao.model.*;
 import com.zheng.cms.rpc.api.*;
 import com.zheng.common.base.BaseController;
 import com.zheng.common.util.Paginator;
+import com.zheng.common.util.RequestUtil;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -28,6 +29,7 @@ public class QaController extends BaseController {
 
     private static Logger _log = LoggerFactory.getLogger(QaController.class);
     private static String CODE = "qa";
+    private static Integer USERID = 1;
 
     @Autowired
     private CmsArticleService cmsArticleService;
@@ -44,6 +46,15 @@ public class QaController extends BaseController {
     @Autowired
     private CmsCommentService cmsCommentService;
 
+    /**
+     * 首页
+     * @param page
+     * @param sort
+     * @param order
+     * @param request
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "", method = RequestMethod.GET)
     public String index(@RequestParam(required = false, defaultValue = "1", value = "page") int page,
                         @RequestParam(required = false, defaultValue = "orders", value = "sort") String sort,
@@ -91,6 +102,14 @@ public class QaController extends BaseController {
         return thymeleaf("/qa/index");
     }
 
+    /**
+     * 类目页
+     * @param alias
+     * @param page
+     * @param request
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "/category/{alias}", method = RequestMethod.GET)
     public String category(@PathVariable("alias") String alias,
                            @RequestParam(required = false, defaultValue = "1", value = "page") int page,
@@ -121,6 +140,14 @@ public class QaController extends BaseController {
         return thymeleaf("/qa/category/index");
     }
 
+    /**
+     * 标签页
+     * @param alias
+     * @param page
+     * @param request
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "/tag/{alias}", method = RequestMethod.GET)
     public String tag(@PathVariable("alias") String alias,
                       @RequestParam(required = false, defaultValue = "1", value = "page") int page,
@@ -151,6 +178,12 @@ public class QaController extends BaseController {
         return thymeleaf("/qa/tag/index");
     }
 
+    /**
+     * 详情页
+     * @param articleId
+     * @param model
+     * @return
+     */
     @RequestMapping(value = "/question/{articleId}", method = RequestMethod.GET)
     public String question(@PathVariable("articleId") int articleId, Model model) {
         CmsArticle article = cmsArticleService.selectByPrimaryKey(articleId);
@@ -173,4 +206,31 @@ public class QaController extends BaseController {
         return thymeleaf("/qa/question/index");
     }
 
+    /**
+     * 新增回复
+     * @param articleId
+     * @param cmsComment
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/answer/{articleId}", method = RequestMethod.POST)
+    @ResponseBody
+    public Object answer(@PathVariable("articleId") int articleId, CmsComment cmsComment, HttpServletRequest request) {
+        // 系统id
+        CmsSystemExample cmsSystemExample = new CmsSystemExample();
+        cmsSystemExample.createCriteria()
+                .andCodeEqualTo(CODE);
+        CmsSystem system = cmsSystemService.selectFirstByExample(cmsSystemExample);
+        long time = System.currentTimeMillis();
+        cmsComment.setCtime(time);
+        cmsComment.setArticleId(articleId);
+        cmsComment.setUserId(USERID);
+        cmsComment.setStatus((byte) 1);
+        cmsComment.setIp(RequestUtil.getIpAddr(request));
+        cmsComment.setAgent(request.getHeader("User-Agent"));
+        cmsComment.setSystemId(system.getSystemId());
+        int count = cmsCommentService.insertSelective(cmsComment);
+        return new CmsResult(CmsResultConstant.SUCCESS, count);
+    }
+
 }

zheng-ui/zheng-cms-web/blog/details/index.html

@@ -92,7 +92,7 @@
 <div class="container" style="padding-bottom:80px;">
     <h3 th:text="${article.title}">标题</h3>
     <div th:utext="${article.content}">内容</div>
-    <form id="commentForm" th:action="@{'/comment/create/' + ${article.articleId}}" method="post">
+    <form id="commentForm" th:action="@{'/blog/comment/' + ${article.articleId}}" method="post">
         <textarea id="" name="content" style="width:100%;height:50px;"></textarea>
         <input id="submit" type="button" value="评论"/><!--{"code":1,"message":"success","data":1}-->
     </form>

zheng-ui/zheng-cms-web/news/article/index.html

@@ -92,7 +92,7 @@
 <div class="container" style="padding-bottom:80px;">
     <h3 th:text="${article.title}">标题</h3>
     <div th:utext="${article.content}">内容</div>
-    <form id="commentForm" th:action="@{'/comment/create/' + ${article.articleId}}" method="post">
+    <form id="commentForm" th:action="@{'/news/comment/' + ${article.articleId}}" method="post">
         <textarea id="" name="content" style="width:100%;height:50px;"></textarea>
         <input id="submit" type="button" value="评论"/><!--{"code":1,"message":"success","data":1}-->
     </form>

zheng-ui/zheng-cms-web/qa/question/index.html

@@ -92,7 +92,7 @@
 <div class="container" style="padding-bottom:80px;">
     <h3 th:text="${article.title}">标题</h3>
     <div th:utext="${article.content}">内容</div>
-    <form id="commentForm" th:action="@{'/comment/create/' + ${article.articleId}}" method="post">
+    <form id="commentForm" th:action="@{'/qa/answer/' + ${article.articleId}}" method="post">
         <textarea id="" name="content" style="width:100%;height:50px;"></textarea>
         <input id="submit" type="button" value="回答"/><!--{"code":1,"message":"success","data":1}-->
     </form>