diff --git a/src/main/java/com/yaoyuan/jiscuss/controller/UserPostController.java b/src/main/java/com/yaoyuan/jiscuss/controller/UserPostController.java index e591b6f..460f234 100644 --- a/src/main/java/com/yaoyuan/jiscuss/controller/UserPostController.java +++ b/src/main/java/com/yaoyuan/jiscuss/controller/UserPostController.java @@ -1,6 +1,7 @@ package com.yaoyuan.jiscuss.controller; import java.util.Date; +import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -55,7 +56,10 @@ public class UserPostController extends BaseController { logger.info(">>> getDiscussionsById{}",id); Discussions discussions = discussionsService.findOne(id); + + List posts = postsService.findOneBy(id); map.put("discussions", discussions); + map.put("posts", posts); UserInfo user = getUserInfo(request); if(user != null){ map.put("username", user.getUsername()); diff --git a/src/main/java/com/yaoyuan/jiscuss/entity/Posts.java b/src/main/java/com/yaoyuan/jiscuss/entity/Posts.java index cf7bb97..f507ae3 100644 --- a/src/main/java/com/yaoyuan/jiscuss/entity/Posts.java +++ b/src/main/java/com/yaoyuan/jiscuss/entity/Posts.java @@ -39,6 +39,9 @@ public class Posts implements Serializable{ @Column(name="content") private String content; + + @Column(name="parent_id") + private Integer parent_id; @Column(name="edit_time") private Date edit_time; diff --git a/src/main/java/com/yaoyuan/jiscuss/repository/PostsRepository.java b/src/main/java/com/yaoyuan/jiscuss/repository/PostsRepository.java index 3b31979..1e9c4c7 100644 --- a/src/main/java/com/yaoyuan/jiscuss/repository/PostsRepository.java +++ b/src/main/java/com/yaoyuan/jiscuss/repository/PostsRepository.java @@ -1,9 +1,23 @@ package com.yaoyuan.jiscuss.repository; import com.yaoyuan.jiscuss.entity.Posts; +import com.yaoyuan.jiscuss.entity.Users; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public interface PostsRepository extends JpaRepository { + + /** + * + * @param dId + * @return + */ + @Query("from Posts where discussion_id = :dId") + List findOneBy(@Param("dId")Integer dId); + } diff --git a/src/main/java/com/yaoyuan/jiscuss/service/IPostsService.java b/src/main/java/com/yaoyuan/jiscuss/service/IPostsService.java index 64f5b2d..488b127 100644 --- a/src/main/java/com/yaoyuan/jiscuss/service/IPostsService.java +++ b/src/main/java/com/yaoyuan/jiscuss/service/IPostsService.java @@ -8,4 +8,6 @@ public interface IPostsService { List getAllList(); Posts insert(Posts posts); + + List findOneBy(Integer id); } diff --git a/src/main/java/com/yaoyuan/jiscuss/service/impl/PostsServiceImpl.java b/src/main/java/com/yaoyuan/jiscuss/service/impl/PostsServiceImpl.java index d8d47e1..b8fd223 100644 --- a/src/main/java/com/yaoyuan/jiscuss/service/impl/PostsServiceImpl.java +++ b/src/main/java/com/yaoyuan/jiscuss/service/impl/PostsServiceImpl.java @@ -1,6 +1,7 @@ package com.yaoyuan.jiscuss.service.impl; import java.util.List; +import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; @@ -23,6 +24,14 @@ public class PostsServiceImpl implements IPostsService { return postsRepository.findAll(); } + @Override + public List findOneBy(Integer id) { + + List ss = postsRepository.findOneBy(id); + return ss; + } + + @Override public Posts insert(Posts posts) { return postsRepository.save(posts); diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql index 5ae30d9..f129efa 100644 --- a/src/main/resources/schema.sql +++ b/src/main/resources/schema.sql @@ -56,6 +56,7 @@ type varchar(20), content text, edit_time datetime, edit_user_id INTEGER, +parent_id INTEGER, ip_address varchar(200), copyright varchar(200), is_approved INTEGER, diff --git a/src/main/resources/static/js/user/discussions.js b/src/main/resources/static/js/user/discussions.js index 0ef6034..ce69c73 100644 --- a/src/main/resources/static/js/user/discussions.js +++ b/src/main/resources/static/js/user/discussions.js @@ -15,8 +15,8 @@ $("#addPost").click(function () { var header = $("meta[name='_csrf_header']").attr("content"); console.warn(header) console.warn(token) - var title = $("#postcontent").val(); - console.log(title); + var content = $("#postcontent").val(); + console.log(content); $.ajax({ type: "POST", url: "/newpost", @@ -32,11 +32,10 @@ $("#addPost").click(function () { success: function (data) { console.log(data); if(data.flag){ - window.alert(title+',添加成功!'); - $('.ui.modal.createNewDiccuss').modal('hide'); + massage(title+',添加成功!',''); location.reload(); }else{ - window.alert(data.msg); + massage(data.msg,''); return false; } } diff --git a/src/main/resources/static/js/user/system.js b/src/main/resources/static/js/user/system.js index aea9633..321e5b6 100644 --- a/src/main/resources/static/js/user/system.js +++ b/src/main/resources/static/js/user/system.js @@ -83,11 +83,11 @@ $("#newdiscussions").click(function(){ success: function (data) { console.log(data); if(data.flag){ - window.alert(title+',添加成功!'); + massage(title+',添加成功!',''); $('.ui.modal.createNewDiccuss').modal('hide'); location.reload(); }else{ - window.alert(data.msg); + massage(data.msg,''); return false; } } @@ -123,10 +123,10 @@ $("#commitnewtags").click(function(){ success: function (data) { console.log(data); if(data.flag){ - window.alert(name+',添加成功!'); + massage(name+',添加成功!',''); return false; }else{ - window.alert(name+',添加失败!'); + massage(name+',添加失败!',''); return false; } } @@ -148,7 +148,6 @@ $('#context2 .menu .item') context: 'parent' }) ; -; $('.ui.dropdown') .dropdown() diff --git a/src/main/resources/templates/comm/commjs.ftl b/src/main/resources/templates/comm/commjs.ftl new file mode 100644 index 0000000..8bd3e85 --- /dev/null +++ b/src/main/resources/templates/comm/commjs.ftl @@ -0,0 +1,23 @@ +<#--jquery--> + + +<#--semantic-ui--> + + + + +<#--tinymce--> + + +<#--toastr--> + + + + + diff --git a/src/main/resources/templates/footer.ftl b/src/main/resources/templates/comm/footer.ftl similarity index 97% rename from src/main/resources/templates/footer.ftl rename to src/main/resources/templates/comm/footer.ftl index ed70bb1..75c658c 100644 --- a/src/main/resources/templates/footer.ftl +++ b/src/main/resources/templates/comm/footer.ftl @@ -46,6 +46,8 @@ \ No newline at end of file diff --git a/src/main/resources/templates/header.ftl b/src/main/resources/templates/comm/header.ftl similarity index 100% rename from src/main/resources/templates/header.ftl rename to src/main/resources/templates/comm/header.ftl diff --git a/src/main/resources/templates/discussions.ftl b/src/main/resources/templates/discussions.ftl index 70d8e7e..691457c 100644 --- a/src/main/resources/templates/discussions.ftl +++ b/src/main/resources/templates/discussions.ftl @@ -10,26 +10,17 @@ - - - - - - - + <#include "comm/commjs.ftl"/> -<#include "header.ftl"/> +<#include "comm/header.ftl"/>
欢迎来到这里
    -
  • JAVA + DISCUSS = JISCUSS 。
    • +
  • JAVA + DISCUSS = JISCUSS 。${posts?size}
  • 简单的，易用的JAVA论坛。
  • 请享受发帖回帖带来的乐趣吧！
@@ -151,6 +142,9 @@
+ +
+
@@ -168,7 +162,6 @@
-
搜索
@@ -176,6 +169,35 @@
+
+
+
作者
+
+
+

测试人员1

+
+
+
+
+ Jiscuss 一直， Jiscuss 一感谢支持！ +
+
+
+ +
+
+
+ 2019 测试内容 +
+
+
+
+
+
+ +
+
+
预留功能
@@ -269,7 +291,7 @@
-<#include "footer.ftl"/> +<#include "comm/footer.ftl"/> - <#--semantic--> - - - - - <#--tinymce--> - - <#--jquery-cookie--> - + <#include "comm/commjs.ftl"/> -<#include "header.ftl"/> +<#include "comm/header.ftl"/>
@@ -433,7 +420,7 @@ 预留
-<#include "footer.ftl"/> +<#include "comm/footer.ftl"/>